commit a019fb316a3ac44ac5c89965da2dd05c4961d99d
Author: Witold Filipczyk <[email protected]>
Date: Wed Apr 1 18:52:18 2015 +0000
- added x32.patch (fixed install dir)
libaccounts-qt.spec | 4 +++-
x32.patch | 15 +++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec
index 7d202b4..1cd55c3 100644
--- a/libaccounts-qt.spec
+++ b/libaccounts-qt.spec
@@ -7,12 +7,13 @@ Summary: Accounts management library for Qt 4
applications
Summary(pl.UTF-8): Biblioteka do zarządzania kontami dla aplikacji
opartych na bibliotece Qt 4
Name: libaccounts-qt
Version: 1.11
-Release: 1
+Release: 2
License: LGPL v2.1
Group: Libraries
#Source0Download: http://code.google.com/p/accounts-sso/downloads/list
Source0:
http://accounts-sso.googlecode.com/files/accounts-qt-%{version}.tar.bz2
# Source0-md5: a76f26849603f229399dc46eb83ed5a8
+Patch0: x32.patch
URL: http://code.google.com/p/accounts-sso/
%{?with_qt4:BuildRequires: QtCore-devel >= 4}
%{?with_qt4:BuildRequires: QtTest-devel >= 4}
@@ -97,6 +98,7 @@ Dokumentacja API biblioteki libaccounts-qt.
%{__rm} Accounts/{libaccounts-qt5.so*,*.cmake}
%build
+%patch0 -p1
%if %{with qt4}
install -d build-qt4
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..f65e25f
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,15 @@
+--- accounts-qt-1.11/common-project-config.pri.orig 2015-04-01
18:48:13.000000000 +0000
++++ accounts-qt-1.11/common-project-config.pri 2015-04-01 18:49:24.000000000
+0000
+@@ -43,11 +43,7 @@ isEmpty( PREFIX ) {
+ }
+
+ ARCH = $$system(uname -m)
+-contains( ARCH, x86_64 ) {
+- INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
+-} else {
+- INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
+-}
++INSTALL_LIBDIR = $$[QT_INSTALL_LIBS]
+
+ # default library directory can be overriden by defining LIBDIR when
+ # running qmake
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libaccounts-qt.git/commitdiff/a019fb316a3ac44ac5c89965da2dd05c4961d99d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
