diff --git a/libaccounts-qt-64bitarchs.patch b/libaccounts-qt-64bitarchs.patch new file mode 100644 index 0000000..d18d6d1 --- /dev/null +++ b/libaccounts-qt-64bitarchs.patch @@ -0,0 +1,18 @@ +diff -up accounts-qt-1.6/common-project-config.pri.64bitarchs accounts-qt-1.6/common-project-config.pri +--- accounts-qt-1.6/common-project-config.pri.64bitarchs 2013-01-23 07:01:07.000000000 +0100 ++++ accounts-qt-1.6/common-project-config.pri 2013-03-06 13:45:14.414158442 +0100 +@@ -43,11 +43,9 @@ isEmpty( PREFIX ) { + } + + ARCH = $$system(uname -m) +-contains( ARCH, x86_64 ) { +- INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64 +-} else { +- INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib +-} ++64BITARCHS= x86_64 ppc64 s390x ++INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib ++for(a, 64BITARCHS):contains(ARCH, $${a}):INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64 + + # default library directory can be overriden by defining LIBDIR when + # running qmake diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 9d3319d..1d96848 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,12 +1,13 @@ Name: libaccounts-qt Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 URL: http://code.google.com/p/accounts-sso/ Source0: http://accounts-sso.googlecode.com/files/accounts-qt-%{version}.tar.bz2 Patch0: accounts-qt-1.6-do-not-initialize-qstring-to-null.patch +Patch1: libaccounts-qt-64bitarchs.patch BuildRequires: qt-devel libaccounts-glib-devel BuildRequires: doxygen graphviz @@ -25,6 +26,7 @@ Headers, development libraries and documentation for accounts-qt. %prep %setup -q -n accounts-qt-%{version} %patch0 -p1 -b .do-not-initialize-qstring-to-null +%patch1 -p1 -b .64bitarchs %build export PATH=%{_qt4_bindir}:$PATH @@ -61,6 +63,9 @@ mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt %{_docdir}/libaccounts-qt %changelog +* Wed Mar 06 2013 Karsten Hopp 1.6-2 +- add s390x and ppc64 to 64bit archs using lib64 + * Mon Mar 04 2013 Jaroslav Reznik - 1.6-1 - Update to 1.6 - Fix rebuild issues with GCC 4.8