From 6409315466c625ac962a935ddc56c171d7b416cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 9 Aug 2010 17:25:45 +0000 Subject: [PATCH 01/41] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 2f5fc075609382ef53ee3f6e0af154408c286d69 Mon Sep 17 00:00:00 2001 From: Chen Lei Date: Tue, 10 Aug 2010 10:55:11 +0800 Subject: [PATCH 02/41] Initial import --- .gitignore | 1 + accounts-qt-0.28-fix-64bit-compilation.patch | 28 +++++++ libaccounts-qt.spec | 88 ++++++++++++++++++++ sources | 1 + 4 files changed, 118 insertions(+) create mode 100644 accounts-qt-0.28-fix-64bit-compilation.patch create mode 100644 libaccounts-qt.spec diff --git a/.gitignore b/.gitignore index e69de29..227f2cd 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +accounts-qt-0.31.tar.gz diff --git a/accounts-qt-0.28-fix-64bit-compilation.patch b/accounts-qt-0.28-fix-64bit-compilation.patch new file mode 100644 index 0000000..923b856 --- /dev/null +++ b/accounts-qt-0.28-fix-64bit-compilation.patch @@ -0,0 +1,28 @@ +diff -Naur accounts-qt-0.28.org/Accounts/account.cpp accounts-qt-0.28/Accounts/account.cpp +--- accounts-qt-0.28.org/Accounts/account.cpp 2010-06-14 22:45:41.000000000 +0800 ++++ accounts-qt-0.28/Accounts/account.cpp 2010-07-23 20:22:54.335786908 +0800 +@@ -496,10 +496,10 @@ + value = g_value_get_uint(&val); + break; + case G_TYPE_INT64: +- value = g_value_get_int64(&val); ++ value = qint64(g_value_get_int64(&val)); + break; + case G_TYPE_UINT64: +- value = g_value_get_uint64(&val); ++ value = quint64(g_value_get_uint64(&val)); + break; + case G_TYPE_BOOLEAN: + value = g_value_get_boolean(&val); +diff -Naur accounts-qt-0.28.org/Accounts/account.h accounts-qt-0.28/Accounts/account.h +--- accounts-qt-0.28.org/Accounts/account.h 2010-06-14 22:45:41.000000000 +0800 ++++ accounts-qt-0.28/Accounts/account.h 2010-07-23 20:23:19.636035755 +0800 +@@ -46,7 +46,7 @@ + + namespace Accounts + { +-typedef quint32 AccountId; ++typedef quint64 AccountId; + typedef QList AccountIdList; + class Manager; + diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec new file mode 100644 index 0000000..583e394 --- /dev/null +++ b/libaccounts-qt.spec @@ -0,0 +1,88 @@ +Name: libaccounts-qt +Version: 0.31 +Release: 3%{?dist} +Summary: Accounts framework +Group: System Environment/Libraries +License: LGPLv2 +URL: http://gitorious.org/accounts-sso/accounts-qt +Source0: accounts-qt-%{version}.tar.gz +# Fix compilation error in 64 bit arches +Patch0: accounts-qt-0.28-fix-64bit-compilation.patch +# extracted from http://repo.meego.com/MeeGo/builds/trunk/daily/core/repos/source/libaccounts-qt-0.31-1.5.src.rpm +BuildRequires: qt-devel libaccounts-glib-devel +BuildRequires: doxygen graphviz + +%description +Framework to provide accounts. + +%package devel +Summary: Development files for accounts-qt +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: qt4-devel%{?_isa} + +%description devel +Headers, development libraries and documentation for accounts-qt. + +%prep +%setup -q -n accounts-qt-%{version} +%patch0 -p1 + +sed -i 's\{INSTALL_PREFIX}/lib\{INSTALL_PREFIX}/%{_lib}\g' common-installs-config.pri +sed -i 's\{INSTALL_PREFIX}/lib\{INSTALL_PREFIX}/%{_lib}\g' Accounts/Accounts.pro +sed -i 's\usr/lib\usr/%{_lib}\g' Accounts/accounts.prf +sed -i 's\usr/lib\usr/%{_lib}\g' Accounts/accounts-qt.pc +sed -i 's\{prefix}/lib\{prefix}/%{_lib}\g' Accounts/accounts-qt.pc + +%build +export PATH=%{_qt4_bindir}:$PATH +%{_qt4_qmake} QMF_INSTALL_ROOT=%{_prefix} \ + CONFIG+=release accounts-qt.pro + +make %{?_smp_mflags} + +%install +make install INSTALL_ROOT=%{buildroot} + +rm -f %{buildroot}/%{_datadir}/doc/accounts-qt/html/installdox + +#remove tests for now +rm -rf %{buildroot}%{_datadir}/%{name}-tests +rm -f %{buildroot}%{_bindir}/accountstest + +mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/lib*.so.* +%{_bindir}/account-tool + +%files devel +%defattr(-,root,root,-) +%{_libdir}/lib*.so +%{_includedir}/accounts-qt/ +%{_libdir}/pkgconfig/accounts-qt.pc +%{_libdir}/qt4/mkspecs/* +%{_docdir}/libaccounts-qt + +%changelog +* Fri Aug 06 2010 Chen Lei - 0.31-3 +- Fix doc path + +* Fri Aug 06 2010 Chen Lei - 0.31-2 +- Small fix for description + +* Fri Aug 06 2010 Chen Lei - 0.31-1 +- New upstream release +- Several changes against package review + +* Fri Jul 23 2010 Chen Lei - 0.28-1 +- Initial packaging for Fedora + +* Mon Jun 14 2010 Bernd Wachter - 0.28 +- Update to latest version diff --git a/sources b/sources index e69de29..3b60c28 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d6429682ff3623fcf0ddd2023603b491 accounts-qt-0.31.tar.gz From cb47fa813aae45d746f26a5ab1f8a608792cec41 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 22:34:37 -0600 Subject: [PATCH 03/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 583e394..1b6e7bb 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 0.31 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Accounts framework Group: System Environment/Libraries License: LGPLv2 @@ -71,6 +71,9 @@ mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt %{_docdir}/libaccounts-qt %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.31-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Aug 06 2010 Chen Lei - 0.31-3 - Fix doc path From 479b79313102e55a4b6a389bcbb93afadef17755 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:20:52 -0600 Subject: [PATCH 04/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 1b6e7bb..c20de7c 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 0.31 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Accounts framework Group: System Environment/Libraries License: LGPLv2 @@ -71,6 +71,9 @@ mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt %{_docdir}/libaccounts-qt %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.31-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0.31-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From ac5aea6e9492804c6aa023c8cfc9738d6aedede8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 14:13:01 -0500 Subject: [PATCH 05/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index c20de7c..6633eb7 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 0.31 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Accounts framework Group: System Environment/Libraries License: LGPLv2 @@ -71,6 +71,9 @@ mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt %{_docdir}/libaccounts-qt %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.31-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.31-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 9fa2ee40a962646514222949303c7551ae51f3ff Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:00:19 -0600 Subject: [PATCH 06/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 6633eb7..3dac8af 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 0.31 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Accounts framework Group: System Environment/Libraries License: LGPLv2 @@ -71,6 +71,9 @@ mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt %{_docdir}/libaccounts-qt %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.31-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 0.31-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From b5af7478c1a1e27814007254dceaad9bb2c22ead Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Mon, 4 Mar 2013 10:15:16 +0100 Subject: [PATCH 07/41] Update to 1.6 - Fix rebuild issues with GCC 4.8 - Remove accounts-tool - Cleanup --- .gitignore | 1 + accounts-qt-0.28-fix-64bit-compilation.patch | 28 ---------------- ....6-do-not-initialize-qstring-to-null.patch | 21 ++++++++++++ libaccounts-qt.spec | 32 ++++++++----------- sources | 2 +- 5 files changed, 37 insertions(+), 47 deletions(-) delete mode 100644 accounts-qt-0.28-fix-64bit-compilation.patch create mode 100644 accounts-qt-1.6-do-not-initialize-qstring-to-null.patch diff --git a/.gitignore b/.gitignore index 227f2cd..d85a74c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ accounts-qt-0.31.tar.gz +/accounts-qt-1.6.tar.bz2 diff --git a/accounts-qt-0.28-fix-64bit-compilation.patch b/accounts-qt-0.28-fix-64bit-compilation.patch deleted file mode 100644 index 923b856..0000000 --- a/accounts-qt-0.28-fix-64bit-compilation.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur accounts-qt-0.28.org/Accounts/account.cpp accounts-qt-0.28/Accounts/account.cpp ---- accounts-qt-0.28.org/Accounts/account.cpp 2010-06-14 22:45:41.000000000 +0800 -+++ accounts-qt-0.28/Accounts/account.cpp 2010-07-23 20:22:54.335786908 +0800 -@@ -496,10 +496,10 @@ - value = g_value_get_uint(&val); - break; - case G_TYPE_INT64: -- value = g_value_get_int64(&val); -+ value = qint64(g_value_get_int64(&val)); - break; - case G_TYPE_UINT64: -- value = g_value_get_uint64(&val); -+ value = quint64(g_value_get_uint64(&val)); - break; - case G_TYPE_BOOLEAN: - value = g_value_get_boolean(&val); -diff -Naur accounts-qt-0.28.org/Accounts/account.h accounts-qt-0.28/Accounts/account.h ---- accounts-qt-0.28.org/Accounts/account.h 2010-06-14 22:45:41.000000000 +0800 -+++ accounts-qt-0.28/Accounts/account.h 2010-07-23 20:23:19.636035755 +0800 -@@ -46,7 +46,7 @@ - - namespace Accounts - { --typedef quint32 AccountId; -+typedef quint64 AccountId; - typedef QList AccountIdList; - class Manager; - diff --git a/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch b/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch new file mode 100644 index 0000000..b973266 --- /dev/null +++ b/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch @@ -0,0 +1,21 @@ +diff -up accounts-qt-1.6/Accounts/account.h.do-not-initialize-qstring-to-null accounts-qt-1.6/Accounts/account.h +--- accounts-qt-1.6/Accounts/account.h.do-not-initialize-qstring-to-null 2013-02-20 15:02:37.000000000 +0100 ++++ accounts-qt-1.6/Accounts/account.h 2013-03-04 09:34:02.324000094 +0100 +@@ -105,7 +105,7 @@ public: + + bool supportsService(const QString &serviceType) const; + +- ServiceList services(const QString &serviceType = NULL) const; ++ ServiceList services(const QString &serviceType = QString()) const; + ServiceList enabledServices() const; + + bool enabled() const; +@@ -169,7 +169,7 @@ public: + bool default_value = false, + SettingSource *source = 0) const; + +- Watch *watchKey(const QString &key = NULL); ++ Watch *watchKey(const QString &key = QString()); + + void sync(); + bool syncAndBlock(); diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 3dac8af..9d3319d 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,19 +1,17 @@ Name: libaccounts-qt -Version: 0.31 -Release: 7%{?dist} -Summary: Accounts framework +Version: 1.6 +Release: 1%{?dist} +Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 -URL: http://gitorious.org/accounts-sso/accounts-qt -Source0: accounts-qt-%{version}.tar.gz -# Fix compilation error in 64 bit arches -Patch0: accounts-qt-0.28-fix-64bit-compilation.patch -# extracted from http://repo.meego.com/MeeGo/builds/trunk/daily/core/repos/source/libaccounts-qt-0.31-1.5.src.rpm +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 BuildRequires: qt-devel libaccounts-glib-devel BuildRequires: doxygen graphviz %description -Framework to provide accounts. +Framework to provide accounts for Qt. %package devel Summary: Development files for accounts-qt @@ -26,13 +24,7 @@ Headers, development libraries and documentation for accounts-qt. %prep %setup -q -n accounts-qt-%{version} -%patch0 -p1 - -sed -i 's\{INSTALL_PREFIX}/lib\{INSTALL_PREFIX}/%{_lib}\g' common-installs-config.pri -sed -i 's\{INSTALL_PREFIX}/lib\{INSTALL_PREFIX}/%{_lib}\g' Accounts/Accounts.pro -sed -i 's\usr/lib\usr/%{_lib}\g' Accounts/accounts.prf -sed -i 's\usr/lib\usr/%{_lib}\g' Accounts/accounts-qt.pc -sed -i 's\{prefix}/lib\{prefix}/%{_lib}\g' Accounts/accounts-qt.pc +%patch0 -p1 -b .do-not-initialize-qstring-to-null %build export PATH=%{_qt4_bindir}:$PATH @@ -60,17 +52,21 @@ mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt %defattr(-,root,root,-) %doc COPYING %{_libdir}/lib*.so.* -%{_bindir}/account-tool %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/accounts-qt/ %{_libdir}/pkgconfig/accounts-qt.pc -%{_libdir}/qt4/mkspecs/* %{_docdir}/libaccounts-qt %changelog +* Mon Mar 04 2013 Jaroslav Reznik - 1.6-1 +- Update to 1.6 +- Fix rebuild issues with GCC 4.8 +- Remove accounts-tool +- Cleanup + * Thu Feb 14 2013 Fedora Release Engineering - 0.31-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 3b60c28..62f1e08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6429682ff3623fcf0ddd2023603b491 accounts-qt-0.31.tar.gz +d4eb501fffdfdb37748f368008580374 accounts-qt-1.6.tar.bz2 From 256432c93c7c93f012d7bd666c8d5418383c0e03 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 6 Mar 2013 13:57:15 +0100 Subject: [PATCH 08/41] add s390x and ppc64 to 64bit archs using lib64 --- libaccounts-qt-64bitarchs.patch | 18 ++++++++++++++++++ libaccounts-qt.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 libaccounts-qt-64bitarchs.patch 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 From 5fabbe4ed3e7e7f8e2e5e13f092773d9bb6d14ac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 23:46:35 -0500 Subject: [PATCH 09/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 1d96848..b6d03c4 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 @@ -63,6 +63,9 @@ mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt %{_docdir}/libaccounts-qt %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Mar 06 2013 Karsten Hopp 1.6-2 - add s390x and ppc64 to 64bit archs using lib64 From dadc9dc1588bb797dfca0ae96cbf5186ea102756 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sat, 14 Dec 2013 21:54:01 +0100 Subject: [PATCH 10/41] Fix duplicate documentation (#1001255) - Add %?_isa to -devel base package dep - Remove %defattr --- libaccounts-qt.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index b6d03c4..441ba51 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 @@ -17,7 +17,7 @@ Framework to provide accounts for Qt. %package devel Summary: Development files for accounts-qt Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt4-devel%{?_isa} %description devel @@ -44,25 +44,30 @@ rm -f %{buildroot}/%{_datadir}/doc/accounts-qt/html/installdox rm -rf %{buildroot}%{_datadir}/%{name}-tests rm -f %{buildroot}%{_bindir}/accountstest -mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt +# move installed docs to include them in subpackage via %%doc magic +rm -rf __tmp_doc ; mkdir __tmp_doc +mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc COPYING %{_libdir}/lib*.so.* %files devel -%defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/accounts-qt/ %{_libdir}/pkgconfig/accounts-qt.pc -%{_docdir}/libaccounts-qt +%doc __tmp_doc/accounts-qt/* %changelog +* Sat Dec 14 2013 Michael Schwendt - 1.6-4 +- Fix duplicate documentation (#1001255) +- Add %%?_isa to -devel base package dep +- Remove %%defattr + * Sat Aug 03 2013 Fedora Release Engineering - 1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 29ea4a90c1ef656b89088f0763db4fcd001d8d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 26 Feb 2014 17:23:28 +0100 Subject: [PATCH 11/41] Update to 1.11 --- .gitignore | 1 + ....6-do-not-initialize-qstring-to-null.patch | 21 ------------------- libaccounts-qt.spec | 10 +++++---- sources | 2 +- 4 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 accounts-qt-1.6-do-not-initialize-qstring-to-null.patch diff --git a/.gitignore b/.gitignore index d85a74c..bd9cb5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ accounts-qt-0.31.tar.gz /accounts-qt-1.6.tar.bz2 +/accounts-qt-1.11.tar.bz2 diff --git a/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch b/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch deleted file mode 100644 index b973266..0000000 --- a/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up accounts-qt-1.6/Accounts/account.h.do-not-initialize-qstring-to-null accounts-qt-1.6/Accounts/account.h ---- accounts-qt-1.6/Accounts/account.h.do-not-initialize-qstring-to-null 2013-02-20 15:02:37.000000000 +0100 -+++ accounts-qt-1.6/Accounts/account.h 2013-03-04 09:34:02.324000094 +0100 -@@ -105,7 +105,7 @@ public: - - bool supportsService(const QString &serviceType) const; - -- ServiceList services(const QString &serviceType = NULL) const; -+ ServiceList services(const QString &serviceType = QString()) const; - ServiceList enabledServices() const; - - bool enabled() const; -@@ -169,7 +169,7 @@ public: - bool default_value = false, - SettingSource *source = 0) const; - -- Watch *watchKey(const QString &key = NULL); -+ Watch *watchKey(const QString &key = QString()); - - void sync(); - bool syncAndBlock(); diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 441ba51..1268bd2 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,12 +1,11 @@ Name: libaccounts-qt -Version: 1.6 -Release: 4%{?dist} +Version: 1.11 +Release: 1%{?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,7 +24,6 @@ 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 @@ -60,9 +58,13 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %{_libdir}/lib*.so %{_includedir}/accounts-qt/ %{_libdir}/pkgconfig/accounts-qt.pc +%{_libdir}/cmake/AccountsQt %doc __tmp_doc/accounts-qt/* %changelog +* Wed Feb 26 2014 Daniel Vrátil - 1.11-1 +- Upodate to 1.11 + * Sat Dec 14 2013 Michael Schwendt - 1.6-4 - Fix duplicate documentation (#1001255) - Add %%?_isa to -devel base package dep diff --git a/sources b/sources index 62f1e08..2b79c0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4eb501fffdfdb37748f368008580374 accounts-qt-1.6.tar.bz2 +a76f26849603f229399dc46eb83ed5a8 accounts-qt-1.11.tar.bz2 From c3e98e34fe52ada433f2225e5da84d9f413c7ed4 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 8 Mar 2014 21:39:26 +0100 Subject: [PATCH 12/41] Rebuild against fixed qt to fix -debuginfo (#1074041) * Sat Mar 08 2014 Kevin Kofler - 1.11-2 - Rebuild against fixed qt to fix -debuginfo (#1074041) --- libaccounts-qt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 1268bd2..7328dee 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 1.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 @@ -62,8 +62,11 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %doc __tmp_doc/accounts-qt/* %changelog +* Sat Mar 08 2014 Kevin Kofler - 1.11-2 +- Rebuild against fixed qt to fix -debuginfo (#1074041) + * Wed Feb 26 2014 Daniel Vrátil - 1.11-1 -- Upodate to 1.11 +- Update to 1.11 * Sat Dec 14 2013 Michael Schwendt - 1.6-4 - Fix duplicate documentation (#1001255) From 985ef689af12bb34b7867d69959dfef1bfbacec8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 21:34:23 -0500 Subject: [PATCH 13/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 7328dee..7bde987 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 @@ -62,6 +62,9 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %doc __tmp_doc/accounts-qt/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Mar 08 2014 Kevin Kofler - 1.11-2 - Rebuild against fixed qt to fix -debuginfo (#1074041) From 018a0c00696f0cc8b5d1bac70cfa6bded3a443d0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 25 Jun 2014 13:00:58 +0100 Subject: [PATCH 14/41] Update 64 bits arch patch --- libaccounts-qt-64bitarchs.patch | 2 +- libaccounts-qt.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libaccounts-qt-64bitarchs.patch b/libaccounts-qt-64bitarchs.patch index d18d6d1..6ac9b3d 100644 --- a/libaccounts-qt-64bitarchs.patch +++ b/libaccounts-qt-64bitarchs.patch @@ -10,7 +10,7 @@ diff -up accounts-qt-1.6/common-project-config.pri.64bitarchs accounts-qt-1.6/co -} else { - INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib -} -+64BITARCHS= x86_64 ppc64 s390x ++64BITARCHS= x86_64 ppc64 s390x aarch64 ppc64le +INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib +for(a, 64BITARCHS):contains(ARCH, $${a}):INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64 diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 7bde987..57fd1a5 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 1.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 @@ -62,6 +62,9 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %doc __tmp_doc/accounts-qt/* %changelog +* Wed Jun 25 2014 Peter Robinson 1.11-4 +- Update 64 bits arch patch + * Sat Jun 07 2014 Fedora Release Engineering - 1.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a9493b65157e868e8b4f75f51802c52dc927cb4c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 02:14:07 +0000 Subject: [PATCH 15/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 57fd1a5..bc0debf 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 1.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 @@ -62,6 +62,9 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %doc __tmp_doc/accounts-qt/* %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jun 25 2014 Peter Robinson 1.11-4 - Update 64 bits arch patch From 64188ba9576a9eb23f4d0444611c421f53a78001 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 15:10:22 +0200 Subject: [PATCH 16/41] Rebuilt for GCC 5 C++11 ABI change --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index bc0debf..36f2eb8 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 1.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 @@ -62,6 +62,9 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %doc __tmp_doc/accounts-qt/* %changelog +* Sat May 02 2015 Kalev Lember - 1.11-6 +- Rebuilt for GCC 5 C++11 ABI change + * Sun Aug 17 2014 Fedora Release Engineering - 1.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 292746f7421b8d2ece6c5d06bafc46ecfe317e69 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 14:13:09 +0000 Subject: [PATCH 17/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 36f2eb8..c04638b 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,6 +1,6 @@ Name: libaccounts-qt Version: 1.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 @@ -62,6 +62,9 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %doc __tmp_doc/accounts-qt/* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.11-6 - Rebuilt for GCC 5 C++11 ABI change From dbb7f2c1554439cfd1ab8d703c6922420e2da036 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 28 Sep 2015 11:26:23 -0500 Subject: [PATCH 18/41] libaccounts-qt-1.13, merge improvements from libaccounts-qt5 --- .gitignore | 1 + 0002-Fix-memory-leaks-found-by-valgrind.patch | 60 ++++++++++ 0005-Use-gboolean-instead-of-bool.patch | 34 ++++++ libaccounts-qt.spec | 112 ++++++++---------- sources | 2 +- 5 files changed, 148 insertions(+), 61 deletions(-) create mode 100644 0002-Fix-memory-leaks-found-by-valgrind.patch create mode 100644 0005-Use-gboolean-instead-of-bool.patch diff --git a/.gitignore b/.gitignore index bd9cb5a..bc201bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ accounts-qt-0.31.tar.gz /accounts-qt-1.6.tar.bz2 /accounts-qt-1.11.tar.bz2 +/libaccounts-qt-1.13-2a9cc22ff7b0b62b60541423763cb3dd992c0f40.tar.gz diff --git a/0002-Fix-memory-leaks-found-by-valgrind.patch b/0002-Fix-memory-leaks-found-by-valgrind.patch new file mode 100644 index 0000000..fa2936c --- /dev/null +++ b/0002-Fix-memory-leaks-found-by-valgrind.patch @@ -0,0 +1,60 @@ +From 533aa917f2de9030a05e745a0e49a53a7fb4b36e Mon Sep 17 00:00:00 2001 +From: Vyacheslav Monich +Date: Fri, 5 Sep 2014 16:23:44 +0300 +Subject: [PATCH 2/6] Fix memory leaks found by valgrind + +Fixes: https://code.google.com/p/accounts-sso/issues/detail?id=239 +--- + Accounts/account-service.cpp | 4 +++- + Accounts/auth-data.cpp | 1 + + Accounts/utils.cpp | 4 +++- + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/Accounts/account-service.cpp b/Accounts/account-service.cpp +index 9da8f8c..6661685 100644 +--- a/Accounts/account-service.cpp ++++ b/Accounts/account-service.cpp +@@ -504,5 +504,7 @@ AuthData AccountService::authData() const + + AgAuthData *agAuthData = + ag_account_service_get_auth_data(d->m_accountService); +- return AuthData(agAuthData); ++ AuthData authData(agAuthData); ++ ag_auth_data_unref(agAuthData); ++ return authData; + } +diff --git a/Accounts/auth-data.cpp b/Accounts/auth-data.cpp +index ef4b8d9..ed30396 100644 +--- a/Accounts/auth-data.cpp ++++ b/Accounts/auth-data.cpp +@@ -109,6 +109,7 @@ QVariantMap AuthData::parameters() const + if (glibParameters == 0) return QVariantMap(); + + QVariant variant = gVariantToQVariant(glibParameters); ++ g_variant_unref(glibParameters); + if (!variant.isValid()) return QVariantMap(); + + return variant.toMap(); +diff --git a/Accounts/utils.cpp b/Accounts/utils.cpp +index 71e24b6..dd0c7e1 100644 +--- a/Accounts/utils.cpp ++++ b/Accounts/utils.cpp +@@ -32,12 +32,14 @@ static QVariantMap gVariantToQVariantMap(GVariant *variant) + { + QVariantMap ret; + GVariantIter iter; +- const gchar *key; ++ gchar *key; + GVariant *value; + + g_variant_iter_init (&iter, variant); + while (g_variant_iter_next (&iter, "{sv}", &key, &value)) { + ret.insert(UTF8(key), gVariantToQVariant(value)); ++ g_variant_unref(value); ++ g_free(key); + } + + return ret; +-- +2.5.0 + diff --git a/0005-Use-gboolean-instead-of-bool.patch b/0005-Use-gboolean-instead-of-bool.patch new file mode 100644 index 0000000..2d52b19 --- /dev/null +++ b/0005-Use-gboolean-instead-of-bool.patch @@ -0,0 +1,34 @@ +From 207139e65e6707100d2e92d96b1a4c3bfaa88a5f Mon Sep 17 00:00:00 2001 +From: Mikko Harju +Date: Thu, 13 Aug 2015 03:09:07 -0400 +Subject: [PATCH 5/6] Use gboolean instead of bool + +The "use-dbus" is a boolean g_object property, with actual type of +gboolean, and gboolean is typedef int. g_object_get is a variadic +function (no static type checking), and stores the queried value +through pointer-to-int. If sizeof(bool) happens to be less than +sizeof(int) and the stack variable useDBus is packed tightly, +this can lead to stack corruption. + +Compiling the lib with -fstack-protector immediately pointed out +the problem. +--- + Accounts/manager.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Accounts/manager.cpp b/Accounts/manager.cpp +index 2eb077f..1ac78d0 100644 +--- a/Accounts/manager.cpp ++++ b/Accounts/manager.cpp +@@ -530,7 +530,7 @@ bool Manager::abortOnTimeout() const + */ + Manager::Options Manager::options() const + { +- bool useDBus = true; ++ gboolean useDBus = true; + g_object_get(d->m_manager, + "use-dbus", &useDBus, + NULL); +-- +2.5.0 + diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index c04638b..9ba5fb1 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,67 +1,87 @@ -Name: libaccounts-qt -Version: 1.11 -Release: 7%{?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 -Patch1: libaccounts-qt-64bitarchs.patch -BuildRequires: qt-devel libaccounts-glib-devel -BuildRequires: doxygen graphviz + +%global commit0 2a9cc22ff7b0b62b60541423763cb3dd992c0f40 + +Name: libaccounts-qt +Summary: Accounts framework Qt bindings +Version: 1.13 +Release: 1%{?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 + +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(libaccounts-glib) +BuildRequires: doxygen +BuildRequires: graphviz %description -Framework to provide accounts for Qt. +%{summary}. -%package devel -Summary: Development files for accounts-qt -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt4-devel%{?_isa} +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description devel +%{summary}. -%description devel -Headers, development libraries and documentation for accounts-qt. %prep -%setup -q -n accounts-qt-%{version} +%setup -q -n libaccounts-qt-%{version}-%{commit0} + %patch1 -p1 -b .64bitarchs +%patch102 -p1 -b .0002 +%patch105 -p1 -b .0005 + %build -export PATH=%{_qt4_bindir}:$PATH -%{_qt4_qmake} QMF_INSTALL_ROOT=%{_prefix} \ - CONFIG+=release accounts-qt.pro +%{qmake_qt4} \ + QMF_INSTALL_ROOT=%{_prefix} \ + CONFIG+=release \ + accounts-qt.pro make %{?_smp_mflags} + %install make install INSTALL_ROOT=%{buildroot} -rm -f %{buildroot}/%{_datadir}/doc/accounts-qt/html/installdox +rm -fv %{buildroot}%{_datadir}/doc/accounts-qt/html/installdox #remove tests for now -rm -rf %{buildroot}%{_datadir}/%{name}-tests -rm -f %{buildroot}%{_bindir}/accountstest +rm -rfv %{buildroot}%{_datadir}/libaccounts-qt-tests +rm -fv %{buildroot}%{_bindir}/accountstest # move installed docs to include them in subpackage via %%doc magic rm -rf __tmp_doc ; mkdir __tmp_doc mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc -%post -p /sbin/ldconfig +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc COPYING -%{_libdir}/lib*.so.* +%license COPYING +%{_libdir}/libaccounts-qt.so.* %files devel -%{_libdir}/lib*.so +%{_libdir}/libaccounts-qt.so %{_includedir}/accounts-qt/ %{_libdir}/pkgconfig/accounts-qt.pc -%{_libdir}/cmake/AccountsQt +%{_libdir}/cmake/AccountsQt/ %doc __tmp_doc/accounts-qt/* + %changelog +* Mon Sep 28 2015 Rex Dieter 1.13-1 +- libaccounts-qt-1.13, merge improvements from libaccounts-qt5 + * Wed Jun 17 2015 Fedora Release Engineering - 1.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -92,38 +112,10 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Wed Mar 06 2013 Karsten Hopp 1.6-2 -- add s390x and ppc64 to 64bit archs using lib64 +- 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 - Remove accounts-tool - Cleanup - -* Thu Feb 14 2013 Fedora Release Engineering - 0.31-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 0.31-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.31-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.31-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Aug 06 2010 Chen Lei - 0.31-3 -- Fix doc path - -* Fri Aug 06 2010 Chen Lei - 0.31-2 -- Small fix for description - -* Fri Aug 06 2010 Chen Lei - 0.31-1 -- New upstream release -- Several changes against package review - -* Fri Jul 23 2010 Chen Lei - 0.28-1 -- Initial packaging for Fedora - -* Mon Jun 14 2010 Bernd Wachter - 0.28 -- Update to latest version diff --git a/sources b/sources index 2b79c0a..f7ea83e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a76f26849603f229399dc46eb83ed5a8 accounts-qt-1.11.tar.bz2 +308ca7df89c05c71978b62910315867f libaccounts-qt-1.13-2a9cc22ff7b0b62b60541423763cb3dd992c0f40.tar.gz From 8e77ce6b9d3c23112e3a017ca3e10e789e1496cd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 29 Oct 2015 11:20:29 -0500 Subject: [PATCH 19/41] 1.13-10 - hack around cannot build out of src-tree - provide -qt5, -doc here - own %_datadir/accounts/{providers,services} --- libaccounts-qt.spec | 85 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 78 insertions(+), 7 deletions(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 9ba5fb1..d5100dd 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -4,7 +4,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.13 -Release: 1%{?dist} +Release: 10%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -31,37 +31,81 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel %{summary}. +%package qt5 +Summary: Accounts framework Qt5 bindings +BuildRequires: pkgconfig(Qt5Gui) +%description qt5 +%{summary}. + +%package qt5-devel +Summary: Development files for %{name} +Requires: %{name}-qt5%{?_isa} = %{version}-%{release} +%description qt5-devel +%{summary}. + +%package doc +Summary: User and developer documentation for %{name} +Obsoletes: libaccounts-qt5-doc < 1.13-10 +Provides: libaccounts-qt5-doc = %{version}-%{release} +BuildArch: noarch +%description doc +%{summary}. + %prep %setup -q -n libaccounts-qt-%{version}-%{commit0} +# 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 +# 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" +## HACK ## +mkdir orig +mv * orig/ ||: +cp -a orig/ %{_target_platform}-qt4/ +cp -a orig/ %{_target_platform}-qt5/ +mv orig/* . + %build +pushd %{_target_platform}-qt4 %{qmake_qt4} \ QMF_INSTALL_ROOT=%{_prefix} \ CONFIG+=release \ accounts-qt.pro make %{?_smp_mflags} +popd + +pushd %{_target_platform}-qt5 +%{qmake_qt5} \ + QMF_INSTALL_ROOT=%{_prefix} \ + CONFIG+=release \ + accounts-qt.pro + +make %{?_smp_mflags} +popd %install -make install INSTALL_ROOT=%{buildroot} +make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-qt4 +make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-qt5 +# create/own dirs +mkdir -p %{buildroot}%{_datadir}/accounts/{providers,services} + +## unpackaged files rm -fv %{buildroot}%{_datadir}/doc/accounts-qt/html/installdox #remove tests for now rm -rfv %{buildroot}%{_datadir}/libaccounts-qt-tests rm -fv %{buildroot}%{_bindir}/accountstest -# move installed docs to include them in subpackage via %%doc magic -rm -rf __tmp_doc ; mkdir __tmp_doc -mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -69,16 +113,43 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %files %license COPYING %{_libdir}/libaccounts-qt.so.* +%dir %{_datadir}/accounts/ +%dir %{_datadir}/accounts/providers/ +%dir %{_datadir}/accounts/services/ %files devel %{_libdir}/libaccounts-qt.so %{_includedir}/accounts-qt/ %{_libdir}/pkgconfig/accounts-qt.pc %{_libdir}/cmake/AccountsQt/ -%doc __tmp_doc/accounts-qt/* + +%post qt5 -p /sbin/ldconfig +%postun qt5 -p /sbin/ldconfig + +%files qt5 +%license COPYING +%{_libdir}/libaccounts-qt5.so.* +%dir %{_datadir}/accounts/ +%dir %{_datadir}/accounts/providers/ +%dir %{_datadir}/accounts/services/ + + +%files qt5-devel +%{_libdir}/libaccounts-qt5.so +%{_includedir}/accounts-qt5/ +%{_libdir}/pkgconfig/accounts-qt5.pc +%{_libdir}/cmake/AccountsQt5 + +%files doc +%{_docdir}/accounts-qt/ %changelog +* Thu Oct 29 2015 Rex Dieter - 1.13-10 +- hack around cannot build out of src-tree +- provide -qt5, -doc here +- own %%_datadir/accounts/{providers,services} + * Mon Sep 28 2015 Rex Dieter 1.13-1 - libaccounts-qt-1.13, merge improvements from libaccounts-qt5 From 4397087851836b3fac5aa4a73b3ee4fdb3201930 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 30 Oct 2015 06:57:20 -0500 Subject: [PATCH 20/41] name qt5 subpkgs properly (libaccounts-qt-qt5 => libaccounts-qt5) --- libaccounts-qt.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index d5100dd..437c8e2 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -4,7 +4,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.13 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -31,16 +31,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel %{summary}. -%package qt5 +%package -n libaccounts-qt5 Summary: Accounts framework Qt5 bindings BuildRequires: pkgconfig(Qt5Gui) -%description qt5 +Obsoletes: libaccounts-qt-qt5 < 1.13-11 +%description -n libaccounts-qt5 %{summary}. -%package qt5-devel +%package -n libaccounts-qt5-devel Summary: Development files for %{name} -Requires: %{name}-qt5%{?_isa} = %{version}-%{release} -%description qt5-devel +Obsoletes: libaccounts-qt-qt5-devel < 1.13-11 +Requires: libaccounts-qt5%{?_isa} = %{version}-%{release} +%description -n libaccounts-qt5-devel %{summary}. %package doc @@ -123,10 +125,10 @@ rm -fv %{buildroot}%{_bindir}/accountstest %{_libdir}/pkgconfig/accounts-qt.pc %{_libdir}/cmake/AccountsQt/ -%post qt5 -p /sbin/ldconfig -%postun qt5 -p /sbin/ldconfig +%post -n libaccounts-qt5 -p /sbin/ldconfig +%postun -n libaccounts-qt5 -p /sbin/ldconfig -%files qt5 +%files -n libaccounts-qt5 %license COPYING %{_libdir}/libaccounts-qt5.so.* %dir %{_datadir}/accounts/ @@ -134,7 +136,7 @@ rm -fv %{buildroot}%{_bindir}/accountstest %dir %{_datadir}/accounts/services/ -%files qt5-devel +%files -n libaccounts-qt5-devel %{_libdir}/libaccounts-qt5.so %{_includedir}/accounts-qt5/ %{_libdir}/pkgconfig/accounts-qt5.pc @@ -145,6 +147,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Fri Oct 30 2015 Rex Dieter 1.13-11 +- name qt5 subpkgs properly (libaccounts-qt-qt5 => libaccounts-qt5) + * Thu Oct 29 2015 Rex Dieter - 1.13-10 - hack around cannot build out of src-tree - provide -qt5, -doc here From 88110ed55b64080567f2eff709b6f20d1f96459c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 02:53:02 +0000 Subject: [PATCH 21/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 437c8e2..7c0153b 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -4,7 +4,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.13 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -147,6 +147,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.13-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Oct 30 2015 Rex Dieter 1.13-11 - name qt5 subpkgs properly (libaccounts-qt-qt5 => libaccounts-qt5) From 6c9473b513751541fa0f08d9ca89eaff3309b301 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 12 Aug 2016 13:06:55 -0500 Subject: [PATCH 22/41] more rebust libdir handling (#1366692) --- libaccounts-qt-64bitarchs.patch | 18 ------------------ libaccounts-qt.spec | 10 ++++++---- 2 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 libaccounts-qt-64bitarchs.patch diff --git a/libaccounts-qt-64bitarchs.patch b/libaccounts-qt-64bitarchs.patch deleted file mode 100644 index 6ac9b3d..0000000 --- a/libaccounts-qt-64bitarchs.patch +++ /dev/null @@ -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 diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 7c0153b..c27f809 100644 --- a/libaccounts-qt.spec +++ b/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 - 1.13-13 +- more rebust libdir handling (#1366692) + * Thu Feb 04 2016 Fedora Release Engineering - 1.13-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5836e40ca2ca48fd87261bd7aa745c3fa62b3094 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 12 Aug 2016 13:18:27 -0500 Subject: [PATCH 23/41] typo --- libaccounts-qt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index c27f809..c21237a 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -147,7 +147,7 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog * Fri Aug 12 2016 Rex Dieter - 1.13-13 -- more rebust libdir handling (#1366692) +- more robust libdir handling (#1366692) * Thu Feb 04 2016 Fedora Release Engineering - 1.13-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ce82be3b6d52c2b4f4717f1f8229fe77edfd2676 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 29 Sep 2016 08:34:50 -0500 Subject: [PATCH 24/41] libaccounts-qt-1.15, drop qt4 support (FTBFS) --- .gitignore | 1 + 0002-Fix-memory-leaks-found-by-valgrind.patch | 60 ----------------- 0005-Use-gboolean-instead-of-bool.patch | 34 ---------- libaccounts-qt.spec | 65 ++++--------------- sources | 2 +- 5 files changed, 13 insertions(+), 149 deletions(-) delete mode 100644 0002-Fix-memory-leaks-found-by-valgrind.patch delete mode 100644 0005-Use-gboolean-instead-of-bool.patch diff --git a/.gitignore b/.gitignore index bc201bd..70750ee 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ accounts-qt-0.31.tar.gz /accounts-qt-1.6.tar.bz2 /accounts-qt-1.11.tar.bz2 /libaccounts-qt-1.13-2a9cc22ff7b0b62b60541423763cb3dd992c0f40.tar.gz +/libaccounts-qt-1.15.tar.gz diff --git a/0002-Fix-memory-leaks-found-by-valgrind.patch b/0002-Fix-memory-leaks-found-by-valgrind.patch deleted file mode 100644 index fa2936c..0000000 --- a/0002-Fix-memory-leaks-found-by-valgrind.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 533aa917f2de9030a05e745a0e49a53a7fb4b36e Mon Sep 17 00:00:00 2001 -From: Vyacheslav Monich -Date: Fri, 5 Sep 2014 16:23:44 +0300 -Subject: [PATCH 2/6] Fix memory leaks found by valgrind - -Fixes: https://code.google.com/p/accounts-sso/issues/detail?id=239 ---- - Accounts/account-service.cpp | 4 +++- - Accounts/auth-data.cpp | 1 + - Accounts/utils.cpp | 4 +++- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/Accounts/account-service.cpp b/Accounts/account-service.cpp -index 9da8f8c..6661685 100644 ---- a/Accounts/account-service.cpp -+++ b/Accounts/account-service.cpp -@@ -504,5 +504,7 @@ AuthData AccountService::authData() const - - AgAuthData *agAuthData = - ag_account_service_get_auth_data(d->m_accountService); -- return AuthData(agAuthData); -+ AuthData authData(agAuthData); -+ ag_auth_data_unref(agAuthData); -+ return authData; - } -diff --git a/Accounts/auth-data.cpp b/Accounts/auth-data.cpp -index ef4b8d9..ed30396 100644 ---- a/Accounts/auth-data.cpp -+++ b/Accounts/auth-data.cpp -@@ -109,6 +109,7 @@ QVariantMap AuthData::parameters() const - if (glibParameters == 0) return QVariantMap(); - - QVariant variant = gVariantToQVariant(glibParameters); -+ g_variant_unref(glibParameters); - if (!variant.isValid()) return QVariantMap(); - - return variant.toMap(); -diff --git a/Accounts/utils.cpp b/Accounts/utils.cpp -index 71e24b6..dd0c7e1 100644 ---- a/Accounts/utils.cpp -+++ b/Accounts/utils.cpp -@@ -32,12 +32,14 @@ static QVariantMap gVariantToQVariantMap(GVariant *variant) - { - QVariantMap ret; - GVariantIter iter; -- const gchar *key; -+ gchar *key; - GVariant *value; - - g_variant_iter_init (&iter, variant); - while (g_variant_iter_next (&iter, "{sv}", &key, &value)) { - ret.insert(UTF8(key), gVariantToQVariant(value)); -+ g_variant_unref(value); -+ g_free(key); - } - - return ret; --- -2.5.0 - diff --git a/0005-Use-gboolean-instead-of-bool.patch b/0005-Use-gboolean-instead-of-bool.patch deleted file mode 100644 index 2d52b19..0000000 --- a/0005-Use-gboolean-instead-of-bool.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 207139e65e6707100d2e92d96b1a4c3bfaa88a5f Mon Sep 17 00:00:00 2001 -From: Mikko Harju -Date: Thu, 13 Aug 2015 03:09:07 -0400 -Subject: [PATCH 5/6] Use gboolean instead of bool - -The "use-dbus" is a boolean g_object property, with actual type of -gboolean, and gboolean is typedef int. g_object_get is a variadic -function (no static type checking), and stores the queried value -through pointer-to-int. If sizeof(bool) happens to be less than -sizeof(int) and the stack variable useDBus is packed tightly, -this can lead to stack corruption. - -Compiling the lib with -fstack-protector immediately pointed out -the problem. ---- - Accounts/manager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Accounts/manager.cpp b/Accounts/manager.cpp -index 2eb077f..1ac78d0 100644 ---- a/Accounts/manager.cpp -+++ b/Accounts/manager.cpp -@@ -530,7 +530,7 @@ bool Manager::abortOnTimeout() const - */ - Manager::Options Manager::options() const - { -- bool useDBus = true; -+ gboolean useDBus = true; - g_object_get(d->m_manager, - "use-dbus", &useDBus, - NULL); --- -2.5.0 - diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index c21237a..67353a8 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,22 +1,18 @@ -%global commit0 2a9cc22ff7b0b62b60541423763cb3dd992c0f40 +%global commit0 5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8 +%global tag0 VERSION_%{version} Name: libaccounts-qt Summary: Accounts framework Qt bindings -Version: 1.13 -Release: 13%{?dist} +Version: 1.15 +Release: 1%{?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 +Source0: https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.gz?ref=%{tag0}#/libaccounts-qt-%{version}.tar.gz -## upstream patches -Patch102: 0002-Fix-memory-leaks-found-by-valgrind.patch -patch105: 0005-Use-gboolean-instead-of-bool.patch - -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(libaccounts-glib) +BuildRequires: pkgconfig(libaccounts-glib) >= 1.23 BuildRequires: doxygen BuildRequires: graphviz @@ -53,36 +49,13 @@ BuildArch: noarch %prep -%setup -q -n libaccounts-qt-%{version}-%{commit0} - -# 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" - -%patch102 -p1 -b .0002 -%patch105 -p1 -b .0005 +%setup -q -n libaccounts-qt-%{tag0}-%{commit0} # 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" -## HACK ## -mkdir orig -mv * orig/ ||: -cp -a orig/ %{_target_platform}-qt4/ -cp -a orig/ %{_target_platform}-qt5/ -mv orig/* . %build -pushd %{_target_platform}-qt4 -%{qmake_qt4} \ - QMF_INSTALL_ROOT=%{_prefix} \ - CONFIG+=release \ - LIBDIR=%{_libdir} \ - accounts-qt.pro - -make %{?_smp_mflags} -popd - -pushd %{_target_platform}-qt5 %{qmake_qt5} \ QMF_INSTALL_ROOT=%{_prefix} \ CONFIG+=release \ @@ -90,12 +63,10 @@ pushd %{_target_platform}-qt5 accounts-qt.pro make %{?_smp_mflags} -popd %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-qt4 -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-qt5 +make install INSTALL_ROOT=%{buildroot} # create/own dirs mkdir -p %{buildroot}%{_datadir}/accounts/{providers,services} @@ -108,22 +79,6 @@ rm -rfv %{buildroot}%{_datadir}/libaccounts-qt-tests rm -fv %{buildroot}%{_bindir}/accountstest -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%license COPYING -%{_libdir}/libaccounts-qt.so.* -%dir %{_datadir}/accounts/ -%dir %{_datadir}/accounts/providers/ -%dir %{_datadir}/accounts/services/ - -%files devel -%{_libdir}/libaccounts-qt.so -%{_includedir}/accounts-qt/ -%{_libdir}/pkgconfig/accounts-qt.pc -%{_libdir}/cmake/AccountsQt/ - %post -n libaccounts-qt5 -p /sbin/ldconfig %postun -n libaccounts-qt5 -p /sbin/ldconfig @@ -134,7 +89,6 @@ rm -fv %{buildroot}%{_bindir}/accountstest %dir %{_datadir}/accounts/providers/ %dir %{_datadir}/accounts/services/ - %files -n libaccounts-qt5-devel %{_libdir}/libaccounts-qt5.so %{_includedir}/accounts-qt5/ @@ -146,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Thu Sep 29 2016 Rex Dieter - 1.15-1 +- libaccounts-qt-1.15, drop qt4 support (FTBFS) + * Fri Aug 12 2016 Rex Dieter - 1.13-13 - more robust libdir handling (#1366692) diff --git a/sources b/sources index f7ea83e..707ff4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -308ca7df89c05c71978b62910315867f libaccounts-qt-1.13-2a9cc22ff7b0b62b60541423763cb3dd992c0f40.tar.gz +092a2445bb1ef0173210c77c37af28d9 libaccounts-qt-1.15.tar.gz From fc03ceb8bdd242f5945bda54aa68a2ab827462ae Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 29 Sep 2016 08:55:03 -0500 Subject: [PATCH 25/41] enable proper out-of-tree build --- libaccounts-qt.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 67353a8..9685ed3 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -51,22 +51,22 @@ BuildArch: noarch %prep %setup -q -n libaccounts-qt-%{tag0}-%{commit0} -# 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" - %build +mkdir %{_target_platform} +pushd %{_target_platform} %{qmake_qt5} \ QMF_INSTALL_ROOT=%{_prefix} \ CONFIG+=release \ LIBDIR=%{_libdir} \ - accounts-qt.pro + ../accounts-qt.pro +popd -make %{?_smp_mflags} +make %{?_smp_mflags} -C %{_target_platform} %install -make install INSTALL_ROOT=%{buildroot} +make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} # create/own dirs mkdir -p %{buildroot}%{_datadir}/accounts/{providers,services} @@ -102,6 +102,7 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog * Thu Sep 29 2016 Rex Dieter - 1.15-1 - libaccounts-qt-1.15, drop qt4 support (FTBFS) +- enable proper out-of-tree build * Fri Aug 12 2016 Rex Dieter - 1.13-13 - more robust libdir handling (#1366692) From 1d7f1454f1b9511def789a62e6209171d7042a28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:21:36 +0000 Subject: [PATCH 26/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 9685ed3..92e991a 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -100,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Sep 29 2016 Rex Dieter - 1.15-1 - libaccounts-qt-1.15, drop qt4 support (FTBFS) - enable proper out-of-tree build From 1277555135ae5ddee86f1c0129d86bd3e40bc45e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:30:47 +0000 Subject: [PATCH 27/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 92e991a..23b8973 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.15 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -100,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 5fc12b1dee8fbe69a9e8d912cb9b7bd99799926f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:10:12 +0000 Subject: [PATCH 28/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 23b8973..083fc2a 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.15 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -100,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 360c9805455a25f887f9cf790c6546ff20c21303 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:10:21 +0000 Subject: [PATCH 29/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 083fc2a..0c266e2 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.15 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -100,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.15-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a14c27e75800b3bbdc974628a5f4329baa04b62d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:47:55 +0000 Subject: [PATCH 30/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 0c266e2..1543e87 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.15 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -100,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.15-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 1114991833f49c1ef75c4f44e6e342876b82f1f3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:31 +0100 Subject: [PATCH 31/41] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libaccounts-qt.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 1543e87..70631eb 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -79,8 +79,7 @@ rm -rfv %{buildroot}%{_datadir}/libaccounts-qt-tests rm -fv %{buildroot}%{_bindir}/accountstest -%post -n libaccounts-qt5 -p /sbin/ldconfig -%postun -n libaccounts-qt5 -p /sbin/ldconfig +%ldconfig_scriptlets -n libaccounts-qt5 %files -n libaccounts-qt5 %license COPYING From 96cdd47261cc2fda2f9e13ff91df45d65b85a07a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:39:19 +0000 Subject: [PATCH 32/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 70631eb..050cc22 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.15 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -99,6 +99,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 7ce0e49b2b7216351692238dc331277f7bf0e33e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 12:46:10 +0000 Subject: [PATCH 33/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 050cc22..20812e8 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.15 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -99,6 +99,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.15-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.15-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c2b0ac297205b4a7edaab97c5337c47d04b902d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:32:39 +0000 Subject: [PATCH 34/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 20812e8..0b4ae8b 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.15 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -99,6 +99,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.15-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.15-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2fd2a5df9aabcde2eb884b38f95f74c6018b7f68 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Feb 2020 09:07:50 -0600 Subject: [PATCH 35/41] 1.16 use %make_build --- .gitignore | 1 + libaccounts-qt.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 70750ee..b809ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ accounts-qt-0.31.tar.gz /accounts-qt-1.11.tar.bz2 /libaccounts-qt-1.13-2a9cc22ff7b0b62b60541423763cb3dd992c0f40.tar.gz /libaccounts-qt-1.15.tar.gz +/libaccounts-qt-1.16.tar.gz diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 0b4ae8b..ae5669d 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,11 +1,11 @@ -%global commit0 5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8 +%global commit0 525ec684cfa8d234f797d7e49e21c476eea04d8e %global tag0 VERSION_%{version} Name: libaccounts-qt Summary: Accounts framework Qt bindings -Version: 1.15 -Release: 9%{?dist} +Version: 1.16 +Release: 1%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -62,7 +62,7 @@ pushd %{_target_platform} ../accounts-qt.pro popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -99,6 +99,10 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Tue Feb 11 2020 Rex Dieter - 1.16-1 +- 1.16 +- use %%make_build + * Wed Jan 29 2020 Fedora Release Engineering - 1.15-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 707ff4e..6249c24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -092a2445bb1ef0173210c77c37af28d9 libaccounts-qt-1.15.tar.gz +SHA512 (libaccounts-qt-1.16.tar.gz) = ea495f508cd383a8f936277b5e86ceda86b2912d262145e8c097b713d53c14760c6b5b8cfb58de1d0aeee6d13be504fa94a78db07ff027ea9d28f5a43d4a29c3 From 1bc73c5c2c1b805cc3609b3100dec3c232e8f1fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:12:53 +0000 Subject: [PATCH 36/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index ae5669d..73eeef8 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.16 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -99,6 +99,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Feb 11 2020 Rex Dieter - 1.16-1 - 1.16 - use %%make_build From 81ada7b9f7164fa71e0eae13b0a8cf05de508154 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 01:23:34 +0000 Subject: [PATCH 37/41] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libaccounts-qt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 73eeef8..ad7fcc0 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -28,6 +28,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %package -n libaccounts-qt5 Summary: Accounts framework Qt5 bindings BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: make Obsoletes: libaccounts-qt-qt5 < 1.13-11 %description -n libaccounts-qt5 %{summary}. From b16589eb4bb0c8cd071abadf13b2dae2edb98560 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:38:12 +0000 Subject: [PATCH 38/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index ad7fcc0..fe5f513 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.16 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -100,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 511c50f907c616fbf101029f71a42a9c73e1bfbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 10:56:00 +0000 Subject: [PATCH 39/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index fe5f513..3b32395 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.16 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -100,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2eca6aa2e2dc9b938eb780ae577b0ac4770a7515 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:44:02 +0000 Subject: [PATCH 40/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libaccounts-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index 3b32395..955741a 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -5,7 +5,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.16 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -100,6 +100,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0ea14379a8a1c5112af075073d67bc8e9bd75c57 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 22:56:16 +0300 Subject: [PATCH 41/41] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 6249c24..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libaccounts-qt-1.16.tar.gz) = ea495f508cd383a8f936277b5e86ceda86b2912d262145e8c097b713d53c14760c6b5b8cfb58de1d0aeee6d13be504fa94a78db07ff027ea9d28f5a43d4a29c3