[packages/libaccounts-qt] - new URLs, updated to 1.14 - added qt4 patch (fixes qt4 version build; 1.14 is the last version to

[qboosh]

commit 40b72ea96b534ba63cc8831db9218d5ad7ff49c5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Apr 21 22:05:10 2016 +0200

    - new URLs, updated to 1.14
    - added qt4 patch (fixes qt4 version build; 1.14 is the last version to support qt4 though)

 libaccounts-qt-qt4.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 libaccounts-qt.spec      | 28 +++++++++++---------------
 2 files changed, 64 insertions(+), 16 deletions(-)
---
diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec
index a6da242..7d106d3 100644
--- a/libaccounts-qt.spec
+++ b/libaccounts-qt.spec
@@ -6,15 +6,16 @@
 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:	3
+Version:	1.14
+Release:	1
 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
+#Source0Download: https://gitlab.com/accounts-sso/libaccounts-qt/tags?page=3
+Source0:	https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.bz2?ref=VERSION_%{version}
+# Source0-md5:	c6c16ea482613c11ab076b84ebae5633
 Patch0:		x32.patch
-URL:		http://code.google.com/p/accounts-sso/
+Patch1:		%{name}-qt4.patch
+URL:		https://gitlab.com/accounts-sso/libaccounts-qt
 %{?with_qt5:BuildRequires:	Qt5Core-devel >= 5}
 %{?with_qt5:BuildRequires:	Qt5Test-devel >= 5}
 %{?with_qt5:BuildRequires:	Qt5Xml-devel >= 5}
@@ -95,13 +96,11 @@ API documentation for libaccounts-qt library.
 Dokumentacja API biblioteki libaccounts-qt.
 
 %prep
-%setup -q -n accounts-qt-%{version}
-
-# clean
-%{__rm} Accounts/{libaccounts-qt5.so*,*.cmake}
+%setup -q -n %{name}-VERSION_%{version}-a34ca4b6d250529c900b0382559553b6e5885918
 
 %build
 %patch0 -p1
+%patch1 -p1
 
 %if %{with qt4}
 install -d build-qt4
@@ -138,11 +137,6 @@ rm -rf $RPM_BUILD_ROOT
 
 # useless symlink
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libaccounts-qt5.so.1.?
-
-# separate from qt4 version
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/cmake/{AccountsQt,AccountsQt5}
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/cmake/AccountsQt5/{AccountsQt,AccountsQt5}Config.cmake
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/cmake/AccountsQt5/{AccountsQt,AccountsQt5}ConfigVersion.cmake
 %endif
 
 %if %{with qt4}
@@ -196,6 +190,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/AccountsQt5
 %endif
 
+%if %{with qt4} || %{with qt5}
 %files apidocs
 %defattr(644,root,root,755)
-%doc doc/html/*
+%doc %{?with_qt4:build-qt4/doc/html/*} %{!?with_qt4:build-qt5/doc/html/*}
+%endif
diff --git a/libaccounts-qt-qt4.patch b/libaccounts-qt-qt4.patch
new file mode 100644
index 0000000..9f3da35
--- /dev/null
+++ b/libaccounts-qt-qt4.patch
@@ -0,0 +1,52 @@
+--- libaccounts-qt-VERSION_1.14-a34ca4b6d250529c900b0382559553b6e5885918/Accounts/account.h.orig	2015-09-30 10:29:42.000000000 +0200
++++ libaccounts-qt-VERSION_1.14-a34ca4b6d250529c900b0382559553b6e5885918/Accounts/account.h	2016-04-21 20:57:24.161483161 +0200
+@@ -33,7 +33,11 @@
+ #include "Accounts/error.h"
+ #include "Accounts/service.h"
+ 
++#if QT_VERSION < QT_VERSION_CHECK(5 ,0 ,0)
++#define ACCOUNTS_KEY_CREDENTIALS_ID QString::fromUtf8("CredentialsId")
++#else
+ #define ACCOUNTS_KEY_CREDENTIALS_ID QStringLiteral("CredentialsId")
++#endif
+ #include <QObject>
+ #include <QStringList>
+ #include <QVariant>
+--- libaccounts-qt-VERSION_1.14-a34ca4b6d250529c900b0382559553b6e5885918/Accounts/provider.cpp.orig	2015-09-30 10:29:42.000000000 +0200
++++ libaccounts-qt-VERSION_1.14-a34ca4b6d250529c900b0382559553b6e5885918/Accounts/provider.cpp	2016-04-21 20:59:50.524810374 +0200
+@@ -27,6 +27,9 @@
+ #undef signals
+ #include <libaccounts-glib/ag-provider.h>
+ 
++#if QT_VERSION < QT_VERSION_CHECK(5 ,0 ,0)
++#define QStringLiteral QString::fromUtf8
++#endif
+ 
+ using namespace Accounts;
+ 
+--- libaccounts-qt-VERSION_1.14-a34ca4b6d250529c900b0382559553b6e5885918/Accounts/service.cpp.orig	2015-09-30 10:29:42.000000000 +0200
++++ libaccounts-qt-VERSION_1.14-a34ca4b6d250529c900b0382559553b6e5885918/Accounts/service.cpp	2016-04-21 21:01:04.404807253 +0200
+@@ -29,6 +29,10 @@
+ #undef signals
+ #include <libaccounts-glib/ag-service.h>
+ 
++#if QT_VERSION < QT_VERSION_CHECK(5 ,0 ,0)
++#define QStringLiteral QString::fromUtf8
++#endif
++
+ using namespace Accounts;
+ 
+ namespace Accounts {
+--- libaccounts-qt-VERSION_1.14-a34ca4b6d250529c900b0382559553b6e5885918/Accounts/service-type.cpp.orig	2015-09-30 10:29:42.000000000 +0200
++++ libaccounts-qt-VERSION_1.14-a34ca4b6d250529c900b0382559553b6e5885918/Accounts/service-type.cpp	2016-04-21 21:06:40.968126464 +0200
+@@ -29,6 +29,10 @@
+ #undef signals
+ #include <libaccounts-glib/ag-service-type.h>
+ 
++#if QT_VERSION < QT_VERSION_CHECK(5 ,0 ,0)
++#define QStringLiteral QString::fromUtf8
++#endif
++
+ using namespace Accounts;
+ 
+ namespace Accounts {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libaccounts-qt.git/commitdiff/40b72ea96b534ba63cc8831db9218d5ad7ff49c5