[packages/libaccounts-qt] - updated to 1.15 - removed outdated x32,qt4 patches - this version supports qt5 only; libaccounts-q

qboosh qboosh at pld-linux.org
Mon Apr 17 20:38:16 CEST 2017 

commit 03199cb9a4541884786e54d4bea0a2a68ae74bd6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 17 20:38:28 2017 +0200

    - updated to 1.15
    - removed outdated x32,qt4 patches
    - this version supports qt5 only; libaccounts-qt 1.14 moved to libaccounts-qt4.spec

 libaccounts-qt-qt4.patch |  52 ------------------------
 libaccounts-qt.spec      | 104 +++++++----------------------------------------
 x32.patch                |  15 -------
 3 files changed, 14 insertions(+), 157 deletions(-)
---
diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec
index 78ddab8..aadd014 100644
--- a/libaccounts-qt.spec
+++ b/libaccounts-qt.spec
@@ -1,61 +1,34 @@
-#
-# Conditional build:
-%bcond_without	qt4	# Qt 4 version
-%bcond_without	qt5	# Qt 5 version
-
 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.14
+Version:	1.15
 Release:	1
 License:	LGPL v2.1
 Group:		Libraries
-#Source0Download: https://gitlab.com/accounts-sso/libaccounts-qt/tags?page=3
-# TODO: in the future use fake GET arg to force sane filename on df
-#Source0:	https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.bz2?ref=VERSION_%{version}&fake_out=/%{name}-%{version}.tar.bz2
-Source0:	archive.tar.bz2%3Fref=VERSION_%{version}
-# Source0-md5:	c6c16ea482613c11ab076b84ebae5633
-Patch0:		x32.patch
-Patch1:		%{name}-qt4.patch
+#Source0Download: https://gitlab.com/accounts-sso/libaccounts-qt/tags?sort=updated_desc
+Source0:	https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.bz2?ref=VERSION_%{version}&fake_out=/%{name}-%{version}.tar.bz2
+# Source0-md5:	e42c66030610d00f48a8c2c1ffc3ebe2
 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}
-%{?with_qt4:BuildRequires:	QtCore-devel >= 4}
-%{?with_qt4:BuildRequires:	QtTest-devel >= 4}
-%{?with_qt4:BuildRequires:	QtXml-devel >= 4}
+BuildRequires:	Qt5Core-devel >= 5
+BuildRequires:	Qt5Test-devel >= 5
+BuildRequires:	Qt5Xml-devel >= 5
 BuildRequires:	doxygen
 BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	libaccounts-glib-devel
 BuildRequires:	pkgconfig
-%{?with_qt4:BuildRequires:	qt4-build >= 4}
-%{?with_qt4:BuildRequires:	qt4-qmake >= 4}
-%{?with_qt5:BuildRequires:	qt5-build >= 5}
-%{?with_qt5:BuildRequires:	qt5-qmake >= 5}
+BuildRequires:	qt5-build >= 5
+BuildRequires:	qt5-qmake >= 5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This project is a library for managing accounts which can be used from
-Qt 4 applications. It is part of the accounts-sso project.
+Qt applications. It is part of the accounts-sso project.
 
 %description -l pl.UTF-8
 Ten projekt to biblioteka do zarządzania kontami, z której można
-korzystać w aplikacjach opartych na bibliotece Qt 4. Jest to część
+korzystać w aplikacjach opartych na bibliotece Qt. Jest to część
 projektu accounts-sso.
 
-%package devel
-Summary:	Development files for libaccounts-qt library
-Summary(pl.UTF-8):	Pliki programistyczne biblioteki libaccounts-qt
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	QtCore-devel >= 4
-
-%description devel
-Development files for libaccounts-qt library.
-
-%description devel -l pl.UTF-8
-Pliki programistyczne biblioteki libaccounts-qt.
-
 %package -n libaccounts-qt5
 Summary:	Accounts management library for Qt 5 applications
 Summary(pl.UTF-8):	Biblioteka do zarządzania kontami dla aplikacji opartych na bibliotece Qt 5
@@ -98,87 +71,41 @@ API documentation for libaccounts-qt library.
 Dokumentacja API biblioteki libaccounts-qt.
 
 %prep
-%setup -q -n %{name}-VERSION_%{version}-a34ca4b6d250529c900b0382559553b6e5885918
+%setup -q -n %{name}-VERSION_%{version}-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8
 
 %build
-%patch0 -p1
-%patch1 -p1
-
-%if %{with qt4}
-install -d build-qt4
-cd build-qt4
-qmake-qt4 ../accounts-qt.pro \
-	BUILD_DIR=build-qt4 \
-	QMAKE_CXX="%{__cxx}" \
-	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
-	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
-
-%{__make}
-cd ..
-%endif
-
-%if %{with qt5}
 install -d build-qt5
 cd build-qt5
 qmake-qt5 ../accounts-qt.pro \
 	BUILD_DIR=build-qt5 \
+	LIBDIR=%{_libdir} \
 	QMAKE_CXX="%{__cxx}" \
 	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
 	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
 
 %{__make}
 cd ..
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with qt5}
 %{__make} -C build-qt5 install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # useless symlink
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libaccounts-qt5.so.1.?
-%endif
-
-%if %{with qt4}
-%{__make} -C build-qt4 install \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
-
-# useless symlink
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libaccounts-qt.so.1.?
-%endif
 
 # test suite
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/accountstest
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/libaccounts-qt-tests
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/accounts-qt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
-
 %post	-n libaccounts-qt5 -p /sbin/ldconfig
 %postun	-n libaccounts-qt5 -p /sbin/ldconfig
 
-%if %{with qt4}
-%files
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libaccounts-qt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libaccounts-qt.so.1
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libaccounts-qt.so
-%{_includedir}/accounts-qt
-%{_pkgconfigdir}/accounts-qt.pc
-%{_libdir}/cmake/AccountsQt
-%endif
-
-%if %{with qt5}
 %files -n libaccounts-qt5
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libaccounts-qt5.so.*.*.*
@@ -190,10 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/accounts-qt5
 %{_pkgconfigdir}/accounts-qt5.pc
 %{_libdir}/cmake/AccountsQt5
-%endif
 
-%if %{with qt4} || %{with qt5}
 %files apidocs
 %defattr(644,root,root,755)
-%doc %{?with_qt4:build-qt4/doc/html/*} %{!?with_qt4:build-qt5/doc/html/*}
-%endif
+%doc build-qt5/doc/html/*
diff --git a/libaccounts-qt-qt4.patch b/libaccounts-qt-qt4.patch
deleted file mode 100644
index 9f3da35..0000000
--- a/libaccounts-qt-qt4.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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 {
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index f65e25f..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/03199cb9a4541884786e54d4bea0a2a68ae74bd6

More information about the pld-cvs-commit mailing list