From b99bcc5c7f84596381410b3b91e70ea7e834f649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 21 May 2014 14:02:46 +0200 Subject: [PATCH 001/105] Import package (kf5-kconfig-4.99.0-2) --- .gitignore | 1 + kf5-kconfig.spec | 127 +++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 129 insertions(+) create mode 100644 kf5-kconfig.spec diff --git a/.gitignore b/.gitignore index e69de29..da6e526 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/kconfig-4.99.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec new file mode 100644 index 0000000..3c87537 --- /dev/null +++ b/kf5-kconfig.spec @@ -0,0 +1,127 @@ +#%define snapshot 20140205 +%define framework kconfig + +Name: kf5-%{framework} +Version: 4.99.0 +Release: 2%{?dist} +Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system + +License: GPLv2+ and LGPLv2+ and MIT +URL: http://www.kde.org +# git archive --format=tar --prefix=%{framework}-%{version}/ \ +# --remote=git://anongit.kde.org/%{framework}.git master | \ +# bzip2 -c > %{name}-%{version}-%{snapshot}git.tar.bz2 +#Source0: %{name}-%{version}-%{snapshot}git.tar.bz2 +Source0: http://download.kde.org/unstable/frameworks/4.99.0/%{framework}-4.99.0.tar.xz + +BuildRequires: kf5-rpm-macros +BuildRequires: extra-cmake-modules +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel + +Requires: kf5-filesystem +Requires: kf5-kconfig-core%{?_isa} = %{version}-%{release} +Requires: kf5-kconfig-gui%{?_isa} = %{version}-%{release} + +%description +KDE Frameworks 5 Tier 1 addon with advanced configuration system made of two +parts: KConfigCore and KConfigGui. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package core +Summary: Non-GUI part of KConfig framework + +%description core +KConfigCore provides access to the configuration files themselves. It features +centralized definition and lock-down (kiosk) support. + +%package gui +Summary: GUI part of KConfig framework +Requires: kf5-kconfig-core%{?_isa} = %{version}-%{release} + +%description gui +KConfigGui provides a way to hook widgets to the configuration so that they are +automatically initialized from the configuration and automatically propagate +their changes to their respective configuration files. + +%prep +%setup -q -n %{framework}-%{version} + +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kf5} .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + +%install +%make_install -C %{_target_platform} +%find_lang kconfig5_qt --with-qt --all-name + +%post core -p /sbin/ldconfig + +%postun core -p /sbin/ldconfig + +%post gui -p /sbin/ldconfig + +%postun gui -p /sbin/ldconfig + +%files +%doc COPYING.LIB DESIGN README.md TODO + +%files core -f kconfig5_qt.lang +%{_kf5_bindir}/kreadconfig5 +%{_kf5_bindir}/kwriteconfig5 +%{_kf5_bindir}/kconfig_compiler_kf5 +%{_kf5_libdir}/libKF5ConfigCore.so.* +%{_kf5_libexecdir}/kconf_update + +%files gui +%{_kf5_libdir}/libKF5ConfigGui.so.* + +%files devel +%{_kf5_includedir}/kconfig_version.h +%{_kf5_includedir}/KConfigCore +%{_kf5_includedir}/KConfigGui +%{_kf5_libdir}/libKF5ConfigCore.so +%{_kf5_libdir}/libKF5ConfigGui.so +%{_kf5_libdir}/cmake/KF5Config +%{_kf5_archdatadir}/mkspecs/modules/qt_KConfigCore.pri +%{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri + +%changelog +* Tue May 20 2014 Daniel Vrátil - 4.99.0-3 +- Fix license and description +- Add %%post and %%postun to subpackages + +* Tue May 06 2014 Daniel Vrátil - 4.99.0-2 +- Rebuild against updated kf5-rpm-macros + +* Mon May 05 2014 Daniel Vrátil - 4.99.0-1 +- KDE Frameworks 4.99.0 + +* Mon Mar 31 2014 Jan Grulich 4.98.0-1 +- Update to KDE Frameworks 5 Beta 1 (4.98.0) + +* Wed Mar 05 2014 Jan Grulich 4.97.0-1 +- Update to KDE Frameworks 5 Alpha 1 (4.97.0) + +* Wed Feb 12 2014 Daniel Vrátil 4.96.0-1 +- Update to KDE Frameworks 5 Alpha 1 (4.96.0) + +* Wed Feb 05 2014 Daniel Vrátil 4.96.0-0.1.20140205git +- Update to pre-release snapshot of 4.96.0 + +* Thu Jan 09 2014 Daniel Vrátil 4.95.0-1 +- Update to KDE Frameworks 5 TP1 (4.95.0) + +* Sat Jan 4 2014 Daniel Vrátil +- initial version diff --git a/sources b/sources index e69de29..5b0a404 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e33647c16fabe50a9545476b6be03eb3 kconfig-4.99.0.tar.xz From 0cde713a82b15fce5fccd1eec007e4b73e21a155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 3 Jun 2014 11:58:34 +0200 Subject: [PATCH 002/105] KDE Frameworks 4.100.0 --- .gitignore | 1 + kf5-kconfig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index da6e526..39eef62 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kconfig-4.99.0.tar.xz +/kconfig-4.100.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 3c87537..1aa1b36 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,8 +2,8 @@ %define framework kconfig Name: kf5-%{framework} -Version: 4.99.0 -Release: 2%{?dist} +Version: 4.100.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -12,7 +12,7 @@ URL: http://www.kde.org # --remote=git://anongit.kde.org/%{framework}.git master | \ # bzip2 -c > %{name}-%{version}-%{snapshot}git.tar.bz2 #Source0: %{name}-%{version}-%{snapshot}git.tar.bz2 -Source0: http://download.kde.org/unstable/frameworks/4.99.0/%{framework}-4.99.0.tar.xz +Source0: http://download.kde.org/unstable/frameworks/4.100.0/%{framework}-4.100.0.tar.xz%{framework}-4.99.0.tar.xz BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -98,6 +98,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Tue Jun 03 2014 Daniel Vrátil - 4.100.0-1 +- KDE Frameworks 4.100.0 + * Tue May 20 2014 Daniel Vrátil - 4.99.0-3 - Fix license and description - Add %%post and %%postun to subpackages diff --git a/sources b/sources index 5b0a404..a7cb3bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e33647c16fabe50a9545476b6be03eb3 kconfig-4.99.0.tar.xz +091b15ae8b98825af1ac9098009e76c4 kconfig-4.100.0.tar.xz From 34ee893141c4b054d6c306caf8d0f2fc9dd52342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 3 Jun 2014 12:34:51 +0200 Subject: [PATCH 003/105] Fix Source0 URL --- kf5-kconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 1aa1b36..f2afa1b 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -12,7 +12,7 @@ URL: http://www.kde.org # --remote=git://anongit.kde.org/%{framework}.git master | \ # bzip2 -c > %{name}-%{version}-%{snapshot}git.tar.bz2 #Source0: %{name}-%{version}-%{snapshot}git.tar.bz2 -Source0: http://download.kde.org/unstable/frameworks/4.100.0/%{framework}-4.100.0.tar.xz%{framework}-4.99.0.tar.xz +Source0: http://download.kde.org/unstable/frameworks/%{version}/%{framework}-%{version}.tar.xz BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules From a024dc06677c46ce9a8cdd1d857a5dfdfda0c8cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:24:41 -0500 Subject: [PATCH 004/105] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index f2afa1b..8f77147 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -3,7 +3,7 @@ Name: kf5-%{framework} Version: 4.100.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -98,6 +98,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 4.100.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Jun 03 2014 Daniel Vrátil - 4.100.0-1 - KDE Frameworks 4.100.0 From 73dfcb1a39d051e028f4b958cd1c7ca7380ae4b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 9 Jul 2014 15:24:31 +0200 Subject: [PATCH 005/105] KDE Frameworks 5.0.0 --- .gitignore | 1 + kf5-kconfig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 39eef62..d3a1975 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /kconfig-4.99.0.tar.xz /kconfig-4.100.0.tar.xz +/kconfig-5.0.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 8f77147..f3e6eb4 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,8 +2,8 @@ %define framework kconfig Name: kf5-%{framework} -Version: 4.100.0 -Release: 2%{?dist} +Version: 5.0.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -12,7 +12,7 @@ URL: http://www.kde.org # --remote=git://anongit.kde.org/%{framework}.git master | \ # bzip2 -c > %{name}-%{version}-%{snapshot}git.tar.bz2 #Source0: %{name}-%{version}-%{snapshot}git.tar.bz2 -Source0: http://download.kde.org/unstable/frameworks/%{version}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/stable/frameworks/%{version}/%{framework}-%{version}.tar.xz BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -98,6 +98,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Wed Jul 09 2014 Daniel Vrátil - 5.0.0-1 +- KDE Frameworks 5.0.0 + * Sun Jun 08 2014 Fedora Release Engineering - 4.100.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index a7cb3bb..d2d6a05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -091b15ae8b98825af1ac9098009e76c4 kconfig-4.100.0.tar.xz +d7cdb25dd4645904332ef9eee71143ec kconfig-5.0.0.tar.xz From 90fcd3513ab4fe0e5154057581fffd5a68521c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 6 Aug 2014 15:05:06 +0200 Subject: [PATCH 006/105] KDE Frameworks 5.1.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d3a1975..3ef3918 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /kconfig-4.99.0.tar.xz /kconfig-4.100.0.tar.xz /kconfig-5.0.0.tar.xz +/kconfig-5.1.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index f3e6eb4..e74f223 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ %define framework kconfig Name: kf5-%{framework} -Version: 5.0.0 +Version: 5.1.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -98,6 +98,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Wed Aug 06 2014 Daniel Vrátil - 5.1.0-1 +- KDE Frameworks 5.1.0 + * Wed Jul 09 2014 Daniel Vrátil - 5.0.0-1 - KDE Frameworks 5.0.0 diff --git a/sources b/sources index d2d6a05..b91f6ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7cdb25dd4645904332ef9eee71143ec kconfig-5.0.0.tar.xz +aa54e94c9ba08a681a6ebae151046632 kconfig-5.1.0.tar.xz From 82867f5633c33b32d2484c84056bc2322c3faad4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 23:41:45 +0000 Subject: [PATCH 007/105] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index e74f223..a72447a 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -3,7 +3,7 @@ Name: kf5-%{framework} Version: 5.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -98,6 +98,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 5.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Aug 06 2014 Daniel Vrátil - 5.1.0-1 - KDE Frameworks 5.1.0 From c1119585c89411ee3fa8245f5b88804e0e2bde70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 11 Sep 2014 09:48:48 +0200 Subject: [PATCH 008/105] KDE Frameworks 5.2.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ef3918..d2b80e0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /kconfig-4.100.0.tar.xz /kconfig-5.0.0.tar.xz /kconfig-5.1.0.tar.xz +/kconfig-5.2.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index a72447a..a2e18a8 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,8 +2,8 @@ %define framework kconfig Name: kf5-%{framework} -Version: 5.1.0 -Release: 2%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -98,6 +98,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Thu Sep 11 2014 Daniel Vrátil - 5.2.0-1 +- KDE Frameworks 5.2.0 + * Sat Aug 16 2014 Fedora Release Engineering - 5.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index b91f6ff..538855e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa54e94c9ba08a681a6ebae151046632 kconfig-5.1.0.tar.xz +21b0742e2b99c939af613794ba526be6 kconfig-5.2.0.tar.xz From d689815593d40f78da90a14606e96df6f3c98ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 7 Oct 2014 12:59:33 +0200 Subject: [PATCH 009/105] KDE Frameworks 5.3.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d2b80e0..853f499 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /kconfig-5.0.0.tar.xz /kconfig-5.1.0.tar.xz /kconfig-5.2.0.tar.xz +/kconfig-5.3.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index a2e18a8..09cf43a 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ %define framework kconfig Name: kf5-%{framework} -Version: 5.2.0 +Version: 5.3.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -98,6 +98,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Tue Oct 07 2014 Daniel Vrátil - 5.3.0-1 +- KDE Frameworks 5.3.0 + * Thu Sep 11 2014 Daniel Vrátil - 5.2.0-1 - KDE Frameworks 5.2.0 diff --git a/sources b/sources index 538855e..1136036 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21b0742e2b99c939af613794ba526be6 kconfig-5.2.0.tar.xz +ca8602ef35b7a884f190be38a335e59d kconfig-5.3.0.tar.xz From 6bcf89fb03edeecbd0bdee02f642054ff4113124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 3 Nov 2014 12:04:58 +0100 Subject: [PATCH 010/105] KDE Frameworks 5.4.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 853f499..a9eece1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /kconfig-5.1.0.tar.xz /kconfig-5.2.0.tar.xz /kconfig-5.3.0.tar.xz +/kconfig-5.4.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 09cf43a..412d860 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ %define framework kconfig Name: kf5-%{framework} -Version: 5.3.0 +Version: 5.4.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -98,6 +98,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Mon Nov 03 2014 Daniel Vrátil - 5.4.0-1 +- KDE Frameworks 5.4.0 + * Tue Oct 07 2014 Daniel Vrátil - 5.3.0-1 - KDE Frameworks 5.3.0 diff --git a/sources b/sources index 1136036..dc64aaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca8602ef35b7a884f190be38a335e59d kconfig-5.3.0.tar.xz +2fcd2787e5c3c2df7265fc9f6ec8af10 kconfig-5.4.0.tar.xz From f0ae9a1f2a616932aa6c93424ba93c71609b4f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 3 Nov 2014 12:54:11 +0100 Subject: [PATCH 011/105] Clean up spec file, autodetect stable/unstable download folder --- kf5-kconfig.spec | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 412d860..0ecd843 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,4 +1,3 @@ -#%define snapshot 20140205 %define framework kconfig Name: kf5-%{framework} @@ -8,11 +7,14 @@ Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT URL: http://www.kde.org -# git archive --format=tar --prefix=%{framework}-%{version}/ \ -# --remote=git://anongit.kde.org/%{framework}.git master | \ -# bzip2 -c > %{name}-%{version}-%{snapshot}git.tar.bz2 -#Source0: %{name}-%{version}-%{snapshot}git.tar.bz2 -Source0: http://download.kde.org/stable/frameworks/%{version}/%{framework}-%{version}.tar.xz + +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/frameworks/%{version}/%{framework}-%{version}.tar.xz BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -20,8 +22,8 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel Requires: kf5-filesystem -Requires: kf5-kconfig-core%{?_isa} = %{version}-%{release} -Requires: kf5-kconfig-gui%{?_isa} = %{version}-%{release} +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-gui%{?_isa} = %{version}-%{release} %description KDE Frameworks 5 Tier 1 addon with advanced configuration system made of two @@ -44,7 +46,7 @@ centralized definition and lock-down (kiosk) support. %package gui Summary: GUI part of KConfig framework -Requires: kf5-kconfig-core%{?_isa} = %{version}-%{release} +Requires: %{name}-core%{?_isa} = %{version}-%{release} %description gui KConfigGui provides a way to hook widgets to the configuration so that they are @@ -66,17 +68,13 @@ make %{?_smp_mflags} -C %{_target_platform} %make_install -C %{_target_platform} %find_lang kconfig5_qt --with-qt --all-name -%post core -p /sbin/ldconfig - -%postun core -p /sbin/ldconfig - -%post gui -p /sbin/ldconfig - -%postun gui -p /sbin/ldconfig %files %doc COPYING.LIB DESIGN README.md TODO +%post core -p /sbin/ldconfig +%postun core -p /sbin/ldconfig + %files core -f kconfig5_qt.lang %{_kf5_bindir}/kreadconfig5 %{_kf5_bindir}/kwriteconfig5 @@ -84,6 +82,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_libdir}/libKF5ConfigCore.so.* %{_kf5_libexecdir}/kconf_update +%post gui -p /sbin/ldconfig +%postun gui -p /sbin/ldconfig + %files gui %{_kf5_libdir}/libKF5ConfigGui.so.* @@ -97,6 +98,7 @@ make %{?_smp_mflags} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigCore.pri %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri + %changelog * Mon Nov 03 2014 Daniel Vrátil - 5.4.0-1 - KDE Frameworks 5.4.0 From 239bcdc573e72365857f97dc936ef733fdaa1193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 3 Nov 2014 13:35:55 +0100 Subject: [PATCH 012/105] Use %global instead of %define --- kf5-kconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 0ecd843..afe8994 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,4 +1,4 @@ -%define framework kconfig +%global framework kconfig Name: kf5-%{framework} Version: 5.4.0 From f9493dea646c92097319034aa33d5b1ba10fb747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 8 Dec 2014 15:02:43 +0100 Subject: [PATCH 013/105] KDE Frameworks 5.5.0 --- .gitignore | 1 + kf5-kconfig.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a9eece1..5262c24 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /kconfig-5.2.0.tar.xz /kconfig-5.3.0.tar.xz /kconfig-5.4.0.tar.xz +/kconfig-5.5.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index afe8994..483b870 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,20 +1,21 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.4.0 +Version: 5.5.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT URL: http://www.kde.org +%global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{version}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -100,6 +101,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Mon Dec 08 2014 Daniel Vrátil - 5.5.0-1 +- KDE Frameworks 5.5.0 + * Mon Nov 03 2014 Daniel Vrátil - 5.4.0-1 - KDE Frameworks 5.4.0 diff --git a/sources b/sources index dc64aaf..6c741f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2fcd2787e5c3c2df7265fc9f6ec8af10 kconfig-5.4.0.tar.xz +ef541258af67ea5b0612fa7ec345c639 kconfig-5.5.0.tar.xz From 875b3c7da7efbfd38257660eefac6dcbcba928fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 8 Jan 2015 14:35:39 +0100 Subject: [PATCH 014/105] KDE Frameworks 5.6.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5262c24..dd8e227 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /kconfig-5.3.0.tar.xz /kconfig-5.4.0.tar.xz /kconfig-5.5.0.tar.xz +/kconfig-5.6.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 483b870..7aa7d90 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.5.0 +Version: 5.6.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -101,6 +101,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Thu Jan 08 2015 Daniel Vrátil - 5.6.0-1 +- KDE Frameworks 5.6.0 + * Mon Dec 08 2014 Daniel Vrátil - 5.5.0-1 - KDE Frameworks 5.5.0 diff --git a/sources b/sources index 6c741f4..86941ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef541258af67ea5b0612fa7ec345c639 kconfig-5.5.0.tar.xz +ff93f29fe3a3139e421725737a9ef3cd kconfig-5.6.0.tar.xz From ca894cd91ec1ce21dd03e78667c28d7e56186741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 16 Feb 2015 13:12:57 +0100 Subject: [PATCH 015/105] KDE Frameworks 5.7.0 --- kf5-kconfig.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 7aa7d90..046b0fd 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.6.0 +Version: 5.7.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -33,6 +33,7 @@ parts: KConfigCore and KConfigGui. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel %description devel The %{name}-devel package contains libraries and header files for @@ -101,6 +102,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Mon Feb 16 2015 Daniel Vrátil - 5.7.0-1 +- KDE Frameworks 5.7.0 + * Thu Jan 08 2015 Daniel Vrátil - 5.6.0-1 - KDE Frameworks 5.6.0 From adfdfa421679c557a356332aa93590702481d728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 16 Feb 2015 14:23:37 +0100 Subject: [PATCH 016/105] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dd8e227..3324ccc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /kconfig-5.4.0.tar.xz /kconfig-5.5.0.tar.xz /kconfig-5.6.0.tar.xz +/kconfig-5.7.0.tar.xz diff --git a/sources b/sources index 86941ed..1dd8610 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff93f29fe3a3139e421725737a9ef3cd kconfig-5.6.0.tar.xz +8589cb01dc2287399f8eb63966f79a84 kconfig-5.7.0.tar.xz From 383525bfbed1be5327ecfcd81b70a0aab6996233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 27 Feb 2015 18:09:26 +0100 Subject: [PATCH 017/105] Rebuild (GCC 5) --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 046b0fd..7851b2c 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -102,6 +102,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Fri Feb 27 2015 Daniel Vrátil - 5.7.0-2 +- Rebuild (GCC 5) + * Mon Feb 16 2015 Daniel Vrátil - 5.7.0-1 - KDE Frameworks 5.7.0 From 3449cb54b4da353653c2afff82baafa16d9b8730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 16 Mar 2015 12:49:35 +0100 Subject: [PATCH 018/105] KDE Frameworks 5.8.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3324ccc..e9b737a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /kconfig-5.5.0.tar.xz /kconfig-5.6.0.tar.xz /kconfig-5.7.0.tar.xz +/kconfig-5.8.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 7851b2c..6ee87d4 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.7.0 -Release: 2%{?dist} +Version: 5.8.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -102,6 +102,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Mon Mar 16 2015 Daniel Vrátil - 5.8.0-1 +- KDE Frameworks 5.8.0 + * Fri Feb 27 2015 Daniel Vrátil - 5.7.0-2 - Rebuild (GCC 5) diff --git a/sources b/sources index 1dd8610..10088f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8589cb01dc2287399f8eb63966f79a84 kconfig-5.7.0.tar.xz +aeedbcb2424156f714844d084e403af6 kconfig-5.8.0.tar.xz From f5b8345cdeef95f00fa9223744178f7385da6e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 7 Apr 2015 13:03:41 +0200 Subject: [PATCH 019/105] KDE Frameworks 5.9.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e9b737a..54ed790 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /kconfig-5.6.0.tar.xz /kconfig-5.7.0.tar.xz /kconfig-5.8.0.tar.xz +/kconfig-5.9.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 6ee87d4..6255294 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.8.0 +Version: 5.9.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -102,6 +102,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Tue Apr 07 2015 Daniel Vrátil - 5.9.0-1 +- KDE Frameworks 5.9.0 + * Mon Mar 16 2015 Daniel Vrátil - 5.8.0-1 - KDE Frameworks 5.8.0 diff --git a/sources b/sources index 10088f5..15abc33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aeedbcb2424156f714844d084e403af6 kconfig-5.8.0.tar.xz +cb210f051face97978d7aa64955ae8f7 kconfig-5.9.0.tar.xz From d7bfb6c0c4a67ebe4ce5bd7fb149ebd06f92d6c9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Apr 2015 17:34:05 -0500 Subject: [PATCH 020/105] 5.9.0-2 - -core: Requires: kde-settings - .spec cosmetics --- kf5-kconfig.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 6255294..cd1341b 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -34,6 +34,8 @@ parts: KConfigCore and KConfigGui. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel +## included for completeness and documentation, but part of qtbase-devel already -- rex +#Requires: pkgconfig(Qt5Xml) %description devel The %{name}-devel package contains libraries and header files for @@ -41,6 +43,7 @@ developing applications that use %{name}. %package core Summary: Non-GUI part of KConfig framework +Requires: kde-settings %description core KConfigCore provides access to the configuration files themselves. It features @@ -55,19 +58,23 @@ KConfigGui provides a way to hook widgets to the configuration so that they are automatically initialized from the configuration and automatically propagate their changes to their respective configuration files. + %prep %setup -q -n %{framework}-%{version} + %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} + %install -%make_install -C %{_target_platform} +make install/fast -C %{_target_platform} + %find_lang kconfig5_qt --with-qt --all-name @@ -102,6 +109,10 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Wed Apr 15 2015 Rex Dieter - 5.9.0-2 +- -core: Requires: kde-settings +- .spec cosmetics + * Tue Apr 07 2015 Daniel Vrátil - 5.9.0-1 - KDE Frameworks 5.9.0 From a9cbfbb00393da0025dc3cfea1741387b9e56a51 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Apr 2015 06:11:19 -0500 Subject: [PATCH 021/105] fix 'make install' --- kf5-kconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index cd1341b..d2592ab 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -73,7 +73,7 @@ make %{?_smp_mflags} -C %{_target_platform} %install -make install/fast -C %{_target_platform} +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %find_lang kconfig5_qt --with-qt --all-name From 952e0081644e8936f656385d5e7608f8160d974e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 9 May 2015 12:11:17 -0500 Subject: [PATCH 022/105] Candidate session management fixes (kde#346768) --- ...variant-for-KConfigGui_sessionConfig.patch | 128 ++++++++++++++++++ kf5-kconfig.spec | 12 +- 2 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 Add-2nd-variant-for-KConfigGui_sessionConfig.patch diff --git a/Add-2nd-variant-for-KConfigGui_sessionConfig.patch b/Add-2nd-variant-for-KConfigGui_sessionConfig.patch new file mode 100644 index 0000000..bce4ea8 --- /dev/null +++ b/Add-2nd-variant-for-KConfigGui_sessionConfig.patch @@ -0,0 +1,128 @@ +From 62f448faf202a5a174f0e0bb3d3a80f3109d234f Mon Sep 17 00:00:00 2001 +From: Stefan Becker +Date: Sat, 9 May 2015 17:16:27 +0300 +Subject: [PATCH] Add 2nd variant for KConfigGui::sessionConfig() + +When application receives a saveState signal it needs to get a KConfig +object based on the QSessionManager information. Add a new variant that +accepts the session manager object. + +BUG: 346768 +--- + src/gui/kconfiggui.cpp | 48 ++++++++++++++++++++++++++++++++++++++---------- + src/gui/kconfiggui.h | 14 +++++++++++++- + 2 files changed, 51 insertions(+), 11 deletions(-) + +diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp +index 0048c60..e1dcd09 100644 +--- a/src/gui/kconfiggui.cpp ++++ b/src/gui/kconfiggui.cpp +@@ -22,19 +22,52 @@ + #include "kconfiggui.h" + + #include ++#include + + #include + ++#define SESSION_TEMPLATE(id, key) \ ++ QLatin1String("session/") + QGuiApplication::applicationName() + \ ++ QLatin1Char('_') + (id) + \ ++ QLatin1Char('_') + (key) ++ + static KConfig *s_sessionConfig = Q_NULLPTR; + +-KConfig *KConfigGui::sessionConfig() ++static void ensureSessionConfig(void) + { +- if (!s_sessionConfig) { // create an instance specific config object +- s_sessionConfig = new KConfig(sessionConfigName(), KConfig::SimpleConfig); ++#ifdef QT_NO_SESSIONMANAGER ++#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. ++#endif ++ if (s_sessionConfig == Q_NULLPTR) { ++ // create an instance specific config object ++ s_sessionConfig = new KConfig(SESSION_TEMPLATE(qApp->sessionId(), ++ qApp->sessionKey()), ++ KConfig::SimpleConfig); + } ++} ++ ++KConfig *KConfigGui::sessionConfig() ++{ ++ ensureSessionConfig(); + return s_sessionConfig; + } + ++KConfig *KConfigGui::sessionConfig(const QSessionManager &sm) ++{ ++ if (hasSessionConfig()) { ++ // delete old config object without storing it to disk ++ s_sessionConfig->markAsClean(); ++ delete s_sessionConfig; ++ s_sessionConfig = Q_NULLPTR; ++ } ++ ++ // create a new instance specific config object ++ s_sessionConfig = new KConfig(SESSION_TEMPLATE(sm.sessionId(), ++ sm.sessionKey()), ++ KConfig::SimpleConfig); ++ return(s_sessionConfig); ++} ++ + bool KConfigGui::hasSessionConfig() + { + return s_sessionConfig != Q_NULLPTR; +@@ -42,11 +75,6 @@ bool KConfigGui::hasSessionConfig() + + QString KConfigGui::sessionConfigName() + { +-#ifdef QT_NO_SESSIONMANAGER +-#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. +-#endif +- const QString sessionKey = qApp->sessionKey(); +- const QString sessionId = qApp->sessionId(); +- return QString(QLatin1String("session/%1_%2_%3")).arg(QGuiApplication::applicationName()).arg(sessionId).arg(sessionKey); ++ ensureSessionConfig(); ++ return s_sessionConfig->name(); + } +- +diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h +index 173400f..10083b2 100644 +--- a/src/gui/kconfiggui.h ++++ b/src/gui/kconfiggui.h +@@ -27,11 +27,12 @@ + #include + + class KConfig; ++class QSessionManager; + + namespace KConfigGui + { + /** +- * Returns the application session config object. ++ * Returns the current application session config object. + * + * @return A pointer to the application's instance specific + * KConfig object. +@@ -40,6 +41,17 @@ namespace KConfigGui + KCONFIGGUI_EXPORT KConfig *sessionConfig(); + + /** ++ * Updates application session config object. ++ * ++ * @param sm session manager object ++ * ++ * @return A pointer to the application's instance specific ++ * KConfig object. ++ * @see KConfig ++ */ ++KCONFIGGUI_EXPORT KConfig *sessionConfig(const QSessionManager &sm); ++ ++/** + * Indicates if a session config has been created for that application + * (ie. if sessionConfig() got called at least once) + * +-- +2.4.0 + diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index d2592ab..94bf292 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -17,6 +17,11 @@ URL: http://www.kde.org %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +## upstreamable patches +# Candidate session management fixes +# https://bugs.kde.org/show_bug.cgi?id=346768 +Patch50: Add-2nd-variant-for-KConfigGui_sessionConfig.patch + BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules BuildRequires: qt5-qtbase-devel @@ -60,7 +65,7 @@ their changes to their respective configuration files. %prep -%setup -q -n %{framework}-%{version} +%autosetup -n %{framework}-%{version} -p1 %build @@ -109,6 +114,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sat May 09 2015 Rex Dieter 5.9.0-3 +- Candidate session management fixes (kde#346768) + * Wed Apr 15 2015 Rex Dieter - 5.9.0-2 - -core: Requires: kde-settings - .spec cosmetics From 69eb4e966b16f31e8c3df964fe6f3aa3dd4f9527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 11 May 2015 11:10:12 +0200 Subject: [PATCH 023/105] KDE Frameworks 5.10.0 --- .gitignore | 1 + kf5-kconfig.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 54ed790..263e93b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /kconfig-5.7.0.tar.xz /kconfig-5.8.0.tar.xz /kconfig-5.9.0.tar.xz +/kconfig-5.10.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 94bf292..b0364d6 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.9.0 -Release: 3%{?dist} +Version: 5.10.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -20,7 +20,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra ## upstreamable patches # Candidate session management fixes # https://bugs.kde.org/show_bug.cgi?id=346768 -Patch50: Add-2nd-variant-for-KConfigGui_sessionConfig.patch BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -114,6 +113,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon May 11 2015 Daniel Vrátil - 5.10.0-1 +- KDE Frameworks 5.10.0 + * Sat May 09 2015 Rex Dieter 5.9.0-3 - Candidate session management fixes (kde#346768) diff --git a/sources b/sources index 15abc33..8e31e43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb210f051face97978d7aa64955ae8f7 kconfig-5.9.0.tar.xz +0c762fbe3b98fede3e8a7af3e18e71bb kconfig-5.10.0.tar.xz From 74751fdfc3b43dbb2a8aa3dc94b462e994324885 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 11 May 2015 15:43:00 -0500 Subject: [PATCH 024/105] pull in reviewed/upstreamed session management fixes (kde#346768) --- 0001-Add-KConfigGui-setSessionConfig.patch | 127 +++++++++++++++++ ...variant-for-KConfigGui_sessionConfig.patch | 128 ------------------ kf5-kconfig.spec | 10 +- 3 files changed, 133 insertions(+), 132 deletions(-) create mode 100644 0001-Add-KConfigGui-setSessionConfig.patch delete mode 100644 Add-2nd-variant-for-KConfigGui_sessionConfig.patch diff --git a/0001-Add-KConfigGui-setSessionConfig.patch b/0001-Add-KConfigGui-setSessionConfig.patch new file mode 100644 index 0000000..7389d06 --- /dev/null +++ b/0001-Add-KConfigGui-setSessionConfig.patch @@ -0,0 +1,127 @@ +From ceb84f777b217c4a25c0e2356ddab372fae6f562 Mon Sep 17 00:00:00 2001 +From: Stefan Becker +Date: Sat, 9 May 2015 17:16:27 +0300 +Subject: [PATCH] Add KConfigGui::setSessionConfig() + +When the application receives a saveState signal it needs to replace the +current KConfig object with a new one based on the QSessionManager +information. Add a new interface that accepts the new session id and key. + +BUG: 346768 +REVIEW: 123705 +--- + src/gui/kconfiggui.cpp | 41 ++++++++++++++++++++++++++++++++--------- + src/gui/kconfiggui.h | 17 +++++++++++++++-- + 2 files changed, 47 insertions(+), 11 deletions(-) + +diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp +index 0048c60..67b6009 100644 +--- a/src/gui/kconfiggui.cpp ++++ b/src/gui/kconfiggui.cpp +@@ -25,28 +25,51 @@ + + #include + ++static QString configName(const QString &id, const QString &key) ++{ ++ return(QLatin1String("session/") + QGuiApplication::applicationName() + ++ QLatin1Char('_') + id + ++ QLatin1Char('_') + key); ++} ++ + static KConfig *s_sessionConfig = Q_NULLPTR; + + KConfig *KConfigGui::sessionConfig() + { +- if (!s_sessionConfig) { // create an instance specific config object +- s_sessionConfig = new KConfig(sessionConfigName(), KConfig::SimpleConfig); ++#ifdef QT_NO_SESSIONMANAGER ++#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. ++#endif ++ if (!hasSessionConfig()) { ++ // create the default instance specific config object ++ // from applications' -session command line parameter ++ s_sessionConfig = new KConfig(configName(qApp->sessionId(), ++ qApp->sessionKey()), ++ KConfig::SimpleConfig); + } ++ + return s_sessionConfig; + } + ++void KConfigGui::setSessionConfig(const QString &id, const QString &key) ++{ ++ if (hasSessionConfig()) { ++ delete s_sessionConfig; ++ s_sessionConfig = Q_NULLPTR; ++ } ++ ++ // create a new instance specific config object from supplied id & key ++ s_sessionConfig = new KConfig(configName(id, key), ++ KConfig::SimpleConfig); ++} ++ + bool KConfigGui::hasSessionConfig() + { + return s_sessionConfig != Q_NULLPTR; + } + ++#ifndef KDE_NO_DEPRECATED + QString KConfigGui::sessionConfigName() + { +-#ifdef QT_NO_SESSIONMANAGER +-#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. +-#endif +- const QString sessionKey = qApp->sessionKey(); +- const QString sessionId = qApp->sessionId(); +- return QString(QLatin1String("session/%1_%2_%3")).arg(QGuiApplication::applicationName()).arg(sessionId).arg(sessionKey); ++ return sessionConfig()->name(); + } +- ++#endif +diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h +index 173400f..fe1f820 100644 +--- a/src/gui/kconfiggui.h ++++ b/src/gui/kconfiggui.h +@@ -31,7 +31,7 @@ class KConfig; + namespace KConfigGui + { + /** +- * Returns the application session config object. ++ * Returns the current application session config object. + * + * @return A pointer to the application's instance specific + * KConfig object. +@@ -40,6 +40,16 @@ namespace KConfigGui + KCONFIGGUI_EXPORT KConfig *sessionConfig(); + + /** ++ * Replaces the current application session config object. ++ * ++ * @param id new session id ++ * @param key new session key ++ * ++ * @since 5.11 ++ */ ++KCONFIGGUI_EXPORT void setSessionConfig(const QString &id, const QString &key); ++ ++/** + * Indicates if a session config has been created for that application + * (ie. if sessionConfig() got called at least once) + * +@@ -51,8 +61,11 @@ KCONFIGGUI_EXPORT bool hasSessionConfig(); + * Returns the name of the application session + * + * @return the application session name ++ * @deprecated since 5.11, use sessionConfig()->name() + */ +-KCONFIGGUI_EXPORT QString sessionConfigName(); ++#ifndef KDE_NO_DEPRECATED ++KCONFIGGUI_DEPRECATED QString sessionConfigName(); ++#endif + } + + #endif // KCONFIGGUI_H +-- +2.4.0 + diff --git a/Add-2nd-variant-for-KConfigGui_sessionConfig.patch b/Add-2nd-variant-for-KConfigGui_sessionConfig.patch deleted file mode 100644 index bce4ea8..0000000 --- a/Add-2nd-variant-for-KConfigGui_sessionConfig.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 62f448faf202a5a174f0e0bb3d3a80f3109d234f Mon Sep 17 00:00:00 2001 -From: Stefan Becker -Date: Sat, 9 May 2015 17:16:27 +0300 -Subject: [PATCH] Add 2nd variant for KConfigGui::sessionConfig() - -When application receives a saveState signal it needs to get a KConfig -object based on the QSessionManager information. Add a new variant that -accepts the session manager object. - -BUG: 346768 ---- - src/gui/kconfiggui.cpp | 48 ++++++++++++++++++++++++++++++++++++++---------- - src/gui/kconfiggui.h | 14 +++++++++++++- - 2 files changed, 51 insertions(+), 11 deletions(-) - -diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp -index 0048c60..e1dcd09 100644 ---- a/src/gui/kconfiggui.cpp -+++ b/src/gui/kconfiggui.cpp -@@ -22,19 +22,52 @@ - #include "kconfiggui.h" - - #include -+#include - - #include - -+#define SESSION_TEMPLATE(id, key) \ -+ QLatin1String("session/") + QGuiApplication::applicationName() + \ -+ QLatin1Char('_') + (id) + \ -+ QLatin1Char('_') + (key) -+ - static KConfig *s_sessionConfig = Q_NULLPTR; - --KConfig *KConfigGui::sessionConfig() -+static void ensureSessionConfig(void) - { -- if (!s_sessionConfig) { // create an instance specific config object -- s_sessionConfig = new KConfig(sessionConfigName(), KConfig::SimpleConfig); -+#ifdef QT_NO_SESSIONMANAGER -+#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. -+#endif -+ if (s_sessionConfig == Q_NULLPTR) { -+ // create an instance specific config object -+ s_sessionConfig = new KConfig(SESSION_TEMPLATE(qApp->sessionId(), -+ qApp->sessionKey()), -+ KConfig::SimpleConfig); - } -+} -+ -+KConfig *KConfigGui::sessionConfig() -+{ -+ ensureSessionConfig(); - return s_sessionConfig; - } - -+KConfig *KConfigGui::sessionConfig(const QSessionManager &sm) -+{ -+ if (hasSessionConfig()) { -+ // delete old config object without storing it to disk -+ s_sessionConfig->markAsClean(); -+ delete s_sessionConfig; -+ s_sessionConfig = Q_NULLPTR; -+ } -+ -+ // create a new instance specific config object -+ s_sessionConfig = new KConfig(SESSION_TEMPLATE(sm.sessionId(), -+ sm.sessionKey()), -+ KConfig::SimpleConfig); -+ return(s_sessionConfig); -+} -+ - bool KConfigGui::hasSessionConfig() - { - return s_sessionConfig != Q_NULLPTR; -@@ -42,11 +75,6 @@ bool KConfigGui::hasSessionConfig() - - QString KConfigGui::sessionConfigName() - { --#ifdef QT_NO_SESSIONMANAGER --#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. --#endif -- const QString sessionKey = qApp->sessionKey(); -- const QString sessionId = qApp->sessionId(); -- return QString(QLatin1String("session/%1_%2_%3")).arg(QGuiApplication::applicationName()).arg(sessionId).arg(sessionKey); -+ ensureSessionConfig(); -+ return s_sessionConfig->name(); - } -- -diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h -index 173400f..10083b2 100644 ---- a/src/gui/kconfiggui.h -+++ b/src/gui/kconfiggui.h -@@ -27,11 +27,12 @@ - #include - - class KConfig; -+class QSessionManager; - - namespace KConfigGui - { - /** -- * Returns the application session config object. -+ * Returns the current application session config object. - * - * @return A pointer to the application's instance specific - * KConfig object. -@@ -40,6 +41,17 @@ namespace KConfigGui - KCONFIGGUI_EXPORT KConfig *sessionConfig(); - - /** -+ * Updates application session config object. -+ * -+ * @param sm session manager object -+ * -+ * @return A pointer to the application's instance specific -+ * KConfig object. -+ * @see KConfig -+ */ -+KCONFIGGUI_EXPORT KConfig *sessionConfig(const QSessionManager &sm); -+ -+/** - * Indicates if a session config has been created for that application - * (ie. if sessionConfig() got called at least once) - * --- -2.4.0 - diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index b0364d6..c8dbe75 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -17,9 +17,8 @@ URL: http://www.kde.org %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -## upstreamable patches -# Candidate session management fixes -# https://bugs.kde.org/show_bug.cgi?id=346768 +## upstream patches +Patch1: 0001-Add-KConfigGui-setSessionConfig.patch BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -113,6 +112,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon May 11 2015 Rex Dieter 5.10.0-2 +- pull in reviewed/upstreamed session management fixes (kde#346768) + * Mon May 11 2015 Daniel Vrátil - 5.10.0-1 - KDE Frameworks 5.10.0 From b5ca766da98e524f107153634096f290b514ac20 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 May 2015 08:34:42 -0500 Subject: [PATCH 025/105] followup fix to sm patch --- 0003-fix-missing-export.patch | 25 +++++++++++++++++++++++++ kf5-kconfig.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0003-fix-missing-export.patch diff --git a/0003-fix-missing-export.patch b/0003-fix-missing-export.patch new file mode 100644 index 0000000..71d09b1 --- /dev/null +++ b/0003-fix-missing-export.patch @@ -0,0 +1,25 @@ +From 661d03d14aa2342e0542b49da4b440954c9654eb Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 12 May 2015 12:48:55 +0200 +Subject: [PATCH 3/3] fix missing export + +--- + src/gui/kconfiggui.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h +index fe1f820..813ab64 100644 +--- a/src/gui/kconfiggui.h ++++ b/src/gui/kconfiggui.h +@@ -64,7 +64,7 @@ KCONFIGGUI_EXPORT bool hasSessionConfig(); + * @deprecated since 5.11, use sessionConfig()->name() + */ + #ifndef KDE_NO_DEPRECATED +-KCONFIGGUI_DEPRECATED QString sessionConfigName(); ++KCONFIGGUI_DEPRECATED_EXPORT QString sessionConfigName(); + #endif + } + +-- +2.4.0 + diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index c8dbe75..71ab577 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -19,6 +19,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra ## upstream patches Patch1: 0001-Add-KConfigGui-setSessionConfig.patch +Patch3: 0003-fix-missing-export.patch BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -112,6 +113,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue May 12 2015 Rex Dieter 5.10.0-3 +- followup fix to sm patch + * Mon May 11 2015 Rex Dieter 5.10.0-2 - pull in reviewed/upstreamed session management fixes (kde#346768) From 9f851700b7c49c351a4c3461aec17e8bbb9f7499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 10 Jun 2015 14:25:18 +0200 Subject: [PATCH 026/105] KDE Frameworks 5.11.0 --- .gitignore | 1 + kf5-kconfig.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 263e93b..27328aa 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /kconfig-5.8.0.tar.xz /kconfig-5.9.0.tar.xz /kconfig-5.10.0.tar.xz +/kconfig-5.11.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 71ab577..cb408ee 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.10.0 -Release: 3%{?dist} +Version: 5.11.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -18,8 +18,6 @@ URL: http://www.kde.org Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz ## upstream patches -Patch1: 0001-Add-KConfigGui-setSessionConfig.patch -Patch3: 0003-fix-missing-export.patch BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -113,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Jun 10 2015 Daniel Vrátil - 5.11.0-1 +- KDE Frameworks 5.11.0 + * Tue May 12 2015 Rex Dieter 5.10.0-3 - followup fix to sm patch diff --git a/sources b/sources index 8e31e43..3b9a7ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c762fbe3b98fede3e8a7af3e18e71bb kconfig-5.10.0.tar.xz +ecd6f03aa5e0bdcfa1a9b17ce1654afe kconfig-5.11.0.tar.xz From d47ae2cd6e46e2aca1555c6f17ac356748565fb0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 13:11:15 +0000 Subject: [PATCH 027/105] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index cb408ee..7565fe9 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 5.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 10 2015 Daniel Vrátil - 5.11.0-1 - KDE Frameworks 5.11.0 From 570d3f9c92107955d98ca0a2d028391fd6b6bdc5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 9 Jul 2015 12:37:35 -0500 Subject: [PATCH 028/105] update URL, minor cosmetics --- kf5-kconfig.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 7565fe9..e4f328b 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.kde.org +URL: https://projects.kde.org/projects/frameworks/kconfig %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -91,7 +91,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_bindir}/kwriteconfig5 %{_kf5_bindir}/kconfig_compiler_kf5 %{_kf5_libdir}/libKF5ConfigCore.so.* -%{_kf5_libexecdir}/kconf_update +%{_kf5_libexecdir}/kconf_update/ %post gui -p /sbin/ldconfig %postun gui -p /sbin/ldconfig @@ -101,16 +101,19 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files devel %{_kf5_includedir}/kconfig_version.h -%{_kf5_includedir}/KConfigCore -%{_kf5_includedir}/KConfigGui +%{_kf5_includedir}/KConfigCore/ +%{_kf5_includedir}/KConfigGui/ %{_kf5_libdir}/libKF5ConfigCore.so %{_kf5_libdir}/libKF5ConfigGui.so -%{_kf5_libdir}/cmake/KF5Config +%{_kf5_libdir}/cmake/KF5Config/ %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigCore.pri %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri %changelog +* Thu Jul 09 2015 Rex Dieter 5.11.0-3 +- update URL, minor cosmetics + * Wed Jun 17 2015 Fedora Release Engineering - 5.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From cc56ed41d2f1b5a5585c076185a02522051346d5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 9 Jul 2015 12:38:26 -0500 Subject: [PATCH 029/105] 5.12.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 27328aa..09fcbe6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /kconfig-5.9.0.tar.xz /kconfig-5.10.0.tar.xz /kconfig-5.11.0.tar.xz +/kconfig-5.12.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index e4f328b..d897e13 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.11.0 -Release: 3%{?dist} +Version: 5.12.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Jul 09 2015 Rex Dieter - 5.12.0-1 +- 5.12.0 + * Thu Jul 09 2015 Rex Dieter 5.11.0-3 - update URL, minor cosmetics diff --git a/sources b/sources index 3b9a7ac..f220f4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecd6f03aa5e0bdcfa1a9b17ce1654afe kconfig-5.11.0.tar.xz +826d84426eb7cf9f2bccd49aca694f96 kconfig-5.12.0.tar.xz From d23e5fbf822b42b089cce481221cd5555cb686e5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 9 Jul 2015 13:30:09 -0500 Subject: [PATCH 030/105] fix KDE_INSTALL_LIBEXECDIR_KF5, %%files --- 0001-Add-KConfigGui-setSessionConfig.patch | 127 --------------------- 0003-fix-missing-export.patch | 25 ---- kconfig-5.12.0-fullpath.patch | 12 ++ kf5-kconfig.spec | 10 +- 4 files changed, 19 insertions(+), 155 deletions(-) delete mode 100644 0001-Add-KConfigGui-setSessionConfig.patch delete mode 100644 0003-fix-missing-export.patch create mode 100644 kconfig-5.12.0-fullpath.patch diff --git a/0001-Add-KConfigGui-setSessionConfig.patch b/0001-Add-KConfigGui-setSessionConfig.patch deleted file mode 100644 index 7389d06..0000000 --- a/0001-Add-KConfigGui-setSessionConfig.patch +++ /dev/null @@ -1,127 +0,0 @@ -From ceb84f777b217c4a25c0e2356ddab372fae6f562 Mon Sep 17 00:00:00 2001 -From: Stefan Becker -Date: Sat, 9 May 2015 17:16:27 +0300 -Subject: [PATCH] Add KConfigGui::setSessionConfig() - -When the application receives a saveState signal it needs to replace the -current KConfig object with a new one based on the QSessionManager -information. Add a new interface that accepts the new session id and key. - -BUG: 346768 -REVIEW: 123705 ---- - src/gui/kconfiggui.cpp | 41 ++++++++++++++++++++++++++++++++--------- - src/gui/kconfiggui.h | 17 +++++++++++++++-- - 2 files changed, 47 insertions(+), 11 deletions(-) - -diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp -index 0048c60..67b6009 100644 ---- a/src/gui/kconfiggui.cpp -+++ b/src/gui/kconfiggui.cpp -@@ -25,28 +25,51 @@ - - #include - -+static QString configName(const QString &id, const QString &key) -+{ -+ return(QLatin1String("session/") + QGuiApplication::applicationName() + -+ QLatin1Char('_') + id + -+ QLatin1Char('_') + key); -+} -+ - static KConfig *s_sessionConfig = Q_NULLPTR; - - KConfig *KConfigGui::sessionConfig() - { -- if (!s_sessionConfig) { // create an instance specific config object -- s_sessionConfig = new KConfig(sessionConfigName(), KConfig::SimpleConfig); -+#ifdef QT_NO_SESSIONMANAGER -+#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. -+#endif -+ if (!hasSessionConfig()) { -+ // create the default instance specific config object -+ // from applications' -session command line parameter -+ s_sessionConfig = new KConfig(configName(qApp->sessionId(), -+ qApp->sessionKey()), -+ KConfig::SimpleConfig); - } -+ - return s_sessionConfig; - } - -+void KConfigGui::setSessionConfig(const QString &id, const QString &key) -+{ -+ if (hasSessionConfig()) { -+ delete s_sessionConfig; -+ s_sessionConfig = Q_NULLPTR; -+ } -+ -+ // create a new instance specific config object from supplied id & key -+ s_sessionConfig = new KConfig(configName(id, key), -+ KConfig::SimpleConfig); -+} -+ - bool KConfigGui::hasSessionConfig() - { - return s_sessionConfig != Q_NULLPTR; - } - -+#ifndef KDE_NO_DEPRECATED - QString KConfigGui::sessionConfigName() - { --#ifdef QT_NO_SESSIONMANAGER --#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. --#endif -- const QString sessionKey = qApp->sessionKey(); -- const QString sessionId = qApp->sessionId(); -- return QString(QLatin1String("session/%1_%2_%3")).arg(QGuiApplication::applicationName()).arg(sessionId).arg(sessionKey); -+ return sessionConfig()->name(); - } -- -+#endif -diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h -index 173400f..fe1f820 100644 ---- a/src/gui/kconfiggui.h -+++ b/src/gui/kconfiggui.h -@@ -31,7 +31,7 @@ class KConfig; - namespace KConfigGui - { - /** -- * Returns the application session config object. -+ * Returns the current application session config object. - * - * @return A pointer to the application's instance specific - * KConfig object. -@@ -40,6 +40,16 @@ namespace KConfigGui - KCONFIGGUI_EXPORT KConfig *sessionConfig(); - - /** -+ * Replaces the current application session config object. -+ * -+ * @param id new session id -+ * @param key new session key -+ * -+ * @since 5.11 -+ */ -+KCONFIGGUI_EXPORT void setSessionConfig(const QString &id, const QString &key); -+ -+/** - * Indicates if a session config has been created for that application - * (ie. if sessionConfig() got called at least once) - * -@@ -51,8 +61,11 @@ KCONFIGGUI_EXPORT bool hasSessionConfig(); - * Returns the name of the application session - * - * @return the application session name -+ * @deprecated since 5.11, use sessionConfig()->name() - */ --KCONFIGGUI_EXPORT QString sessionConfigName(); -+#ifndef KDE_NO_DEPRECATED -+KCONFIGGUI_DEPRECATED QString sessionConfigName(); -+#endif - } - - #endif // KCONFIGGUI_H --- -2.4.0 - diff --git a/0003-fix-missing-export.patch b/0003-fix-missing-export.patch deleted file mode 100644 index 71d09b1..0000000 --- a/0003-fix-missing-export.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 661d03d14aa2342e0542b49da4b440954c9654eb Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 12 May 2015 12:48:55 +0200 -Subject: [PATCH 3/3] fix missing export - ---- - src/gui/kconfiggui.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h -index fe1f820..813ab64 100644 ---- a/src/gui/kconfiggui.h -+++ b/src/gui/kconfiggui.h -@@ -64,7 +64,7 @@ KCONFIGGUI_EXPORT bool hasSessionConfig(); - * @deprecated since 5.11, use sessionConfig()->name() - */ - #ifndef KDE_NO_DEPRECATED --KCONFIGGUI_DEPRECATED QString sessionConfigName(); -+KCONFIGGUI_DEPRECATED_EXPORT QString sessionConfigName(); - #endif - } - --- -2.4.0 - diff --git a/kconfig-5.12.0-fullpath.patch b/kconfig-5.12.0-fullpath.patch new file mode 100644 index 0000000..6f3e20f --- /dev/null +++ b/kconfig-5.12.0-fullpath.patch @@ -0,0 +1,12 @@ +diff -up kconfig-5.12.0/src/core/CMakeLists.txt.fullpath kconfig-5.12.0/src/core/CMakeLists.txt +--- kconfig-5.12.0/src/core/CMakeLists.txt.fullpath 2015-07-05 03:54:35.000000000 -0500 ++++ kconfig-5.12.0/src/core/CMakeLists.txt 2015-07-09 13:13:53.978827068 -0500 +@@ -21,7 +21,7 @@ add_library(KF5::ConfigCore ALIAS KF5Con + + target_compile_definitions(KF5ConfigCore + PRIVATE +- KCONF_UPDATE_INSTALL_LOCATION="${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBEXECDIR_KF5}/$" ++ KCONF_UPDATE_INSTALL_LOCATION="${KDE_INSTALL_LIBEXECDIR_KF5}/$" + ) + + target_include_directories(KF5ConfigCore INTERFACE "$") diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index d897e13..67b9597 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -19,8 +19,12 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra ## upstream patches +## upstreamable patches +# assume KDE_INSTALL_LIBEXECDIR_KF5 is a full (not relative to CMAKE_INSTALL_PREFIX) path +Patch50: kconfig-5.12.0-fullpath.patch + BuildRequires: kf5-rpm-macros -BuildRequires: extra-cmake-modules +BuildRequires: extra-cmake-modules >= %{versiondir} BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel @@ -89,9 +93,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files core -f kconfig5_qt.lang %{_kf5_bindir}/kreadconfig5 %{_kf5_bindir}/kwriteconfig5 -%{_kf5_bindir}/kconfig_compiler_kf5 %{_kf5_libdir}/libKF5ConfigCore.so.* -%{_kf5_libexecdir}/kconf_update/ +%{_kf5_libexecdir}/kconfig_compiler_kf5 +%{_kf5_libexecdir}/kconf_update %post gui -p /sbin/ldconfig %postun gui -p /sbin/ldconfig From df90bb4e63f0094ca4741e1d57860c11bc6f8dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 19 Aug 2015 16:48:24 +0200 Subject: [PATCH 031/105] KDE Frameworks 5.13.0 --- .gitignore | 1 + kf5-kconfig.spec | 18 +++++++++++++----- sources | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 09fcbe6..c7ad228 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /kconfig-5.10.0.tar.xz /kconfig-5.11.0.tar.xz /kconfig-5.12.0.tar.xz +/kconfig-5.13.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 67b9597..af9739c 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.12.0 +Version: 5.13.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -21,14 +21,13 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra ## upstreamable patches # assume KDE_INSTALL_LIBEXECDIR_KF5 is a full (not relative to CMAKE_INSTALL_PREFIX) path -Patch50: kconfig-5.12.0-fullpath.patch -BuildRequires: kf5-rpm-macros -BuildRequires: extra-cmake-modules >= %{versiondir} +BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{version} BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel -Requires: kf5-filesystem +Requires: kf5-filesystem >= %{version} Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-gui%{?_isa} = %{version}-%{release} @@ -115,6 +114,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Aug 19 2015 Daniel Vrátil - 5.13.0-1 +- KDE Frameworks 5.13.0 + +* Wed Aug 19 2015 Daniel Vrátil - 5.13.0-1 +- KDE Frameworks 5.13.0 + +* Tue Aug 11 2015 Daniel Vrátil - 5.13.0-0.1 +- KDE Frameworks 5.13 + * Thu Jul 09 2015 Rex Dieter - 5.12.0-1 - 5.12.0 diff --git a/sources b/sources index f220f4e..c0d6962 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -826d84426eb7cf9f2bccd49aca694f96 kconfig-5.12.0.tar.xz +d470179fc4c8a2060b94452d25d466c8 kconfig-5.13.0.tar.xz From b1d79e7fba53af0a1a02492a1bf94bc96630ccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 16 Sep 2015 13:45:36 +0200 Subject: [PATCH 032/105] KDE Frameworks 5.14.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c7ad228..277adc5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /kconfig-5.11.0.tar.xz /kconfig-5.12.0.tar.xz /kconfig-5.13.0.tar.xz +/kconfig-5.14.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index af9739c..5c2f1f6 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.13.0 +Version: 5.14.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -114,6 +114,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Sep 16 2015 Daniel Vrátil - 5.14.0-1 +- KDE Frameworks 5.14.0 + * Wed Aug 19 2015 Daniel Vrátil - 5.13.0-1 - KDE Frameworks 5.13.0 diff --git a/sources b/sources index c0d6962..4f6f515 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d470179fc4c8a2060b94452d25d466c8 kconfig-5.13.0.tar.xz +a4b12b753b855d8fa1240b499bc17135 kconfig-5.14.0.tar.xz From d08820e831699bb143116be579079ac92f4e1f1a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Sep 2015 12:39:25 -0500 Subject: [PATCH 033/105] +sources.basename --- sources.basename | 1 + 1 file changed, 1 insertion(+) create mode 100644 sources.basename diff --git a/sources.basename b/sources.basename new file mode 100644 index 0000000..1846784 --- /dev/null +++ b/sources.basename @@ -0,0 +1 @@ +kconfig From 170167e09617ca39ae92cb94b48fe38efd2a593e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 8 Oct 2015 15:04:15 +0200 Subject: [PATCH 034/105] KDE Frameworks 5.15.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 277adc5..3133465 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /kconfig-5.12.0.tar.xz /kconfig-5.13.0.tar.xz /kconfig-5.14.0.tar.xz +/kconfig-5.15.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 5c2f1f6..15bf047 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.14.0 +Version: 5.15.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -114,6 +114,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Oct 08 2015 Daniel Vrátil - 5.15.0-1 +- KDE Frameworks 5.15.0 + * Wed Sep 16 2015 Daniel Vrátil - 5.14.0-1 - KDE Frameworks 5.14.0 diff --git a/sources b/sources index 4f6f515..e6d0516 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4b12b753b855d8fa1240b499bc17135 kconfig-5.14.0.tar.xz +f7169075c22857b40d256bd6323d1a10 kconfig-5.15.0.tar.xz From 2abf1477cb4613003e9c40907bae193019011527 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Oct 2015 06:59:08 -0500 Subject: [PATCH 035/105] restore/upstream fullpath patch, BR: cmake, sort BR's --- ...FULL_-variant-so-there-is-no-ambigui.patch | 25 +++++++++++++++++++ kconfig-5.12.0-fullpath.patch | 12 --------- kf5-kconfig.spec | 11 +++++--- 3 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch delete mode 100644 kconfig-5.12.0-fullpath.patch diff --git a/0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch b/0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch new file mode 100644 index 0000000..095f101 --- /dev/null +++ b/0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch @@ -0,0 +1,25 @@ +From 0cb0ecf8001d62ae0977c6f48f1807de45de314a Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Tue, 20 Oct 2015 06:55:03 -0500 +Subject: [PATCH 4/4] use KDE_INSTALL_FULL_ variant, so there is no ambiguity + +--- + src/core/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index 3d8d4cb..0ad24b9 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -21,7 +21,7 @@ add_library(KF5::ConfigCore ALIAS KF5ConfigCore) + + target_compile_definitions(KF5ConfigCore + PRIVATE +- KCONF_UPDATE_INSTALL_LOCATION="${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBEXECDIR_KF5}/$" ++ KCONF_UPDATE_INSTALL_LOCATION="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}/$" + ) + + target_include_directories(KF5ConfigCore INTERFACE "$") +-- +2.5.0 + diff --git a/kconfig-5.12.0-fullpath.patch b/kconfig-5.12.0-fullpath.patch deleted file mode 100644 index 6f3e20f..0000000 --- a/kconfig-5.12.0-fullpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kconfig-5.12.0/src/core/CMakeLists.txt.fullpath kconfig-5.12.0/src/core/CMakeLists.txt ---- kconfig-5.12.0/src/core/CMakeLists.txt.fullpath 2015-07-05 03:54:35.000000000 -0500 -+++ kconfig-5.12.0/src/core/CMakeLists.txt 2015-07-09 13:13:53.978827068 -0500 -@@ -21,7 +21,7 @@ add_library(KF5::ConfigCore ALIAS KF5Con - - target_compile_definitions(KF5ConfigCore - PRIVATE -- KCONF_UPDATE_INSTALL_LOCATION="${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBEXECDIR_KF5}/$" -+ KCONF_UPDATE_INSTALL_LOCATION="${KDE_INSTALL_LIBEXECDIR_KF5}/$" - ) - - target_include_directories(KF5ConfigCore INTERFACE "$") diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 15bf047..0b06505 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -18,12 +18,14 @@ URL: https://projects.kde.org/projects/frameworks/kconfig Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz ## upstream patches +# http://commits.kde.org/kconfig/0cb0ecf8001d62ae0977c6f48f1807de45de314a +Patch4: 0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch ## upstreamable patches -# assume KDE_INSTALL_LIBEXECDIR_KF5 is a full (not relative to CMAKE_INSTALL_PREFIX) path -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{version} +BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel @@ -114,6 +116,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Oct 20 2015 Rex Dieter 5.15.0-2 +- restore/upstream fullpath patch, BR: cmake, sort BR's + * Thu Oct 08 2015 Daniel Vrátil - 5.15.0-1 - KDE Frameworks 5.15.0 From 273322bce8e1aca59dcc73434b63163c303bccec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 9 Nov 2015 23:07:50 +0100 Subject: [PATCH 036/105] KDE Frameworks 5.16 --- .gitignore | 1 + kf5-kconfig.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3133465..16dfa5c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /kconfig-5.13.0.tar.xz /kconfig-5.14.0.tar.xz /kconfig-5.15.0.tar.xz +/kconfig-5.16.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 0b06505..4e87242 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.15.0 -Release: 2%{?dist} +Version: 5.16.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -19,7 +19,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra ## upstream patches # http://commits.kde.org/kconfig/0cb0ecf8001d62ae0977c6f48f1807de45de314a -Patch4: 0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch ## upstreamable patches @@ -116,6 +115,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun Nov 08 2015 Daniel Vrátil - 5.16.0-1 +- KDE Frameworks 5.16.0 + * Tue Oct 20 2015 Rex Dieter 5.15.0-2 - restore/upstream fullpath patch, BR: cmake, sort BR's diff --git a/sources b/sources index e6d0516..0181b30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7169075c22857b40d256bd6323d1a10 kconfig-5.15.0.tar.xz +67853ba8da858eda6aa218473fbe9861 kconfig-5.16.0.tar.xz From c3cda3d84f4ba498601a12834e4d64dca914d562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 8 Dec 2015 23:36:06 +0100 Subject: [PATCH 037/105] KDE Frameworks 5.17.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 16dfa5c..4490f2e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /kconfig-5.14.0.tar.xz /kconfig-5.15.0.tar.xz /kconfig-5.16.0.tar.xz +/kconfig-5.17.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 4e87242..7c6e34e 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.16.0 +Version: 5.17.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -115,6 +115,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Dec 08 2015 Daniel Vrátil - 5.17.0-1 +- KDE Frameworks 5.17.0 + * Sun Nov 08 2015 Daniel Vrátil - 5.16.0-1 - KDE Frameworks 5.16.0 diff --git a/sources b/sources index 0181b30..56cb82c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67853ba8da858eda6aa218473fbe9861 kconfig-5.16.0.tar.xz +410edf8d9e568c962ab4941b0aab2aa1 kconfig-5.17.0.tar.xz From dffb2ea21fce93df900d224a97736928fde85dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Sun, 3 Jan 2016 17:54:46 +0100 Subject: [PATCH 038/105] KDE Frameworks 5.18.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4490f2e..dc355d8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /kconfig-5.15.0.tar.xz /kconfig-5.16.0.tar.xz /kconfig-5.17.0.tar.xz +/kconfig-5.18.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 7c6e34e..d6c36ae 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.17.0 +Version: 5.18.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -115,6 +115,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 +- KDE Frameworks 5.18.0 + * Tue Dec 08 2015 Daniel Vrátil - 5.17.0-1 - KDE Frameworks 5.17.0 diff --git a/sources b/sources index 56cb82c..fe18607 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -410edf8d9e568c962ab4941b0aab2aa1 kconfig-5.17.0.tar.xz +061b6eedc15239368e5bd60645b99a50 kconfig-5.18.0.tar.xz From 34da0ad594561a6d14ede08dede966f83f5c28a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Sun, 3 Jan 2016 18:07:51 +0100 Subject: [PATCH 039/105] Remove old patch --- ...FULL_-variant-so-there-is-no-ambigui.patch | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch diff --git a/0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch b/0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch deleted file mode 100644 index 095f101..0000000 --- a/0004-use-KDE_INSTALL_FULL_-variant-so-there-is-no-ambigui.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0cb0ecf8001d62ae0977c6f48f1807de45de314a Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Tue, 20 Oct 2015 06:55:03 -0500 -Subject: [PATCH 4/4] use KDE_INSTALL_FULL_ variant, so there is no ambiguity - ---- - src/core/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 3d8d4cb..0ad24b9 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -21,7 +21,7 @@ add_library(KF5::ConfigCore ALIAS KF5ConfigCore) - - target_compile_definitions(KF5ConfigCore - PRIVATE -- KCONF_UPDATE_INSTALL_LOCATION="${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBEXECDIR_KF5}/$" -+ KCONF_UPDATE_INSTALL_LOCATION="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}/$" - ) - - target_include_directories(KF5ConfigCore INTERFACE "$") --- -2.5.0 - From 068a192e3b24cacbd51e09de20a5e02bace39226 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 14 Jan 2016 08:14:22 -0600 Subject: [PATCH 040/105] cosmetics, update URL, use %license, -BR: cmake --- .gitignore | 20 -------------------- kf5-kconfig.spec | 15 +++++++-------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index dc355d8..9476f20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1 @@ -/kconfig-4.99.0.tar.xz -/kconfig-4.100.0.tar.xz -/kconfig-5.0.0.tar.xz -/kconfig-5.1.0.tar.xz -/kconfig-5.2.0.tar.xz -/kconfig-5.3.0.tar.xz -/kconfig-5.4.0.tar.xz -/kconfig-5.5.0.tar.xz -/kconfig-5.6.0.tar.xz -/kconfig-5.7.0.tar.xz -/kconfig-5.8.0.tar.xz -/kconfig-5.9.0.tar.xz -/kconfig-5.10.0.tar.xz -/kconfig-5.11.0.tar.xz -/kconfig-5.12.0.tar.xz -/kconfig-5.13.0.tar.xz -/kconfig-5.14.0.tar.xz -/kconfig-5.15.0.tar.xz -/kconfig-5.16.0.tar.xz -/kconfig-5.17.0.tar.xz /kconfig-5.18.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index d6c36ae..294e4b1 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT -URL: https://projects.kde.org/projects/frameworks/kconfig +URL: https://projects.kde.org/kconfig %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -22,7 +22,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra ## upstreamable patches -BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel @@ -42,7 +41,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel ## included for completeness and documentation, but part of qtbase-devel already -- rex #Requires: pkgconfig(Qt5Xml) - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -50,7 +48,6 @@ developing applications that use %{name}. %package core Summary: Non-GUI part of KConfig framework Requires: kde-settings - %description core KConfigCore provides access to the configuration files themselves. It features centralized definition and lock-down (kiosk) support. @@ -58,7 +55,6 @@ centralized definition and lock-down (kiosk) support. %package gui Summary: GUI part of KConfig framework Requires: %{name}-core%{?_isa} = %{version}-%{release} - %description gui KConfigGui provides a way to hook widgets to the configuration so that they are automatically initialized from the configuration and automatically propagate @@ -85,8 +81,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files -%doc COPYING.LIB DESIGN README.md TODO - +%doc DESIGN README.md TODO +%license COPYING.LIB %post core -p /sbin/ldconfig %postun core -p /sbin/ldconfig @@ -115,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Jan 14 2016 Rex Dieter 5.18.0-2 +- cosmetics, update URL, use %%license, -BR: cmake + * Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 - KDE Frameworks 5.18.0 From 6e78f75a00ac7686dabcc43b8dbd14544594d017 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 02:00:00 +0000 Subject: [PATCH 041/105] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 294e4b1..3695880 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.18.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 14 2016 Rex Dieter 5.18.0-2 - cosmetics, update URL, use %%license, -BR: cmake From 0f7915621fa9326560d431dc0ed51055ca8bf53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Thu, 11 Feb 2016 15:16:35 +0100 Subject: [PATCH 042/105] KDE Frameworks 5.19.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9476f20..11ccaa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kconfig-5.18.0.tar.xz +/kconfig-5.19.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 3695880..4f4bdbd 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.18.0 -Release: 3%{?dist} +Version: 5.19.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Feb 11 2016 Daniel Vrátil - 5.19.0-1 +- KDE Frameworks 5.19.0 + * Thu Feb 04 2016 Fedora Release Engineering - 5.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index fe18607..3a8dbb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -061b6eedc15239368e5bd60645b99a50 kconfig-5.18.0.tar.xz +79953233cd7d507f4f8394bf62e23078 kconfig-5.19.0.tar.xz From 9a7286a64136dbbcf87d46a9c3e6bfec18388b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Mon, 14 Mar 2016 11:40:41 +0100 Subject: [PATCH 043/105] KDE Frameworks 5.20.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 11ccaa6..61c7ab6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /kconfig-5.18.0.tar.xz /kconfig-5.19.0.tar.xz +/kconfig-5.20.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 4f4bdbd..1beac58 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.19.0 +Version: 5.20.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Mar 14 2016 Daniel Vrátil - 5.20.0-1 +- KDE Frameworks 5.20.0 + * Thu Feb 11 2016 Daniel Vrátil - 5.19.0-1 - KDE Frameworks 5.19.0 diff --git a/sources b/sources index 3a8dbb6..a29e200 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79953233cd7d507f4f8394bf62e23078 kconfig-5.19.0.tar.xz +1ee3cc6ae99928adf7fa93204d89a0ce kconfig-5.20.0.tar.xz From f58bffcfb292cf6b73f5d24aaa418dd9ec5d9e13 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Apr 2016 08:25:16 -0500 Subject: [PATCH 044/105] KDE Frameworks 5.21.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 61c7ab6..e74f444 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /kconfig-5.18.0.tar.xz /kconfig-5.19.0.tar.xz /kconfig-5.20.0.tar.xz +/kconfig-5.21.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 1beac58..020ea84 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.20.0 +Version: 5.21.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Apr 04 2016 Rex Dieter - 5.21.0-1 +- KDE Frameworks 5.21.0 + * Mon Mar 14 2016 Daniel Vrátil - 5.20.0-1 - KDE Frameworks 5.20.0 diff --git a/sources b/sources index a29e200..f0c5f3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ee3cc6ae99928adf7fa93204d89a0ce kconfig-5.20.0.tar.xz +11782bb4555990deafa273f0288d2673 kconfig-5.21.0.tar.xz From e96bb8ed16178a49675c02f47cf8cb845e9ef97f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 16 May 2016 09:43:43 -0500 Subject: [PATCH 045/105] update URL --- kf5-kconfig.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 020ea84..d8ad127 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.21.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT -URL: https://projects.kde.org/kconfig +URL: https://quickgit.kde.org/?p=%{framework}.git %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon May 16 2016 Rex Dieter - 5.21.0-2 +- update URL + * Mon Apr 04 2016 Rex Dieter - 5.21.0-1 - KDE Frameworks 5.21.0 From fca511e6eb4a8a1e95d8ddcefcfea6d7594ab367 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 16 May 2016 09:54:23 -0500 Subject: [PATCH 046/105] KDE Frameworks 5.22.0 --- .gitignore | 1 + clog | 2 ++ kf5-kconfig.spec | 7 +++++-- sources | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 clog diff --git a/.gitignore b/.gitignore index e74f444..c2aa3c5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /kconfig-5.19.0.tar.xz /kconfig-5.20.0.tar.xz /kconfig-5.21.0.tar.xz +/kconfig-5.22.0.tar.xz diff --git a/clog b/clog new file mode 100644 index 0000000..6160085 --- /dev/null +++ b/clog @@ -0,0 +1,2 @@ +update URL + diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index d8ad127..c5eb2a8 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.21.0 -Release: 2%{?dist} +Version: 5.22.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon May 16 2016 Rex Dieter - 5.22.0-1 +- KDE Frameworks 5.22.0 + * Mon May 16 2016 Rex Dieter - 5.21.0-2 - update URL diff --git a/sources b/sources index f0c5f3f..87f770f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11782bb4555990deafa273f0288d2673 kconfig-5.21.0.tar.xz +89725e9fae45c516448ff01ede3e2821 kconfig-5.22.0.tar.xz From 61bc948fa8593e5be1ffe334a609372daa350c33 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 18 May 2016 14:25:51 -0500 Subject: [PATCH 047/105] rm clog --- clog | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 clog diff --git a/clog b/clog deleted file mode 100644 index 6160085..0000000 --- a/clog +++ /dev/null @@ -1,2 +0,0 @@ -update URL - From 83be451b88c884c24ae44e99a36e92388086f04e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Jun 2016 10:31:15 -0500 Subject: [PATCH 048/105] KDE Frameworks 5.23.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c2aa3c5..235c202 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /kconfig-5.20.0.tar.xz /kconfig-5.21.0.tar.xz /kconfig-5.22.0.tar.xz +/kconfig-5.23.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index c5eb2a8..cc23571 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.22.0 +Version: 5.23.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Jun 07 2016 Daniel Vrátil - 5.23.0-1 +- KDE Frameworks 5.23.0 + * Mon May 16 2016 Rex Dieter - 5.22.0-1 - KDE Frameworks 5.22.0 diff --git a/sources b/sources index 87f770f..ec3b388 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89725e9fae45c516448ff01ede3e2821 kconfig-5.22.0.tar.xz +2b822e9e4549fd2deffc23468af461e1 kconfig-5.23.0.tar.xz From fd8be85a4c8137f4471770bb18b5dcbcc9940fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Wed, 6 Jul 2016 17:56:09 +0200 Subject: [PATCH 049/105] KDE Frameworks 5.24.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 235c202..23ece4b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /kconfig-5.21.0.tar.xz /kconfig-5.22.0.tar.xz /kconfig-5.23.0.tar.xz +/kconfig-5.24.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index cc23571..76fee5e 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.23.0 +Version: 5.24.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Jul 06 2016 Daniel Vrátil - 5.24.0-1 +- KDE Frameworks 5.24.0 + * Tue Jun 07 2016 Daniel Vrátil - 5.23.0-1 - KDE Frameworks 5.23.0 diff --git a/sources b/sources index ec3b388..e4b5a6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b822e9e4549fd2deffc23468af461e1 kconfig-5.23.0.tar.xz +e048b0684cbeba42a0d68461dd1bf3a9 kconfig-5.24.0.tar.xz From f2dff9e73130d6e09eccef56be58af4cb6a6bbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Mon, 8 Aug 2016 10:11:31 +0200 Subject: [PATCH 050/105] KDE Frameworks 5.25.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 23ece4b..0dea708 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /kconfig-5.22.0.tar.xz /kconfig-5.23.0.tar.xz /kconfig-5.24.0.tar.xz +/kconfig-5.25.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 76fee5e..df78807 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.24.0 +Version: 5.25.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Aug 08 2016 Daniel Vrátil - 5.25.0-1 +- KDE Frameworks 5.25.0 + * Wed Jul 06 2016 Daniel Vrátil - 5.24.0-1 - KDE Frameworks 5.24.0 diff --git a/sources b/sources index e4b5a6d..a7457f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e048b0684cbeba42a0d68461dd1bf3a9 kconfig-5.24.0.tar.xz +03112534b86d98716cf61865d0ea2497 kconfig-5.25.0.tar.xz From 1e401f5c84a9821d9d1dcc048d0e88d57999fa30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Thu, 8 Sep 2016 10:27:56 +0200 Subject: [PATCH 051/105] KDE Frameworks 5.26.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0dea708..ceec33e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /kconfig-5.23.0.tar.xz /kconfig-5.24.0.tar.xz /kconfig-5.25.0.tar.xz +/kconfig-5.26.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index df78807..d1271e3 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.25.0 +Version: 5.26.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Sep 07 2016 Daniel Vrátil - 5.26.0-1 +- KDE Frameworks 5.26.0 + * Mon Aug 08 2016 Daniel Vrátil - 5.25.0-1 - KDE Frameworks 5.25.0 diff --git a/sources b/sources index a7457f9..0a084b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03112534b86d98716cf61865d0ea2497 kconfig-5.25.0.tar.xz +5b57b0a5cbf50fbc644fb7ce64447969 kconfig-5.26.0.tar.xz From a850d76a76a269d5e252d6fe4b70880f74d3bd07 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Oct 2016 13:41:04 -0500 Subject: [PATCH 052/105] 5.27.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ceec33e..900116b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /kconfig-5.24.0.tar.xz /kconfig-5.25.0.tar.xz /kconfig-5.26.0.tar.xz +/kconfig-5.27.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index d1271e3..e4b3668 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.26.0 -Release: 1%{?dist} +Version: 5.27.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Oct 03 2016 Rex Dieter - 5.27.0-1 +- 5.27.0 + * Wed Sep 07 2016 Daniel Vrátil - 5.26.0-1 - KDE Frameworks 5.26.0 diff --git a/sources b/sources index 0a084b0..3235477 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b57b0a5cbf50fbc644fb7ce64447969 kconfig-5.26.0.tar.xz +e1a633ed10804ad00d53978bcfd906e7 kconfig-5.27.0.tar.xz From b0f1e10d9f20d5cb65e2e14e4653558041990999 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Dec 2016 09:05:48 -0600 Subject: [PATCH 053/105] 5.29.0 --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index e4b3668..aaee9c3 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.27.0 +Version: 5.29.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Dec 16 2016 Rex Dieter - 5.29.0-1 +- 5.29.0 + * Mon Oct 03 2016 Rex Dieter - 5.27.0-1 - 5.27.0 From 57509fa1793e5aa4ba8fdfbc91f22e95ebb8d7f2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Dec 2016 09:27:59 -0600 Subject: [PATCH 054/105] 5.29.0 --- .gitignore | 1 + kf5-kconfig.spec | 3 +++ sources | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 900116b..56ca47e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /kconfig-5.25.0.tar.xz /kconfig-5.26.0.tar.xz /kconfig-5.27.0.tar.xz +/kconfig-5.29.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index aaee9c3..7d1ca0b 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -114,6 +114,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} * Fri Dec 16 2016 Rex Dieter - 5.29.0-1 - 5.29.0 +* Fri Dec 16 2016 Rex Dieter - 5.29.0-1 +- 5.29.0 + * Mon Oct 03 2016 Rex Dieter - 5.27.0-1 - 5.27.0 diff --git a/sources b/sources index 3235477..a1435cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1a633ed10804ad00d53978bcfd906e7 kconfig-5.27.0.tar.xz +SHA512 (kconfig-5.29.0.tar.xz) = e9b8432e8952808b7ce163cebfd5e9140692a06c47d7e2e33051e906f8053c4f70471f957f99c56b823f2e027f8a34acab885f65cd57d5cb02aefd9a81e7273f From 8add3d9a6fcf1d300d45f0eaabf3d5c89065d2c2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 6 Feb 2017 12:03:09 -0600 Subject: [PATCH 055/105] 5.31.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 56ca47e..4851db9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /kconfig-5.26.0.tar.xz /kconfig-5.27.0.tar.xz /kconfig-5.29.0.tar.xz +/kconfig-5.31.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 7d1ca0b..b4a4b4f 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.29.0 +Version: 5.31.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Feb 06 2017 Rex Dieter - 5.31.0-1 +- 5.31.0 + * Fri Dec 16 2016 Rex Dieter - 5.29.0-1 - 5.29.0 diff --git a/sources b/sources index a1435cf..2ef42e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.29.0.tar.xz) = e9b8432e8952808b7ce163cebfd5e9140692a06c47d7e2e33051e906f8053c4f70471f957f99c56b823f2e027f8a34acab885f65cd57d5cb02aefd9a81e7273f +SHA512 (kconfig-5.31.0.tar.xz) = 4890513f86f22d64b6955d9b4ceb8ba6ff2016a8ea21f532b5b4b1f533dc3645b70412825394805d9c6f45b87c6cbb2bb75752e8a73645cee47ad4695b2dc313 From 7db370e3a9d3d67521321800f749de64d62f3000 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 4 Mar 2017 14:23:38 -0600 Subject: [PATCH 056/105] 5.32.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4851db9..60f3038 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /kconfig-5.27.0.tar.xz /kconfig-5.29.0.tar.xz /kconfig-5.31.0.tar.xz +/kconfig-5.32.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index b4a4b4f..297ed45 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.31.0 +Version: 5.32.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sat Mar 04 2017 Rex Dieter - 5.32.0-1 +- 5.32.0 + * Mon Feb 06 2017 Rex Dieter - 5.31.0-1 - 5.31.0 diff --git a/sources b/sources index 2ef42e3..62b6858 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.31.0.tar.xz) = 4890513f86f22d64b6955d9b4ceb8ba6ff2016a8ea21f532b5b4b1f533dc3645b70412825394805d9c6f45b87c6cbb2bb75752e8a73645cee47ad4695b2dc313 +SHA512 (kconfig-5.32.0.tar.xz) = 45d83dfd8293ed91dba148baa8c6ca35e4eca5039de995464b91e0cdc433dd900b4844e2c94fb2dc5ee57957a9d9af3e24ee7fbd10958c176bb74093929de430 From 39f89aa2070bd35fe0db96f15f63b2d445888f71 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Apr 2017 08:09:45 -0500 Subject: [PATCH 057/105] 5.33.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 60f3038..4f8c87b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /kconfig-5.29.0.tar.xz /kconfig-5.31.0.tar.xz /kconfig-5.32.0.tar.xz +/kconfig-5.33.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 297ed45..b3d91a7 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,12 +1,12 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.32.0 +Version: 5.33.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT -URL: https://quickgit.kde.org/?p=%{framework}.git +URL: https://cgit.kde.org/%{framework}.git %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Apr 03 2017 Rex Dieter - 5.33.0-1 +- 5.33.0 + * Sat Mar 04 2017 Rex Dieter - 5.32.0-1 - 5.32.0 diff --git a/sources b/sources index 62b6858..afce171 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.32.0.tar.xz) = 45d83dfd8293ed91dba148baa8c6ca35e4eca5039de995464b91e0cdc433dd900b4844e2c94fb2dc5ee57957a9d9af3e24ee7fbd10958c176bb74093929de430 +SHA512 (kconfig-5.33.0.tar.xz) = e04fa2b30b16d3514ce9420a81111efef6216e8f0fd0619a71e4e527a82cf56c5209b185468bfe5cd71c437ecb5bb9d7a7a1be854e3f37f62f53b1bccbf819f6 From 1356b994b48db6dadffed2afa75a7941aba6cb48 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 May 2017 11:04:00 -0500 Subject: [PATCH 058/105] 5.34.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4f8c87b..e9af21b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /kconfig-5.31.0.tar.xz /kconfig-5.32.0.tar.xz /kconfig-5.33.0.tar.xz +/kconfig-5.34.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index b3d91a7..4df5077 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.33.0 +Version: 5.34.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon May 15 2017 Rex Dieter - 5.34.0-1 +- 5.34.0 + * Mon Apr 03 2017 Rex Dieter - 5.33.0-1 - 5.33.0 diff --git a/sources b/sources index afce171..02df07a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.33.0.tar.xz) = e04fa2b30b16d3514ce9420a81111efef6216e8f0fd0619a71e4e527a82cf56c5209b185468bfe5cd71c437ecb5bb9d7a7a1be854e3f37f62f53b1bccbf819f6 +SHA512 (kconfig-5.34.0.tar.xz) = d5684fee949081e5bbb96f25fed77996d6f64aeb4fcb4113b44358a16ff63578269115dab156891e96c414740a85779b0f3585a31a37e3f34b9f629f4c3988ea From 9dc025d66e57b8f63da624984fed1ab5a842e1b9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 4 Jun 2017 07:16:02 -0500 Subject: [PATCH 059/105] 5.35.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e9af21b..34cc54c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /kconfig-5.32.0.tar.xz /kconfig-5.33.0.tar.xz /kconfig-5.34.0.tar.xz +/kconfig-5.35.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 4df5077..0ef8a33 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.34.0 +Version: 5.35.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun Jun 04 2017 Rex Dieter - 5.35.0-1 +- 5.35.0 + * Mon May 15 2017 Rex Dieter - 5.34.0-1 - 5.34.0 diff --git a/sources b/sources index 02df07a..4c98297 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.34.0.tar.xz) = d5684fee949081e5bbb96f25fed77996d6f64aeb4fcb4113b44358a16ff63578269115dab156891e96c414740a85779b0f3585a31a37e3f34b9f629f4c3988ea +SHA512 (kconfig-5.35.0.tar.xz) = 46ca4815144807b66709d6a68577d9ad80cc7b276e724b34cade7b5b1e0b176ee41353ce495248ddc797af2840eb5f9e6b36c0126abcfcc524dd9f2466310142 From 409f5e61f364a6c32729595a394ac87e48cc968a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Jul 2017 12:04:34 -0500 Subject: [PATCH 060/105] 5.36.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 34cc54c..e88e109 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /kconfig-5.33.0.tar.xz /kconfig-5.34.0.tar.xz /kconfig-5.35.0.tar.xz +/kconfig-5.36.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 0ef8a33..9d973a5 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.35.0 +Version: 5.36.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Jul 03 2017 Rex Dieter - 5.36.0-1 +- 5.36.0 + * Sun Jun 04 2017 Rex Dieter - 5.35.0-1 - 5.35.0 diff --git a/sources b/sources index 4c98297..25ac42a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.35.0.tar.xz) = 46ca4815144807b66709d6a68577d9ad80cc7b276e724b34cade7b5b1e0b176ee41353ce495248ddc797af2840eb5f9e6b36c0126abcfcc524dd9f2466310142 +SHA512 (kconfig-5.36.0.tar.xz) = 5da8e6b3d55c870e0cc1ee774119b8e4d01b7fcae885f37cb4d305f246dd6d22cc5385f52579b2860d52d14ab816f914048385bd896c063e07b1ca0d70735d27 From bc06c5828a44661fd4a6e1d5651dd5ad1d2105de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 15:13:54 +0000 Subject: [PATCH 061/105] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 9d973a5..1a39a31 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.36.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 5.36.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 03 2017 Rex Dieter - 5.36.0-1 - 5.36.0 From a726dd903d06d0d5bcabfc8cac7701f4bc6a88d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 00:24:01 +0000 Subject: [PATCH 062/105] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 1a39a31..f5a5741 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.36.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 5.36.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 5.36.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4be6e4316baf8eb0e04ade340a6383d02ae17b3e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 25 Aug 2017 09:26:19 -0500 Subject: [PATCH 063/105] 5.37.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e88e109..c2f7fec 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /kconfig-5.34.0.tar.xz /kconfig-5.35.0.tar.xz /kconfig-5.36.0.tar.xz +/kconfig-5.37.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index f5a5741..ca28875 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,8 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.36.0 -Release: 3%{?dist} +Version: 5.37.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Aug 25 2017 Rex Dieter - 5.37.0-1 +- 5.37.0 + * Thu Aug 03 2017 Fedora Release Engineering - 5.36.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 25ac42a..ef67981 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.36.0.tar.xz) = 5da8e6b3d55c870e0cc1ee774119b8e4d01b7fcae885f37cb4d305f246dd6d22cc5385f52579b2860d52d14ab816f914048385bd896c063e07b1ca0d70735d27 +SHA512 (kconfig-5.37.0.tar.xz) = 8d6c120f14f2c5d2c44173b142a8d175cdfb9a48f3a94a5798bf222ca5954a7420e6bbe6a467565032468cf5f8485ac73a48e8c0c8c825ef3573e9641cf60fa1 From cf7927819342de0e9253307ee5be0a30dd6c1f21 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 11 Sep 2017 14:53:14 -0500 Subject: [PATCH 064/105] 5.38.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c2f7fec..fe53c7b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /kconfig-5.35.0.tar.xz /kconfig-5.36.0.tar.xz /kconfig-5.37.0.tar.xz +/kconfig-5.38.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index ca28875..a2d5eb1 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,7 +1,7 @@ %global framework kconfig Name: kf5-%{framework} -Version: 5.37.0 +Version: 5.38.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Sep 11 2017 Rex Dieter - 5.38.0-1 +- 5.38.0 + * Fri Aug 25 2017 Rex Dieter - 5.37.0-1 - 5.37.0 diff --git a/sources b/sources index ef67981..37eea8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.37.0.tar.xz) = 8d6c120f14f2c5d2c44173b142a8d175cdfb9a48f3a94a5798bf222ca5954a7420e6bbe6a467565032468cf5f8485ac73a48e8c0c8c825ef3573e9641cf60fa1 +SHA512 (kconfig-5.38.0.tar.xz) = b8eaa832018843253e2710ee6b7d2cbf9d6b34727b2cde555db0ee2489e98356aadbec78a957d7cd761acf058f11a566f7156138ae08287e4f7d6694b742669c From 5d8a19b6b8dad29e210fa5ba6c3bfc31d4de49da Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 13 Sep 2017 11:09:04 -0500 Subject: [PATCH 065/105] cosmetics, support %bootstrap, autotests initial support for python bindings (not ready yet) --- kf5-kconfig.spec | 53 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index a2d5eb1..5fb970b 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,8 +1,17 @@ %global framework kconfig +# uncomment to enable bootstrap mode +#global bootstrap 1 + +%if !0%{?bootstrap} +# not quite ready -- rex +#global python 1 +%global tests 1 +%endif + Name: kf5-%{framework} Version: 5.38.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -24,9 +33,24 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-rpm-macros >= %{version} + +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Xml) BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel +%if 0%{?python} +BuildRequires: clang +BuildRequires: python2-qt5-devel +BuildRequires: python3-qt5-devel +%endif + +%if 0%{?tests} +BuildRequires: dbus-x11 +BuildRequires: time +BuildRequires: xorg-x11-server-Xvfb +%endif + Requires: kf5-filesystem >= %{version} Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-gui%{?_isa} = %{version}-%{release} @@ -38,9 +62,7 @@ parts: KConfigCore and KConfigGui. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel -## included for completeness and documentation, but part of qtbase-devel already -- rex -#Requires: pkgconfig(Qt5Xml) +Requires: cmake(Qt5Xml) %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -68,7 +90,9 @@ their changes to their respective configuration files. %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} .. +%{cmake_kf5} .. \ + %{?tests:-DBUILD_TESTING:BOOL=ON} \ + %{?python:-Dlibclang_LIBRARY:PATH=%{_libdir}/libclang.so} popd make %{?_smp_mflags} -C %{_target_platform} @@ -77,16 +101,27 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang kconfig5_qt --with-qt --all-name +%find_lang %{name} --all-name --with-qt + + +%check +%if 0%{?tests} +export CTEST_OUTPUT_ON_FAILURE=1 +xvfb-run -a \ +dbus-launch --exit-with-session \ +time \ +make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: +%endif %files %doc DESIGN README.md TODO %license COPYING.LIB + %post core -p /sbin/ldconfig %postun core -p /sbin/ldconfig -%files core -f kconfig5_qt.lang +%files core -f %{name}.lang %{_kf5_bindir}/kreadconfig5 %{_kf5_bindir}/kwriteconfig5 %{_kf5_libdir}/libKF5ConfigCore.so.* @@ -111,6 +146,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Sep 13 2017 Rex Dieter - 5.38.0-2 +- cosmetics, support %%bootstrap, autotests +- initial support for python bindings (not ready yet) + * Mon Sep 11 2017 Rex Dieter - 5.38.0-1 - 5.38.0 From 07b2e66844436f33104be6ee510d0df095ab27e2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 13 Sep 2017 13:47:22 -0500 Subject: [PATCH 066/105] enable python bindings now that extra-cmake-modules is ready for it --- kf5-kconfig.spec | 56 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 5fb970b..136e4ca 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -4,14 +4,15 @@ #global bootstrap 1 %if !0%{?bootstrap} -# not quite ready -- rex -#global python 1 +%if 0%{?fedora} > 25 +%global python 1 +%endif %global tests 1 %endif Name: kf5-%{framework} Version: 5.38.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -27,7 +28,6 @@ URL: https://cgit.kde.org/%{framework}.git Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz ## upstream patches -# http://commits.kde.org/kconfig/0cb0ecf8001d62ae0977c6f48f1807de45de314a ## upstreamable patches @@ -40,9 +40,10 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel %if 0%{?python} +BuildRequires: bundled(python2-clang) >= 4.0.1 BuildRequires: clang -BuildRequires: python2-qt5-devel -BuildRequires: python3-qt5-devel +BuildRequires: python2-PyQt5-devel +BuildRequires: python3-PyQt5-devel %endif %if 0%{?tests} @@ -82,17 +83,42 @@ KConfigGui provides a way to hook widgets to the configuration so that they are automatically initialized from the configuration and automatically propagate their changes to their respective configuration files. +%if 0%{?python} +%package -n python2-pykf5-%{framework} +Summary: Python2 bindings for %{framework} +Requires: %{name} = %{version}-%{release} +%description -n python2-pykf5-%{framework} +%{summary}. + +%package -n python3-pykf5-%{framework} +Summary: Python3 bindings for %{framework} +Requires: %{name} = %{version}-%{release} +%description -n python3-pykf5-%{framework} +%{summary}. + +%package -n pykf5-%{framework}-devel +Summary: SIP files for %{framework} Python bindings +BuildArch: noarch +%description -n pykf5-%{framework}-devel +%{summary}. +%endif + %prep %autosetup -n %{framework}-%{version} -p1 %build + +%if 0%{?python:1} +PYTHONPATH=%{_datadir}/ECM/python +export PYTHONPATH +%endif + mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. \ - %{?tests:-DBUILD_TESTING:BOOL=ON} \ - %{?python:-Dlibclang_LIBRARY:PATH=%{_libdir}/libclang.so} + %{?tests:-DBUILD_TESTING:BOOL=ON} popd make %{?_smp_mflags} -C %{_target_platform} @@ -144,8 +170,22 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigCore.pri %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri +%if 0%{?python} +%files -n python2-pykf5-%{framework} +%{python2_sitelib}/PyKF5/ + +%files -n python3-pykf5-%{framework} +%{python3_sitelib}/PyKF5/ + +%files -n pykf5-%{framework}-devel +%{_datadir}/sip/PyKF5/ +%endif + %changelog +* Wed Sep 13 2017 Rex Dieter - 5.38.0-3 +- enable python bindings + * Wed Sep 13 2017 Rex Dieter - 5.38.0-2 - cosmetics, support %%bootstrap, autotests - initial support for python bindings (not ready yet) From e108e8d36447e9513102e7f7a0195506187704e2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 13 Sep 2017 14:16:29 -0500 Subject: [PATCH 067/105] try to workaround parallel-build issues wrt python bindings --- kf5-kconfig.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 136e4ca..c1e20f9 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -121,7 +121,8 @@ pushd %{_target_platform} %{?tests:-DBUILD_TESTING:BOOL=ON} popd -make %{?_smp_mflags} -C %{_target_platform} +make %{?_smp_mflags} -C %{_target_platform} -k || + make -C %{_target_platform} %install From 0402893a92da476a23a504f5a5d0191b0562c418 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 13 Sep 2017 14:34:51 -0500 Subject: [PATCH 068/105] disable python, failing on arm7hl, aarch64, ppc64le archs --- kf5-kconfig.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index c1e20f9..c0833ae 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -5,14 +5,14 @@ %if !0%{?bootstrap} %if 0%{?fedora} > 25 -%global python 1 +#global python 1 %endif %global tests 1 %endif Name: kf5-%{framework} Version: 5.38.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -184,6 +184,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Wed Sep 13 2017 Rex Dieter - 5.38.0-4 +- disable python, failing on arm7hl, aarch64, ppc64le archs + * Wed Sep 13 2017 Rex Dieter - 5.38.0-3 - enable python bindings From 9d22216b366c24ae5397875c8129eb453c4c9587 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 13 Sep 2017 16:12:33 -0500 Subject: [PATCH 069/105] (re)enable python, use ninja workaround parallel-build failures in python bindings when using gnumake --- kf5-kconfig.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index c0833ae..47cebf1 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -5,14 +5,14 @@ %if !0%{?bootstrap} %if 0%{?fedora} > 25 -#global python 1 +%global python 1 %endif %global tests 1 %endif Name: kf5-%{framework} Version: 5.38.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -30,6 +30,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra ## upstream patches ## upstreamable patches +BuildRequires: ninja-build BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-rpm-macros >= %{version} @@ -117,16 +118,17 @@ export PYTHONPATH mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} .. \ +%{cmake_kf5} -G Ninja .. \ %{?tests:-DBUILD_TESTING:BOOL=ON} popd -make %{?_smp_mflags} -C %{_target_platform} -k || - make -C %{_target_platform} +#make -C %{_target_platform} +%ninja_build -C %{_target_platform} %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +#make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%ninja_install -C %{_target_platform} %find_lang %{name} --all-name --with-qt @@ -136,8 +138,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} export CTEST_OUTPUT_ON_FAILURE=1 xvfb-run -a \ dbus-launch --exit-with-session \ -time \ -make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: +ninja test -v -C %{_target_platform} ||: +## cant use %%ninja_test here for some reason, doesn't inherit evn vars from xvfb or dbus -- rex + +#make test ARGS="--output-on-failure --timeout 300" %endif @@ -184,6 +188,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Wed Sep 13 2017 Rex Dieter - 5.38.0-5 +- (re)enable python, use ninja + * Wed Sep 13 2017 Rex Dieter - 5.38.0-4 - disable python, failing on arm7hl, aarch64, ppc64le archs From 8e25d19ac225d0968e27ee64e5b211871228664a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Oct 2017 09:57:36 -0500 Subject: [PATCH 070/105] 5.39.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe53c7b..961bf5f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /kconfig-5.36.0.tar.xz /kconfig-5.37.0.tar.xz /kconfig-5.38.0.tar.xz +/kconfig-5.39.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 47cebf1..08b46e8 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,8 +11,8 @@ %endif Name: kf5-%{framework} -Version: 5.38.0 -Release: 5%{?dist} +Version: 5.39.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -188,6 +188,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Sun Oct 08 2017 Rex Dieter - 5.39.0-1 +- 5.39.0 + * Wed Sep 13 2017 Rex Dieter - 5.38.0-5 - (re)enable python, use ninja diff --git a/sources b/sources index 37eea8e..81d1f29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.38.0.tar.xz) = b8eaa832018843253e2710ee6b7d2cbf9d6b34727b2cde555db0ee2489e98356aadbec78a957d7cd761acf058f11a566f7156138ae08287e4f7d6694b742669c +SHA512 (kconfig-5.39.0.tar.xz) = d14ee524c7c06eec8f6bb953c203bb4077ccffaaa01b7f25496819bb19bdedce098342e90c357b70eb46815ea1f9a85bb6d00c575f31c9d0519921c33b02860e From 91b42e43a1ff4cba90dee21380a546c4c128972c Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 19 Oct 2017 15:06:21 -0500 Subject: [PATCH 071/105] Cleanup spec file conditionals --- kf5-kconfig.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 08b46e8..466353d 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -4,7 +4,7 @@ #global bootstrap 1 %if !0%{?bootstrap} -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %global python 1 %endif %global tests 1 @@ -12,7 +12,7 @@ Name: kf5-%{framework} Version: 5.39.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -188,6 +188,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Thu Oct 19 2017 Troy Dawson - 5.39.0-2 +- Cleanup spec file conditionals + * Sun Oct 08 2017 Rex Dieter - 5.39.0-1 - 5.39.0 From a256e131910f4dfdc666d67386870b5f2fa6617a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 10 Nov 2017 09:33:55 -0600 Subject: [PATCH 072/105] 5.40.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 961bf5f..32d51af 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /kconfig-5.37.0.tar.xz /kconfig-5.38.0.tar.xz /kconfig-5.39.0.tar.xz +/kconfig-5.40.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 466353d..61bdccd 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,8 +11,8 @@ %endif Name: kf5-%{framework} -Version: 5.39.0 -Release: 2%{?dist} +Version: 5.40.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -188,6 +188,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Fri Nov 10 2017 Rex Dieter - 5.40.0-1 +- 5.40.0 + * Thu Oct 19 2017 Troy Dawson - 5.39.0-2 - Cleanup spec file conditionals diff --git a/sources b/sources index 81d1f29..b967764 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.39.0.tar.xz) = d14ee524c7c06eec8f6bb953c203bb4077ccffaaa01b7f25496819bb19bdedce098342e90c357b70eb46815ea1f9a85bb6d00c575f31c9d0519921c33b02860e +SHA512 (kconfig-5.40.0.tar.xz) = c61f86144af8aba52341be2f2bd80dfa4a3a68fbf7daf65f49441c9ad00385080e161965bfbdd190e52cad023e8b7774bfb9e13546a9e909cc09de15c55fdfac From 74a2da2fa0d9e3e6d9ab8efd02e773ebcb1f3516 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Dec 2017 10:33:50 -0600 Subject: [PATCH 073/105] 5.41.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 32d51af..fa12810 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /kconfig-5.38.0.tar.xz /kconfig-5.39.0.tar.xz /kconfig-5.40.0.tar.xz +/kconfig-5.41.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 61bdccd..a11b632 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,7 +11,7 @@ %endif Name: kf5-%{framework} -Version: 5.40.0 +Version: 5.41.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -188,6 +188,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Mon Dec 04 2017 Rex Dieter - 5.41.0-1 +- 5.41.0 + * Fri Nov 10 2017 Rex Dieter - 5.40.0-1 - 5.40.0 diff --git a/sources b/sources index b967764..d570792 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.40.0.tar.xz) = c61f86144af8aba52341be2f2bd80dfa4a3a68fbf7daf65f49441c9ad00385080e161965bfbdd190e52cad023e8b7774bfb9e13546a9e909cc09de15c55fdfac +SHA512 (kconfig-5.41.0.tar.xz) = 966f88c7c02390551cdf072159cf7e224719cc7cf20f3bb90acee7fa46a82b80f64a3c4c6bfdcdf779451f2a42e92ec51212cf8442bd360fa2ac30dd1fa3487b From 02c1c2affff98af18d42a51b6191c2b7937eed19 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Jan 2018 08:55:34 -0600 Subject: [PATCH 074/105] 5.42.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fa12810..36f3782 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /kconfig-5.39.0.tar.xz /kconfig-5.40.0.tar.xz /kconfig-5.41.0.tar.xz +/kconfig-5.42.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index a11b632..867bbf1 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,7 +11,7 @@ %endif Name: kf5-%{framework} -Version: 5.41.0 +Version: 5.42.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -188,6 +188,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Mon Jan 08 2018 Rex Dieter - 5.42.0-1 +- 5.42.0 + * Mon Dec 04 2017 Rex Dieter - 5.41.0-1 - 5.41.0 diff --git a/sources b/sources index d570792..bd49cd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.41.0.tar.xz) = 966f88c7c02390551cdf072159cf7e224719cc7cf20f3bb90acee7fa46a82b80f64a3c4c6bfdcdf779451f2a42e92ec51212cf8442bd360fa2ac30dd1fa3487b +SHA512 (kconfig-5.42.0.tar.xz) = 632b1acd159353ddcd6a7715068997240690ec6352fa1f5164f1c2cb4e34ff0b8e4a0e8e677987b651ba12b9cb7b46f3768fecc1c7714a3dac9167bf689791e5 From 20b7fd1374e069dd14c6a77342040fc49b7135f9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Jan 2018 10:14:20 -0600 Subject: [PATCH 075/105] try packaged python2-clang (on f28+) --- kf5-kconfig.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 867bbf1..5c470bd 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -41,7 +41,11 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel %if 0%{?python} +%if 0%{?fedora} > 27 +BuildRequires: python2-clang +%else BuildRequires: bundled(python2-clang) >= 4.0.1 +%endif BuildRequires: clang BuildRequires: python2-PyQt5-devel BuildRequires: python3-PyQt5-devel From 89f5918c06c329006126dbb67adfc262d0bc14a3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Jan 2018 10:32:09 -0600 Subject: [PATCH 076/105] omit python support on f28+ PyQt5 needs to grow support for Qt5 5.10.0 first --- kf5-kconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 5c470bd..fad4ccc 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -4,7 +4,7 @@ #global bootstrap 1 %if !0%{?bootstrap} -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 +%if 0%{?fedora} && 0%{?fedora} < 28 %global python 1 %endif %global tests 1 From c363420490214a7b7391a2532937cffdc913c55a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 7 Feb 2018 09:51:25 -0600 Subject: [PATCH 077/105] 5.43.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 36f3782..aeeb5ca 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /kconfig-5.40.0.tar.xz /kconfig-5.41.0.tar.xz /kconfig-5.42.0.tar.xz +/kconfig-5.43.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index fad4ccc..0f47837 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,7 +11,7 @@ %endif Name: kf5-%{framework} -Version: 5.42.0 +Version: 5.43.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -192,6 +192,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Wed Feb 07 2018 Rex Dieter - 5.43.0-1 +- 5.43.0 + * Mon Jan 08 2018 Rex Dieter - 5.42.0-1 - 5.42.0 diff --git a/sources b/sources index bd49cd9..c755d9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.42.0.tar.xz) = 632b1acd159353ddcd6a7715068997240690ec6352fa1f5164f1c2cb4e34ff0b8e4a0e8e677987b651ba12b9cb7b46f3768fecc1c7714a3dac9167bf689791e5 +SHA512 (kconfig-5.43.0.tar.xz) = 446d0b5b1aadc32a73e44cae77959d212a83cc036c288591c82b46734e616ce1124d3df09d4fa031f91c8bb08e452348588831435c44fe64247b341d62eb3279 From 88a8000833e0abb85b7bd8c99e5b98d216250ca2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 3 Mar 2018 07:59:14 -0600 Subject: [PATCH 078/105] 5.44.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aeeb5ca..ee11aee 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /kconfig-5.41.0.tar.xz /kconfig-5.42.0.tar.xz /kconfig-5.43.0.tar.xz +/kconfig-5.44.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 0f47837..0fbcb38 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,7 +11,7 @@ %endif Name: kf5-%{framework} -Version: 5.43.0 +Version: 5.44.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -192,6 +192,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Sat Mar 03 2018 Rex Dieter - 5.44.0-1 +- 5.44.0 + * Wed Feb 07 2018 Rex Dieter - 5.43.0-1 - 5.43.0 diff --git a/sources b/sources index c755d9e..ed73aa1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.43.0.tar.xz) = 446d0b5b1aadc32a73e44cae77959d212a83cc036c288591c82b46734e616ce1124d3df09d4fa031f91c8bb08e452348588831435c44fe64247b341d62eb3279 +SHA512 (kconfig-5.44.0.tar.xz) = 139e768bb0845fdfbe069786e3a669c4a8e22e15bcba01a7570c3c652dbd9827338be7f17e2633fb07526fb96da2f1a78f0fe84ace4b0bc45656cca8da748160 From 08c8a52259fe31e9f4cc9c43a2f0182f33a59f0c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Apr 2018 07:33:43 -0500 Subject: [PATCH 079/105] 5.45.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ee11aee..869aefc 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /kconfig-5.42.0.tar.xz /kconfig-5.43.0.tar.xz /kconfig-5.44.0.tar.xz +/kconfig-5.45.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 0fbcb38..f2e82dc 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,7 +11,7 @@ %endif Name: kf5-%{framework} -Version: 5.44.0 +Version: 5.45.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -192,6 +192,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Sun Apr 08 2018 Rex Dieter - 5.45.0-1 +- 5.45.0 + * Sat Mar 03 2018 Rex Dieter - 5.44.0-1 - 5.44.0 diff --git a/sources b/sources index ed73aa1..ff3accc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.44.0.tar.xz) = 139e768bb0845fdfbe069786e3a669c4a8e22e15bcba01a7570c3c652dbd9827338be7f17e2633fb07526fb96da2f1a78f0fe84ace4b0bc45656cca8da748160 +SHA512 (kconfig-5.45.0.tar.xz) = d248741546774554de13781735c0bf630ce7986d645ef77dc61842caeadbb4e8c4f581ba93e3d37ac5716c3548954e0120284a3cabc8f88c4122bfb668359085 From 63f537922effaa54c3442ee72cfaf334e7278423 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 5 May 2018 16:26:59 -0500 Subject: [PATCH 080/105] 5.46.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 869aefc..48235a7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /kconfig-5.43.0.tar.xz /kconfig-5.44.0.tar.xz /kconfig-5.45.0.tar.xz +/kconfig-5.46.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index f2e82dc..bf9659d 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,7 +11,7 @@ %endif Name: kf5-%{framework} -Version: 5.45.0 +Version: 5.46.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -192,6 +192,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Sat May 05 2018 Rex Dieter - 5.46.0-1 +- 5.46.0 + * Sun Apr 08 2018 Rex Dieter - 5.45.0-1 - 5.45.0 diff --git a/sources b/sources index ff3accc..7c8e928 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.45.0.tar.xz) = d248741546774554de13781735c0bf630ce7986d645ef77dc61842caeadbb4e8c4f581ba93e3d37ac5716c3548954e0120284a3cabc8f88c4122bfb668359085 +SHA512 (kconfig-5.46.0.tar.xz) = 0dc5234482ca773a7dbabeff983013e4da17c9ea42805e32070c415a51fc878d0918f768315f9db6ee23bce16e445a6f3defe96be256a10568bdee444d8f1a5a From 9be72af22924b91ae0d4ecd80c87ab92ae179c6b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 May 2018 18:49:23 -0500 Subject: [PATCH 081/105] fix python2-clang dep --- kf5-kconfig.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index bf9659d..22f47f5 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -41,10 +41,10 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel %if 0%{?python} -%if 0%{?fedora} > 27 -BuildRequires: python2-clang -%else +%if 0%{?fedora} && 0%{?fedora} < 27 BuildRequires: bundled(python2-clang) >= 4.0.1 +%else +BuildRequires: python2-clang %endif BuildRequires: clang BuildRequires: python2-PyQt5-devel From 09b50637073864a499494340f2ef7b6ee5cfb828 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 2 Jun 2018 15:54:06 -0500 Subject: [PATCH 082/105] 5.47.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 48235a7..254a8c3 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /kconfig-5.44.0.tar.xz /kconfig-5.45.0.tar.xz /kconfig-5.46.0.tar.xz +/kconfig-5.47.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 22f47f5..9a15c79 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,7 +11,7 @@ %endif Name: kf5-%{framework} -Version: 5.46.0 +Version: 5.47.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -192,6 +192,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Sat Jun 02 2018 Rex Dieter - 5.47.0-1 +- 5.47.0 + * Sat May 05 2018 Rex Dieter - 5.46.0-1 - 5.46.0 diff --git a/sources b/sources index 7c8e928..d79a612 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.46.0.tar.xz) = 0dc5234482ca773a7dbabeff983013e4da17c9ea42805e32070c415a51fc878d0918f768315f9db6ee23bce16e445a6f3defe96be256a10568bdee444d8f1a5a +SHA512 (kconfig-5.47.0.tar.xz) = d8fb1d64f25a2d88fdf7235af682a0700732a18fe73852781c2d2369f2a3bb13e6e99fd5ceae396675258abd2ce67ef14ff616206aecb8ababd6889ff1745a5b From 6a8e3973bee2464e5e5d2ef0719a27c53e3699a8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 7 Jun 2018 11:13:26 -0500 Subject: [PATCH 083/105] cleanup use pkgconfig(Qt5...) style deps use %majmin %make_build %find_lang_kf5 %ldconfig_scriptlets --- .gitignore | 26 -------------------------- kf5-kconfig.spec | 35 +++++++++++++++++++---------------- 2 files changed, 19 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 254a8c3..ede9ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,2 @@ -/kconfig-5.18.0.tar.xz -/kconfig-5.19.0.tar.xz -/kconfig-5.20.0.tar.xz -/kconfig-5.21.0.tar.xz -/kconfig-5.22.0.tar.xz -/kconfig-5.23.0.tar.xz -/kconfig-5.24.0.tar.xz -/kconfig-5.25.0.tar.xz -/kconfig-5.26.0.tar.xz -/kconfig-5.27.0.tar.xz -/kconfig-5.29.0.tar.xz -/kconfig-5.31.0.tar.xz -/kconfig-5.32.0.tar.xz -/kconfig-5.33.0.tar.xz -/kconfig-5.34.0.tar.xz -/kconfig-5.35.0.tar.xz -/kconfig-5.36.0.tar.xz -/kconfig-5.37.0.tar.xz -/kconfig-5.38.0.tar.xz -/kconfig-5.39.0.tar.xz -/kconfig-5.40.0.tar.xz -/kconfig-5.41.0.tar.xz -/kconfig-5.42.0.tar.xz -/kconfig-5.43.0.tar.xz -/kconfig-5.44.0.tar.xz -/kconfig-5.45.0.tar.xz /kconfig-5.46.0.tar.xz /kconfig-5.47.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 9a15c79..41c966f 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -12,31 +12,31 @@ Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT URL: https://cgit.kde.org/%{framework}.git -%global versiondir %(echo %{version} | cut -d. -f1-2) +%global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches ## upstreamable patches BuildRequires: ninja-build -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-rpm-macros >= %{majmin} -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Xml) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Xml) BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel @@ -57,7 +57,7 @@ BuildRequires: time BuildRequires: xorg-x11-server-Xvfb %endif -Requires: kf5-filesystem >= %{version} +Requires: kf5-filesystem >= %{majmin} Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-gui%{?_isa} = %{version}-%{release} @@ -68,7 +68,7 @@ parts: KConfigCore and KConfigGui. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: cmake(Qt5Xml) +Requires: pkgconfig(Qt5Xml) %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -126,7 +126,7 @@ pushd %{_target_platform} %{?tests:-DBUILD_TESTING:BOOL=ON} popd -#make -C %{_target_platform} +#make_build -C %{_target_platform} %ninja_build -C %{_target_platform} @@ -134,7 +134,7 @@ popd #make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %ninja_install -C %{_target_platform} -%find_lang %{name} --all-name --with-qt +%find_lang_kf5 kconfig5_qt %check @@ -153,18 +153,16 @@ ninja test -v -C %{_target_platform} ||: %doc DESIGN README.md TODO %license COPYING.LIB -%post core -p /sbin/ldconfig -%postun core -p /sbin/ldconfig +%ldconfig_scriptlets core -%files core -f %{name}.lang +%files core -f kconfig5_qt.lang %{_kf5_bindir}/kreadconfig5 %{_kf5_bindir}/kwriteconfig5 %{_kf5_libdir}/libKF5ConfigCore.so.* %{_kf5_libexecdir}/kconfig_compiler_kf5 %{_kf5_libexecdir}/kconf_update -%post gui -p /sbin/ldconfig -%postun gui -p /sbin/ldconfig +%ldconfig_scriptlets gui %files gui %{_kf5_libdir}/libKF5ConfigGui.so.* @@ -192,6 +190,11 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Thu Jun 07 2018 Rex Dieter - 5.47.0-2 +- cleanup +- use pkgconfig(Qt5...) style deps +- use %%majmin %%make_build %%find_lang_kf5 %%ldconfig_scriptlets + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0 From 55966c126195b3e7e3a1f972ff79d51616aaff00 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Jul 2018 19:57:23 -0500 Subject: [PATCH 084/105] 5.48.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ede9ae6..0c2b783 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /kconfig-5.46.0.tar.xz /kconfig-5.47.0.tar.xz +/kconfig-5.48.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 41c966f..c4b84b0 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -11,8 +11,8 @@ %endif Name: kf5-%{framework} -Version: 5.47.0 -Release: 2%{?dist} +Version: 5.48.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -190,6 +190,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Mon Jul 09 2018 Rex Dieter - 5.48.0-1 +- 5.48.0 + * Thu Jun 07 2018 Rex Dieter - 5.47.0-2 - cleanup - use pkgconfig(Qt5...) style deps diff --git a/sources b/sources index d79a612..d5d3739 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.47.0.tar.xz) = d8fb1d64f25a2d88fdf7235af682a0700732a18fe73852781c2d2369f2a3bb13e6e99fd5ceae396675258abd2ce67ef14ff616206aecb8ababd6889ff1745a5b +SHA512 (kconfig-5.48.0.tar.xz) = c1d11fae67114976937d9f30aa3fb8ad3d53e756b792c1b4dcf89f660b77d8150310a06b2e1365bb7f78f46ef6a37280d20657ca8f460d6fc088c9f75efd8ca4 From be754b495fcb8e51aacd176f4dc331c249b72a81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:03:57 +0000 Subject: [PATCH 085/105] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index c4b84b0..f74c46b 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Version: 5.48.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -190,6 +190,9 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 5.48.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Rex Dieter - 5.48.0-1 - 5.48.0 From 586bf69389ce80d2901a6bb7e3a53e888b35eed2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 1 Aug 2018 09:22:04 -0500 Subject: [PATCH 086/105] python: support on f29+ again, add Obsoletes otherwise (like s390x) (#1610422) use make again (macro'ize ninja support) .spec cosmetics (whitespace mostly) --- kf5-kconfig.spec | 53 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index f74c46b..07f5f77 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -4,19 +4,24 @@ #global bootstrap 1 %if !0%{?bootstrap} -%if 0%{?fedora} && 0%{?fedora} < 28 +# FIXME/TODO: sip currently segfaults on s390x +%ifnarch s390x %global python 1 %endif +#endif %global tests 1 %endif -Name: kf5-%{framework} +# use ninja instead of make +#global ninja 1 + +Name: kf5-%{framework} Version: 5.48.0 -Release: 2%{?dist} -Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system +Release: 3%{?dist} +Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system -License: GPLv2+ and LGPLv2+ and MIT -URL: https://cgit.kde.org/%{framework}.git +License: GPLv2+ and LGPLv2+ and MIT +URL: https://cgit.kde.org/%{framework}.git %global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -25,12 +30,15 @@ URL: https://cgit.kde.org/%{framework}.git %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches ## upstreamable patches + +%if 0%{?ninja} BuildRequires: ninja-build +%endif BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-rpm-macros >= %{majmin} @@ -49,6 +57,10 @@ BuildRequires: python2-clang BuildRequires: clang BuildRequires: python2-PyQt5-devel BuildRequires: python3-PyQt5-devel +%else +Obsoletes: python2-pykf5-%{framework} < %{version}-%{release} +Obsoletes: python3-pykf5-%{framework} < %{version}-%{release} +Obsoletes: pykf5-%{framework}-devel < %{version}-%{release} %endif %if 0%{?tests} @@ -122,17 +134,24 @@ export PYTHONPATH mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} -G Ninja .. \ +%{cmake_kf5} .. \ + %{?ninja:-G Ninja} \ %{?tests:-DBUILD_TESTING:BOOL=ON} popd -#make_build -C %{_target_platform} +%if 0%{?ninja} %ninja_build -C %{_target_platform} +%else +%make_build -C %{_target_platform} +%endif %install -#make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%if 0%{?ninja} %ninja_install -C %{_target_platform} +%else +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%endif %find_lang_kf5 kconfig5_qt @@ -140,12 +159,13 @@ popd %check %if 0%{?tests} export CTEST_OUTPUT_ON_FAILURE=1 +## cant use %%ninja_test here for some reason, doesn't inherit env vars from xvfb or dbus -- rex xvfb-run -a \ -dbus-launch --exit-with-session \ +%if 0%{?ninja} ninja test -v -C %{_target_platform} ||: -## cant use %%ninja_test here for some reason, doesn't inherit evn vars from xvfb or dbus -- rex - -#make test ARGS="--output-on-failure --timeout 300" +%else +make test ARGS="--output-on-failure --timeout 300" +%endif %endif @@ -190,6 +210,11 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Wed Aug 01 2018 Rex Dieter - 5.48.0-3 +- python: support on f29+ again, add Obsoletes otherwise (like s390x) (#1610422) +- use make again (macro'ize ninja support) +- .spec cosmetics (whitespace mostly) + * Fri Jul 13 2018 Fedora Release Engineering - 5.48.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b2b44f46df20a9389684bf23224c4beb4cef69d8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 1 Aug 2018 09:29:32 -0500 Subject: [PATCH 087/105] fix %%check --- kf5-kconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 07f5f77..ee1e366 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -164,7 +164,7 @@ xvfb-run -a \ %if 0%{?ninja} ninja test -v -C %{_target_platform} ||: %else -make test ARGS="--output-on-failure --timeout 300" +make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %endif %endif From bad22409b4452219cb298dc043442da773ab58b1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 1 Aug 2018 10:49:50 -0500 Subject: [PATCH 088/105] ppc64 sip segfaulting too :( --- kf5-kconfig.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index ee1e366..2628599 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -5,7 +5,7 @@ %if !0%{?bootstrap} # FIXME/TODO: sip currently segfaults on s390x -%ifnarch s390x +%ifnarch ppc64 s390x %global python 1 %endif #endif @@ -211,7 +211,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog * Wed Aug 01 2018 Rex Dieter - 5.48.0-3 -- python: support on f29+ again, add Obsoletes otherwise (like s390x) (#1610422) +- python: support on f29+ again, add Obsoletes otherwise (like ppc64/s390x) (#1610422) - use make again (macro'ize ninja support) - .spec cosmetics (whitespace mostly) From 0f8712fc304687739ab2b36427bac7a735286a00 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 1 Aug 2018 11:14:31 -0500 Subject: [PATCH 089/105] switch back to ninja python + make = race'y builds :-/ --- kf5-kconfig.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 2628599..71a7367 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -13,7 +13,7 @@ %endif # use ninja instead of make -#global ninja 1 +%global ninja 1 Name: kf5-%{framework} Version: 5.48.0 @@ -212,7 +212,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog * Wed Aug 01 2018 Rex Dieter - 5.48.0-3 - python: support on f29+ again, add Obsoletes otherwise (like ppc64/s390x) (#1610422) -- use make again (macro'ize ninja support) +- macro'ize ninja support - .spec cosmetics (whitespace mostly) * Fri Jul 13 2018 Fedora Release Engineering - 5.48.0-2 From ebf90c2ab7b61a12b16e3764aa72f89fa91893a2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Aug 2018 10:17:19 -0500 Subject: [PATCH 090/105] 5.49.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0c2b783..4c7b85d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /kconfig-5.46.0.tar.xz /kconfig-5.47.0.tar.xz /kconfig-5.48.0.tar.xz +/kconfig-5.49.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 71a7367..921bf72 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -16,8 +16,8 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.48.0 -Release: 3%{?dist} +Version: 5.49.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -210,6 +210,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Tue Aug 07 2018 Rex Dieter - 5.49.0-1 +- 5.49.0 + * Wed Aug 01 2018 Rex Dieter - 5.48.0-3 - python: support on f29+ again, add Obsoletes otherwise (like ppc64/s390x) (#1610422) - macro'ize ninja support diff --git a/sources b/sources index d5d3739..a4ccb50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.48.0.tar.xz) = c1d11fae67114976937d9f30aa3fb8ad3d53e756b792c1b4dcf89f660b77d8150310a06b2e1365bb7f78f46ef6a37280d20657ca8f460d6fc088c9f75efd8ca4 +SHA512 (kconfig-5.49.0.tar.xz) = 7f87fbec203ac22dc31904732d3ca56bc51ca8caabdba0348c57e312280765e76219bd6f31fe30c4b8836c23f825f617a7bd1f069b12e501324f12d6fe86ebaa From 7485230a0865a3a6424d9e7455b07347f4a8d48e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 4 Sep 2018 13:40:15 -0500 Subject: [PATCH 091/105] 5.50 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4c7b85d..8f6d7e6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /kconfig-5.47.0.tar.xz /kconfig-5.48.0.tar.xz /kconfig-5.49.0.tar.xz +/kconfig-5.50.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 921bf72..e625270 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -16,7 +16,7 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.49.0 +Version: 5.50.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -210,6 +210,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Tue Sep 04 2018 Rex Dieter - 5.50.0-1 +- 5.50 + * Tue Aug 07 2018 Rex Dieter - 5.49.0-1 - 5.49.0 diff --git a/sources b/sources index a4ccb50..9fc3609 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.49.0.tar.xz) = 7f87fbec203ac22dc31904732d3ca56bc51ca8caabdba0348c57e312280765e76219bd6f31fe30c4b8836c23f825f617a7bd1f069b12e501324f12d6fe86ebaa +SHA512 (kconfig-5.50.0.tar.xz) = 282a5cefb3cc1752fbfd450732bb3479751d3a20b65661da5ebe1797968f4e20f093b3e1083b232581ed375ab9314f059f13a7f8a1021c1dbb2c96d33fabe746 From 73519fa1fe944bd313ccd397b635bf150d8bb18f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 12 Sep 2018 13:50:54 -0500 Subject: [PATCH 092/105] make python support fedora-only --- kf5-kconfig.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index e625270..7f83d0a 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -5,9 +5,11 @@ %if !0%{?bootstrap} # FIXME/TODO: sip currently segfaults on s390x +%if 0%{?fedora} %ifnarch ppc64 s390x %global python 1 %endif +%endif #endif %global tests 1 %endif From c215adaf93bd3aede2e28a22c2bf34cbb24054c5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 14 Sep 2018 15:47:46 -0500 Subject: [PATCH 093/105] disable python on f29+ needswork, guessing something to do with sip private modules --- kf5-kconfig.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 7f83d0a..c1304cc 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -7,7 +7,9 @@ # FIXME/TODO: sip currently segfaults on s390x %if 0%{?fedora} %ifnarch ppc64 s390x -%global python 1 +%if 0%{?fedora} < 29 +global python 1 +%endif %endif %endif #endif @@ -19,7 +21,7 @@ Name: kf5-%{framework} Version: 5.50.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -57,6 +59,7 @@ BuildRequires: bundled(python2-clang) >= 4.0.1 BuildRequires: python2-clang %endif BuildRequires: clang +BuildRequires: clang-devel BuildRequires: python2-PyQt5-devel BuildRequires: python3-PyQt5-devel %else @@ -212,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Fri Sep 14 2018 Rex Dieter - 5.50.0-2 +- disable python on f29+ + * Tue Sep 04 2018 Rex Dieter - 5.50.0-1 - 5.50 From abd62d1c91af26e0f4b800a5c4dd39e93147c76b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 17 Sep 2018 08:39:54 -0500 Subject: [PATCH 094/105] typo --- kf5-kconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index c1304cc..f2305f8 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -8,7 +8,7 @@ %if 0%{?fedora} %ifnarch ppc64 s390x %if 0%{?fedora} < 29 -global python 1 +%global python 1 %endif %endif %endif From b8e771446d7615726138fcf0fd8497930243d1a3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Oct 2018 15:39:37 -0500 Subject: [PATCH 095/105] 5.51.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8f6d7e6..086976e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /kconfig-5.48.0.tar.xz /kconfig-5.49.0.tar.xz /kconfig-5.50.0.tar.xz +/kconfig-5.51.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index f2305f8..c0a6fab 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,8 +20,8 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.50.0 -Release: 2%{?dist} +Version: 5.51.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Wed Oct 10 2018 Rex Dieter - 5.51.0-1 +- 5.51.0 + * Fri Sep 14 2018 Rex Dieter - 5.50.0-2 - disable python on f29+ diff --git a/sources b/sources index 9fc3609..049f81f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.50.0.tar.xz) = 282a5cefb3cc1752fbfd450732bb3479751d3a20b65661da5ebe1797968f4e20f093b3e1083b232581ed375ab9314f059f13a7f8a1021c1dbb2c96d33fabe746 +SHA512 (kconfig-5.51.0.tar.xz) = 5362d973e9c679206ef5d02f53a781b6b8c7b9c731c04e790b2bd2731ab44f6c49e51bd94287b1a2bedc7abdca84139219155a3b05914888adff7fbe09e02b02 From caa81e06e059044405313d6b2010591498d82607 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 4 Nov 2018 12:34:46 -0600 Subject: [PATCH 096/105] 5.52.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 086976e..af1a5b3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /kconfig-5.49.0.tar.xz /kconfig-5.50.0.tar.xz /kconfig-5.51.0.tar.xz +/kconfig-5.52.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index c0a6fab..e448364 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,7 +20,7 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.51.0 +Version: 5.52.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Sun Nov 04 2018 Rex Dieter - 5.52.0-1 +- 5.52.0 + * Wed Oct 10 2018 Rex Dieter - 5.51.0-1 - 5.51.0 diff --git a/sources b/sources index 049f81f..acac883 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.51.0.tar.xz) = 5362d973e9c679206ef5d02f53a781b6b8c7b9c731c04e790b2bd2731ab44f6c49e51bd94287b1a2bedc7abdca84139219155a3b05914888adff7fbe09e02b02 +SHA512 (kconfig-5.52.0.tar.xz) = 2ecf2e809270679cf7f3d57628e941fd3ee69c70104354582fb57f046c7a0dbf8ab1a23812e0d3636f8f2d846c3ccace81a73c04664464796017617b97ad3250 From 6dbc255c9048fe702936295d56b2e477eddcc07a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 6 Nov 2018 15:27:17 -0600 Subject: [PATCH 097/105] update python paths --- kf5-kconfig.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index e448364..6925a47 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -204,10 +204,10 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %if 0%{?python} %files -n python2-pykf5-%{framework} -%{python2_sitelib}/PyKF5/ +%{python2_sitearch}/PyKF5/ %files -n python3-pykf5-%{framework} -%{python3_sitelib}/PyKF5/ +%{python3_sitearch}/PyKF5/ %files -n pykf5-%{framework}-devel %{_datadir}/sip/PyKF5/ From 64fe6e5d957fa635c9dfe58d62160dc3520fb49d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 9 Dec 2018 08:23:20 -0600 Subject: [PATCH 098/105] 5.53.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index af1a5b3..ca29b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /kconfig-5.50.0.tar.xz /kconfig-5.51.0.tar.xz /kconfig-5.52.0.tar.xz +/kconfig-5.53.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 6925a47..2f331a9 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,7 +20,7 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.52.0 +Version: 5.53.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Sun Dec 09 2018 Rex Dieter - 5.53.0-1 +- 5.53.0 + * Sun Nov 04 2018 Rex Dieter - 5.52.0-1 - 5.52.0 diff --git a/sources b/sources index acac883..5bbfe65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.52.0.tar.xz) = 2ecf2e809270679cf7f3d57628e941fd3ee69c70104354582fb57f046c7a0dbf8ab1a23812e0d3636f8f2d846c3ccace81a73c04664464796017617b97ad3250 +SHA512 (kconfig-5.53.0.tar.xz) = 345620f174cb51901be7a521a9bebd147c713b45067dceeb53039abacb1693a62d59a62e23159eef6c9355a283ce0d74c9ed3287ad906d8927fc243bbb5d9566 From 183ddceaa9858703ed8c4bf5e3fb052a28d9a599 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 8 Jan 2019 16:59:58 -0600 Subject: [PATCH 099/105] 5.54.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ca29b2c..d76589e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /kconfig-5.51.0.tar.xz /kconfig-5.52.0.tar.xz /kconfig-5.53.0.tar.xz +/kconfig-5.54.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 2f331a9..a268fcf 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,7 +20,7 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.53.0 +Version: 5.54.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Tue Jan 08 2019 Rex Dieter - 5.54.0-1 +- 5.54.0 + * Sun Dec 09 2018 Rex Dieter - 5.53.0-1 - 5.53.0 diff --git a/sources b/sources index 5bbfe65..4f0f38e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.53.0.tar.xz) = 345620f174cb51901be7a521a9bebd147c713b45067dceeb53039abacb1693a62d59a62e23159eef6c9355a283ce0d74c9ed3287ad906d8927fc243bbb5d9566 +SHA512 (kconfig-5.54.0.tar.xz) = 2a35d635db47e3b1e4fa3919ec73190a8d0bb9e82c4a8487ae7b87ba73cb54659e97124c9761de4dc303d8697f8f17b3d27d30b43e47bb870a052be87c843de7 From ef6b27e7e544a4423ecff04d79a42c5c664e049d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 05:26:53 +0000 Subject: [PATCH 100/105] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-kconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index a268fcf..8468aa9 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -21,7 +21,7 @@ Name: kf5-%{framework} Version: 5.54.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 5.54.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 08 2019 Rex Dieter - 5.54.0-1 - 5.54.0 From aa179db521cd1ae599b8549e44cc31f2f1a53a08 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Feb 2019 11:03:01 -0600 Subject: [PATCH 101/105] 5.55.0 --- .gitignore | 1 + kf5-kconfig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d76589e..5bfa732 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /kconfig-5.52.0.tar.xz /kconfig-5.53.0.tar.xz /kconfig-5.54.0.tar.xz +/kconfig-5.55.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 8468aa9..459b5d9 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,8 +20,8 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.54.0 -Release: 2%{?dist} +Version: 5.55.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Mon Feb 04 2019 Rex Dieter - 5.55.0-1 +- 5.55.0 + * Fri Feb 01 2019 Fedora Release Engineering - 5.54.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 4f0f38e..34106cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.54.0.tar.xz) = 2a35d635db47e3b1e4fa3919ec73190a8d0bb9e82c4a8487ae7b87ba73cb54659e97124c9761de4dc303d8697f8f17b3d27d30b43e47bb870a052be87c843de7 +SHA512 (kconfig-5.55.0.tar.xz) = 21dc353a2df43fb945d8e0025537a8eb18bc339a9760d539ee39394558d9446e7b85109b0733e26124eb1dc18b6ed4f4e79b42a8e79041bd4783934f9265d3ea From 0a121706e9b0de186f67f81c1376ffcf05b9ee07 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 5 Mar 2019 08:56:02 -0600 Subject: [PATCH 102/105] 5.56.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5bfa732..299dd89 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /kconfig-5.53.0.tar.xz /kconfig-5.54.0.tar.xz /kconfig-5.55.0.tar.xz +/kconfig-5.56.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 459b5d9..a904263 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,7 +20,7 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.55.0 +Version: 5.56.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Tue Mar 05 2019 Rex Dieter - 5.56.0-1 +- 5.56.0 + * Mon Feb 04 2019 Rex Dieter - 5.55.0-1 - 5.55.0 diff --git a/sources b/sources index 34106cf..ebef5f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.55.0.tar.xz) = 21dc353a2df43fb945d8e0025537a8eb18bc339a9760d539ee39394558d9446e7b85109b0733e26124eb1dc18b6ed4f4e79b42a8e79041bd4783934f9265d3ea +SHA512 (kconfig-5.56.0.tar.xz) = 51ae4ce35751e1d6f2b799ebf0db04e1830d17546c5d46bcd11e86b949abc5983c92b8ba6c5a2e012401bf40ccefeb5b6bd5c9af4748c2481acab5f73d29b1b9 From e391bb58f739137f4d92153608152034fbfcf753 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 9 Apr 2019 10:03:56 -0500 Subject: [PATCH 103/105] 5.57.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 299dd89..9027a16 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /kconfig-5.54.0.tar.xz /kconfig-5.55.0.tar.xz /kconfig-5.56.0.tar.xz +/kconfig-5.57.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index a904263..f4875ea 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,7 +20,7 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.56.0 +Version: 5.57.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Tue Apr 09 2019 Rex Dieter - 5.57.0-1 +- 5.57.0 + * Tue Mar 05 2019 Rex Dieter - 5.56.0-1 - 5.56.0 diff --git a/sources b/sources index ebef5f7..4948679 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.56.0.tar.xz) = 51ae4ce35751e1d6f2b799ebf0db04e1830d17546c5d46bcd11e86b949abc5983c92b8ba6c5a2e012401bf40ccefeb5b6bd5c9af4748c2481acab5f73d29b1b9 +SHA512 (kconfig-5.57.0.tar.xz) = bae34417c51c52610c7370d4ecfe59ed995a1a70ae828c4f699436eb2c2792a3bbdc6bec86f304edfdd94d83c56679493baf4e317d68e330a98c1944c78a1650 From e91430d946bb141ad3fd55dfff8f77df9e8b7620 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 May 2019 13:49:35 -0500 Subject: [PATCH 104/105] 5.58.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9027a16..af305f7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /kconfig-5.55.0.tar.xz /kconfig-5.56.0.tar.xz /kconfig-5.57.0.tar.xz +/kconfig-5.58.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index f4875ea..0b4162d 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,7 +20,7 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.57.0 +Version: 5.58.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Tue May 07 2019 Rex Dieter - 5.58.0-1 +- 5.58.0 + * Tue Apr 09 2019 Rex Dieter - 5.57.0-1 - 5.57.0 diff --git a/sources b/sources index 4948679..bf3cb90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.57.0.tar.xz) = bae34417c51c52610c7370d4ecfe59ed995a1a70ae828c4f699436eb2c2792a3bbdc6bec86f304edfdd94d83c56679493baf4e317d68e330a98c1944c78a1650 +SHA512 (kconfig-5.58.0.tar.xz) = bdcd7b28734406ea5bc8e323659cae99754ca0da799a97d20a0e56ae74386cbec9bdaa447ab1b445bf137dfe928bece0c28a7630a1856eee9d822e6b01783c19 From 630887849334cc6dcc1c18437a0e843f8bf9976a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 6 Jun 2019 12:34:32 -0500 Subject: [PATCH 105/105] 5.59.0 --- .gitignore | 1 + kf5-kconfig.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index af305f7..66e2444 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /kconfig-5.56.0.tar.xz /kconfig-5.57.0.tar.xz /kconfig-5.58.0.tar.xz +/kconfig-5.59.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 0b4162d..b382f36 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -20,7 +20,7 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.58.0 +Version: 5.59.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog +* Thu Jun 06 2019 Rex Dieter - 5.59.0-1 +- 5.59.0 + * Tue May 07 2019 Rex Dieter - 5.58.0-1 - 5.58.0 diff --git a/sources b/sources index bf3cb90..98bebda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.58.0.tar.xz) = bdcd7b28734406ea5bc8e323659cae99754ca0da799a97d20a0e56ae74386cbec9bdaa447ab1b445bf137dfe928bece0c28a7630a1856eee9d822e6b01783c19 +SHA512 (kconfig-5.59.0.tar.xz) = c8f21979e3508b9bf1b695a22e4843ff0d311db957817fcc3bbc5c65e397c7e2a0ed8fb2f1194fea79e90a5369f52d758bb684354b9d9e1856dd9552e5f837e7