more rebust libdir handling (#1366692)

libaccounts-qt-64bitarchs.patch

@@ -1,18 +0,0 @@
-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 aarch64 ppc64le
-+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

libaccounts-qt.spec

@@ -4,15 +4,13 @@
 Name:           libaccounts-qt
 Summary:        Accounts framework Qt bindings
 Version:        1.13
-Release:        12%{?dist}
+Release:        13%{?dist}
 
 License:        LGPLv2
 URL:            https://gitlab.com/accounts-sso/libaccounts-qt
 
 Source0:        https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.gz?ref=%{version}#/libaccounts-qt-%{version}-%{commit0}.tar.gz
 
-Patch1:         libaccounts-qt-64bitarchs.patch
-
 ## upstream patches
 Patch102: 0002-Fix-memory-leaks-found-by-valgrind.patch
 patch105: 0005-Use-gboolean-instead-of-bool.patch
@@ -60,7 +58,6 @@ BuildArch:      noarch
 # See https://community.kde.org/KTp/Setting_up_KAccounts#libaccounts-qt
 # "Note that at this very day libaccounts-qt qmake does **NOT** support compiling the library outside the source directory"
 
-%patch1 -p1 -b .64bitarchs
 %patch102 -p1 -b .0002
 %patch105 -p1 -b .0005
 
@@ -79,6 +76,7 @@ pushd %{_target_platform}-qt4
 %{qmake_qt4} \
     QMF_INSTALL_ROOT=%{_prefix} \
     CONFIG+=release \
+    LIBDIR=%{_libdir} \
     accounts-qt.pro
 
 make %{?_smp_mflags}
@@ -88,6 +86,7 @@ pushd %{_target_platform}-qt5
 %{qmake_qt5} \
     QMF_INSTALL_ROOT=%{_prefix} \
     CONFIG+=release \
+    LIBDIR=%{_libdir} \
     accounts-qt.pro
 
 make %{?_smp_mflags}
@@ -147,6 +146,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest
 
 
 %changelog
+* Fri Aug 12 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.13-13
+- more rebust libdir handling (#1366692)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.13-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild