From 072558d549f719a0d7ac08806798271fd847e49a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 22 Apr 2014 15:45:01 +0200 Subject: [PATCH 001/109] Import package (kf5-4.98.0-6) --- .gitignore | 1 + kf5.spec | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ macros.kf5 | 43 ++++++++++++++++++++++++ sources | 1 + 4 files changed, 142 insertions(+) create mode 100644 kf5.spec create mode 100644 macros.kf5 diff --git a/.gitignore b/.gitignore index e69de29..152bc65 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/macros.kf5 diff --git a/kf5.spec b/kf5.spec new file mode 100644 index 0000000..20883f6 --- /dev/null +++ b/kf5.spec @@ -0,0 +1,97 @@ +Name: kf5 +Version: 4.98.0 +Release: 6 +Summary: Filesystem and RPM macros for KDE Frameworks 5 +BuildArch: noarch +License: BSD +URL: http://www.kde.org + +Source0: macros.kf5 + +%description +Filesystem and RPM macros for KDE Frameworks 5 + +%package filesystem +Summary: Filesystem for KDE Frameworks 5 +%description filesystem +Filesystem for KDE Frameworks 5. + +%package rpm-macros +Summary: RPM macros for KDE Frameworks 5 +%description rpm-macros +RPM macros for building KDE Frameworks 5 packages. + + +%install +# See macros.kf5 where the directories are specified +mkdir -p %{buildroot}%{_libdir}/qt5/plugins/kf5 +mkdir -p %{buildroot}%{_includedir}/KF5 +mkdir -p %{buildroot}%{_libexecdir}/kf5 + +mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ +install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d + + +%files filesystem +%{_libdir}/qt5/plugins/kf5 +%{_includedir}/KF5 +%{_libexecdir}/kf5 + + +%files rpm-macros +%{_rpmconfigdir}/macros.d/macros.kf5 + + +%changelog +* Tue Apr 22 2014 Daniel Vrátil 4.98.0-6 +- Explicitly set BIN_INSTALL_DIR to be absolute, otherwise CMake complains + +* Mon Apr 21 2014 Daniel Vrátil 4.98.0-5 +- Fix _kf5_sysconfdir and set some install paths in cmake_kf5 + +* Wed Apr 16 2014 Daniel Vrátil 4.98.0-4 +- Rename base package to kf5 +- Create -filesystem, -rpm-macros subpackges + +* Fri Apr 11 2014 Daniel Vrátil 4.98.0-3 +- Fix build +- Use %%global instead of %%define +- Use install instead of cp + +* Fri Apr 11 2014 Daniel Vrátil 4.98.0-2 +- Fix some installation dirs in the macros.kf5 file + +* 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 2 (4.97.0) + +* Thu Feb 13 2014 Daniel Vrátil 4.96.0-2 +- Remove unnecessary mkdirs + +* 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 16 2014 Daniel Vrátil 4.95.0-4 +- fix definition of QT_PLUGIN_INSTALL_DIR in RPM macros + +* Thu Jan 16 2014 Daniel Vrátil 4.95.0-2 +- fix install dirs definitions in RPM macros + +* Thu Jan 09 2014 Daniel Vrátil 4.95.0-1 +- Update to KDE Frameworks 5 TP1 (4.95.0) + +* Tue Jan 7 2014 Daniel Vrátil +- export XDG_DATA_DIRS + +* Mon Jan 6 2014 Daniel Vrátil +- alter XDG_DATA_DIRS in cmake_kf5 RPM macro +- add _kf5_mandir RPM macro + +* Sat Jan 4 2014 Daniel Vrátil +- initial version + diff --git a/macros.kf5 b/macros.kf5 new file mode 100644 index 0000000..d6fcf3e --- /dev/null +++ b/macros.kf5 @@ -0,0 +1,43 @@ +%_kf5_prefix %_prefix +%_kf5_archdatadir %_libdir/qt5 +%_kf5_bindir %_kf5_prefix/bin +%_kf5_datadir %_datadir +%_kf5_docdir /usr/share/doc +%_kf5_includedir %_includedir/KF5 +%_kf5_libdir %_libdir +%_kf5_libexecdir %_libexecdir/kf5 +%_kf5_qtplugindir %_qt5_plugindir +%_kf5_plugindir %_qt5_plugindir/kf5 +%_kf5_sysconfdir %_sysconfdir +%_kf5_mandir %_kf5_datadir/man +%_kf5_buildtype release +%_kf5_qmldir %_qt5_prefix/qml + +%cmake_kf5 \ + QTDIR="%{_qt5_prefix}" ; export QTDIR ; \ + PATH="%{_kf5_bindir}:$PATH" ; export PATH ; \ + CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ + FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ + %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ + %{__cmake} \\\ + -DBUILD_SHARED_LIBS:BOOL=ON \\\ + -DBUILD_TESTING:BOOL=FALSE \\\ + -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\ + -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ + -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\ + -DDATA_INSTALL_DIR:PATH=%{_kf5_datadir} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_kf5_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_kf5_libdir} \\\ +%if "%{?_lib}" == "lib64" \ + %{?_cmake_lib_suffix64} \\\ +%endif \ + -DKCFG_INSTALL_DIR:PATH=%{_datadir}/config.kcfg \\\ + -DPLUGIN_INSTALL_DIR:PATH=%{_kf5_plugindir} \\\ + -DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ + -DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\ + -DIMPORTS_INSTALL_DIR=%{_qt5_importdir} \\\ + -DECM_MKSPECS_INSTALL_DIR:STRING=%{_kf5_libdir}/qt5/mkspecs/modules \\\ + -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} \\\ + -DLIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} diff --git a/sources b/sources index e69de29..1226f1f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2f3822da4b82e0fc0f89be0868638eba macros.kf5 From 81818959c8f2a7a475d1002b87944a328abe8b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 5 May 2014 17:17:23 +0200 Subject: [PATCH 002/109] KDE Frameworks 4.99.0 --- kf5.spec | 13 +++++++++++-- macros.kf5 | 10 ++++------ sources | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/kf5.spec b/kf5.spec index 20883f6..ffebbfd 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 4.98.0 -Release: 6 +Version: 4.99.0 +Release: 1 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,15 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Mon May 05 2014 Daniel Vrátil 4.99.0-1 +- KDE Frameworks 4.99.0 + +* Mon Apr 28 2014 Daniel Vrátil 4.98.0-8 +- Remove INCLUDE_INSTALL_DIR, since we use the default one + +* Tue Apr 22 2014 Daniel Vrátil 4.98.0-7 +- Make DATA_INSTALL_DIR relative, so that CMake config files don't point to /usr/usr/share + * Tue Apr 22 2014 Daniel Vrátil 4.98.0-6 - Explicitly set BIN_INSTALL_DIR to be absolute, otherwise CMake complains diff --git a/macros.kf5 b/macros.kf5 index d6fcf3e..e850513 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -27,8 +27,6 @@ -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\ - -DDATA_INSTALL_DIR:PATH=%{_kf5_datadir} \\\ - -DINCLUDE_INSTALL_DIR:PATH=%{_kf5_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_kf5_libdir} \\\ %if "%{?_lib}" == "lib64" \ %{?_cmake_lib_suffix64} \\\ @@ -37,7 +35,7 @@ -DPLUGIN_INSTALL_DIR:PATH=%{_kf5_plugindir} \\\ -DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ -DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\ - -DIMPORTS_INSTALL_DIR=%{_qt5_importdir} \\\ - -DECM_MKSPECS_INSTALL_DIR:STRING=%{_kf5_libdir}/qt5/mkspecs/modules \\\ - -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} \\\ - -DLIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} + -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\ + -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_libdir}/qt5/mkspecs/modules \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_kf5_sysconfdir} \\\ + -DLIBEXEC_INSTALL_DIR:PATH=%{_kf5_libexecdir} diff --git a/sources b/sources index 1226f1f..ee680ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f3822da4b82e0fc0f89be0868638eba macros.kf5 +9687789a251e70efe03b26bc52577a9a macros.kf5 From 0ba3d064aaf1f93335a6e513e35a5873aa849bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 13 May 2014 10:15:41 +0200 Subject: [PATCH 003/109] Define KF5_INCLUDE_INSTALL_DIR and KF5_LIBEXEC_INSTALL_DIR --- kf5.spec | 8 +++++++- macros.kf5 | 5 ++++- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index ffebbfd..6e5cd86 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 4.99.0 -Release: 1 +Release: 3 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,12 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Tue May 06 2014 Daniel Vrátil 4.99.0-3 +- Define KF5_INCLUDE_INSTALL_DIR + +* Mon May 05 2014 Daniel Vrátil 4.99.0-2 +- Define KF5_LIBEXEC_INSTALL_DIR + * Mon May 05 2014 Daniel Vrátil 4.99.0-1 - KDE Frameworks 4.99.0 diff --git a/macros.kf5 b/macros.kf5 index e850513..2ce4367 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -27,6 +27,7 @@ -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_kf5_libdir} \\\ %if "%{?_lib}" == "lib64" \ %{?_cmake_lib_suffix64} \\\ @@ -38,4 +39,6 @@ -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\ -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_libdir}/qt5/mkspecs/modules \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_kf5_sysconfdir} \\\ - -DLIBEXEC_INSTALL_DIR:PATH=%{_kf5_libexecdir} + -DLIBEXEC_INSTALL_DIR:PATH=%{_kf5_libexecdir} \\\ + -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\ + -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} diff --git a/sources b/sources index ee680ea..6d3eb34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9687789a251e70efe03b26bc52577a9a macros.kf5 +ebe50627bd3a4a03037ae311b19a9c23 macros.kf5 From ce2b66e0cfd1cf547ba27da032525104289316f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 27 May 2014 17:41:53 +0200 Subject: [PATCH 004/109] Make LIB_INSTALL_DIR relative so that CMake does not generate /usr/usr/lib/... --- kf5.spec | 5 ++++- macros.kf5 | 2 +- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 6e5cd86..2d66b18 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 4.99.0 -Release: 3 +Release: 4 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Wed May 14 2014 Daniel Vrátil 4.99.0-4 +- Make LIB_INSTALL_DIR relative, otherwise /usr/usr/lib64/... is generated by CMake + * Tue May 06 2014 Daniel Vrátil 4.99.0-3 - Define KF5_INCLUDE_INSTALL_DIR diff --git a/macros.kf5 b/macros.kf5 index 2ce4367..e2e6714 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -28,7 +28,7 @@ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{_kf5_libdir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_lib} \\\ %if "%{?_lib}" == "lib64" \ %{?_cmake_lib_suffix64} \\\ %endif \ diff --git a/sources b/sources index 6d3eb34..ab62369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebe50627bd3a4a03037ae311b19a9c23 macros.kf5 +e6b17285db08eb7baafd6405e8b500e8 macros.kf5 From 417f4621632d12d5b3ddd679c821220227f21376 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 29 May 2014 22:30:22 +0200 Subject: [PATCH 005/109] remove macros.kf5 from .gitignore and sources It doesn't make sense to have the same file both in git and in the lookaside cache. In this case, macros.kf5 is a simple text file that can live in git just fine. --- .gitignore | 1 - sources | 1 - 2 files changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 152bc65..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +0,0 @@ -/macros.kf5 diff --git a/sources b/sources index ab62369..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -e6b17285db08eb7baafd6405e8b500e8 macros.kf5 From ef44cf9a1fa29ca0d72c12c145fbfeef429f36c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 4 Jun 2014 10:33:21 +0200 Subject: [PATCH 006/109] Point LIBEXEC_INSTALL_DIR to %{_libexecdir} to fix duplicated path --- kf5.spec | 5 ++++- macros.kf5 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 2d66b18..e7503e0 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 4.99.0 -Release: 4 +Release: 5 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Wed Jun 04 2014 Daniel Vrátil 4.99.0-5 +- Point LIBEXEC_INSTALL_DIR to %%{_libexecdir} to fix duplicated path + * Wed May 14 2014 Daniel Vrátil 4.99.0-4 - Make LIB_INSTALL_DIR relative, otherwise /usr/usr/lib64/... is generated by CMake diff --git a/macros.kf5 b/macros.kf5 index e2e6714..dbad461 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -39,6 +39,6 @@ -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\ -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_libdir}/qt5/mkspecs/modules \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_kf5_sysconfdir} \\\ - -DLIBEXEC_INSTALL_DIR:PATH=%{_kf5_libexecdir} \\\ + -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir} \\\ -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\ -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} From 9c34be0e424fa2c5284141c112eb14499baaf4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 4 Jun 2014 10:54:14 +0200 Subject: [PATCH 007/109] Remove kf5 suffix from -DPLUGIN_INSTALL_DIR as packages now specify that on their own --- kf5.spec | 7 +++++-- macros.kf5 | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index e7503e0..972d48c 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 4.99.0 -Release: 5 +Release: 6 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,8 +43,11 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Wed Jun 04 2014 Daniel Vrátil 4.99.0-6 +- Remove kf5 suffix from -DPLUGIN_INSTALL_DIR as packages now specify that on their own + * Wed Jun 04 2014 Daniel Vrátil 4.99.0-5 -- Point LIBEXEC_INSTALL_DIR to %%{_libexecdir} to fix duplicated path +- Point -DLIBEXEC_INSTALL_DIR to %%{_libexecdir} to fix duplicated path * Wed May 14 2014 Daniel Vrátil 4.99.0-4 - Make LIB_INSTALL_DIR relative, otherwise /usr/usr/lib64/... is generated by CMake diff --git a/macros.kf5 b/macros.kf5 index dbad461..501bc51 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -33,7 +33,7 @@ %{?_cmake_lib_suffix64} \\\ %endif \ -DKCFG_INSTALL_DIR:PATH=%{_datadir}/config.kcfg \\\ - -DPLUGIN_INSTALL_DIR:PATH=%{_kf5_plugindir} \\\ + -DPLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ -DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ -DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\ -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\ From f113e65e7672421bfa68f97cb63113bcfa8c4dc9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:20:11 -0500 Subject: [PATCH 008/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 972d48c..019268c 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 4.99.0 -Release: 6 +Release: 7 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 4.99.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Jun 04 2014 Daniel Vrátil 4.99.0-6 - Remove kf5 suffix from -DPLUGIN_INSTALL_DIR as packages now specify that on their own From a3d038efe14c3124bcd84277b0eba07220626998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 9 Jul 2014 17:14:23 +0200 Subject: [PATCH 009/109] KDE Frameworks 5.0.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 019268c..9f771f8 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 4.99.0 -Release: 7 +Version: 5.0.0 +Release: 1 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %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.99.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 42e2327ca171793fb745662bf8324ed2943c1d77 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 19 Jul 2014 13:21:08 -0500 Subject: [PATCH 010/109] Release: +%{?dist} --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 9f771f8..e369867 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.0.0 -Release: 1 +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Sat Jul 19 2014 Rex Dieter 5.0.0-2 +- Release: +%%{?dist} + * Wed Jul 09 2014 Daniel Vrátil - 5.0.0-1 - KDE Frameworks 5.0.0 From 13fb31e3a8d442b96da2d15ae63684deebfb4b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 6 Aug 2014 15:42:11 +0200 Subject: [PATCH 011/109] KDE Frameworks 5.1.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index e369867..cd73514 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.0.0 -Release: 2%{?dist} +Version: 5.1.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Wed Aug 06 2014 Daniel Vrátil - 5.1.0-1 +- KDE Frameworks 5.1.0 + * Sat Jul 19 2014 Rex Dieter 5.0.0-2 - Release: +%%{?dist} From f1336bd96a29e6b90121f7f2fdd2494379584212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 21 Aug 2014 18:35:17 +0200 Subject: [PATCH 012/109] Add new KF5-specific variables to our CMake command --- kf5.spec | 5 ++++- macros.kf5 | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index cd73514..3dc6ba5 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Thu Aug 21 2014 Daniel Vrátil - 5.1.0-2 +- Add new KF5-specific variables to our CMake command + * Wed Aug 06 2014 Daniel Vrátil - 5.1.0-1 - KDE Frameworks 5.1.0 diff --git a/macros.kf5 b/macros.kf5 index 501bc51..817a972 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -25,6 +25,9 @@ -DBUILD_TESTING:BOOL=FALSE \\\ -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\ + -DCMAKE_INSTALL_FULL_BINDIR=%{_kf5_bindir} \\\ + -DCMAKE_INSTALL_FULL_LIBEXECDIR=%{_libexecdir} \\\ + -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ From 1c4fcb930de1344b6419c6706e32520e4ca825ae Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 3 Sep 2014 08:02:52 -0500 Subject: [PATCH 013/109] %cmake_kf5: add -DKDE_INSTALL_USE_QT_SYS_PATHS=ON --- kf5.spec | 5 ++++- macros.kf5 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 3dc6ba5..6c789f6 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Wed Sep 03 2014 Rex Dieter 5.1.0-3 +- %%cmake_kf5: add -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + * Thu Aug 21 2014 Daniel Vrátil - 5.1.0-2 - Add new KF5-specific variables to our CMake command diff --git a/macros.kf5 b/macros.kf5 index 817a972..daf0e85 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -44,4 +44,5 @@ -DSYSCONF_INSTALL_DIR:PATH=%{_kf5_sysconfdir} \\\ -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir} \\\ -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\ - -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} + -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} \\\ + -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON From e08ecc4961ea95124832b1f252af2ed4ea277a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 15 Sep 2014 09:51:42 +0200 Subject: [PATCH 014/109] KDE Frameworks 5.2.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 6c789f6..914b230 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.1.0 -Release: 3%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Mon Sep 15 2014 Daniel Vrátil - 5.2.0-1 +- KDE Frameworks 5.2.0 + * Wed Sep 03 2014 Rex Dieter 5.1.0-3 - %%cmake_kf5: add -DKDE_INSTALL_USE_QT_SYS_PATHS=ON From 02afcd57b53fc862ee6d71e933ccf456a41de84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 7 Oct 2014 12:50:49 +0200 Subject: [PATCH 015/109] KDE Frameworks 5.3.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 914b230..9068844 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.2.0 +Version: 5.3.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Tue Oct 08 2014 Daniel Vrátil - 5.3.0-1 +- KDE Frameworks 5.3.0 + * Mon Sep 15 2014 Daniel Vrátil - 5.2.0-1 - KDE Frameworks 5.2.0 From 34da16797107c8f15e7bcbd49c6dfd52e357b8cc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 14 Oct 2014 09:13:24 -0500 Subject: [PATCH 016/109] macros.kf5: -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON --- kf5.spec | 5 ++++- macros.kf5 | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 9068844..f27b8b8 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Tue Oct 14 2014 Rex Dieter 5.3.0-2 +- macros.kf5: -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON + * Tue Oct 08 2014 Daniel Vrátil - 5.3.0-1 - KDE Frameworks 5.3.0 diff --git a/macros.kf5 b/macros.kf5 index daf0e85..d84c506 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -28,6 +28,7 @@ -DCMAKE_INSTALL_FULL_BINDIR=%{_kf5_bindir} \\\ -DCMAKE_INSTALL_FULL_LIBEXECDIR=%{_libexecdir} \\\ -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\ + -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ From 9082e81f58de62948b9bf39f9811d1141c8f9061 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 14 Oct 2014 09:14:16 -0500 Subject: [PATCH 017/109] fix changelog date --- kf5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index f27b8b8..3b62537 100644 --- a/kf5.spec +++ b/kf5.spec @@ -46,7 +46,7 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d * Tue Oct 14 2014 Rex Dieter 5.3.0-2 - macros.kf5: -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON -* Tue Oct 08 2014 Daniel Vrátil - 5.3.0-1 +* Wed Oct 08 2014 Daniel Vrátil - 5.3.0-1 - KDE Frameworks 5.3.0 * Mon Sep 15 2014 Daniel Vrátil - 5.2.0-1 From 0d63c1a8ecfeb60fb2182bf8a7421efc63281825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 3 Nov 2014 14:09:39 +0100 Subject: [PATCH 018/109] KDE Frameworks 5.4.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 3b62537..3c7b206 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.3.0 -Release: 2%{?dist} +Version: 5.4.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Mon Nov 03 2014 Daniel Vrátil - 5.3.0-1 +- KDE Frameworks 5.4.0 + * Tue Oct 14 2014 Rex Dieter 5.3.0-2 - macros.kf5: -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON From 2e305e99d8e8b1c92a1117509bbcb0f5d786211c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Nov 2014 07:01:34 -0600 Subject: [PATCH 019/109] macros.kf5: as long as %kf5_bindir = /usr/bin/, no need to modify PATH --- kf5.spec | 5 ++++- macros.kf5 | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 3c7b206..406fca1 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Mon Nov 24 2014 Rex Dieter 5.4.0-2 +- macros.kf5: as long as %%kf5_bindir = /usr/bin/, no need to modify PATH + * Mon Nov 03 2014 Daniel Vrátil - 5.3.0-1 - KDE Frameworks 5.4.0 diff --git a/macros.kf5 b/macros.kf5 index d84c506..f677202 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -15,7 +15,6 @@ %cmake_kf5 \ QTDIR="%{_qt5_prefix}" ; export QTDIR ; \ - PATH="%{_kf5_bindir}:$PATH" ; export PATH ; \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ From ab65181eaa078bb4d432a509c374d44d5e29a856 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Nov 2014 07:05:01 -0600 Subject: [PATCH 020/109] macros.kf5: PATH, prepend %_qt5_bindir instead of %_kf5_bindir (ie, /usr/bin) --- kf5.spec | 2 +- macros.kf5 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 406fca1..7577668 100644 --- a/kf5.spec +++ b/kf5.spec @@ -44,7 +44,7 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog * Mon Nov 24 2014 Rex Dieter 5.4.0-2 -- macros.kf5: as long as %%kf5_bindir = /usr/bin/, no need to modify PATH +- macros.kf5: PATH, prepend %%_qt5_bindir instead of %%_kf5_bindir (ie, /usr/bin) * Mon Nov 03 2014 Daniel Vrátil - 5.3.0-1 - KDE Frameworks 5.4.0 diff --git a/macros.kf5 b/macros.kf5 index f677202..20d541e 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -15,6 +15,7 @@ %cmake_kf5 \ QTDIR="%{_qt5_prefix}" ; export QTDIR ; \ + PATH="%{_qt5_bindir}:$PATH" ; export PATH ; \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ From 1a046f11fda46f1e5429be640ac0244477ece52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 11 Dec 2014 17:45:04 +0100 Subject: [PATCH 021/109] KDE Frameworks 5.5.0 --- kf5.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 7577668..12643f5 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.4.0 -Release: 2%{?dist} +Version: 5.5.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,10 +43,13 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Thu Dec 11 2014 Daniel Vrátil - 5.5.0-1 +- KDE Frameworks 5.5.0 + * Mon Nov 24 2014 Rex Dieter 5.4.0-2 - macros.kf5: PATH, prepend %%_qt5_bindir instead of %%_kf5_bindir (ie, /usr/bin) -* Mon Nov 03 2014 Daniel Vrátil - 5.3.0-1 +* Mon Nov 03 2014 Daniel Vrátil - 5.4.0-1 - KDE Frameworks 5.4.0 * Tue Oct 14 2014 Rex Dieter 5.3.0-2 From dc799144cc025c9325b6157d9df40a844c9b3fe7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 18 Dec 2014 12:36:23 -0600 Subject: [PATCH 022/109] make pkg arch'd, own %_prefix/%_lib and %_prefix/lib --- kf5.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/kf5.spec b/kf5.spec index 12643f5..d1ebb8d 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,13 +1,15 @@ Name: kf5 Version: 5.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 -BuildArch: noarch License: BSD URL: http://www.kde.org Source0: macros.kf5 +# noarch -> arch transition +Obsoletes: kf5 < 5.5.0-2 + %description Filesystem and RPM macros for KDE Frameworks 5 @@ -18,13 +20,15 @@ Filesystem for KDE Frameworks 5. %package rpm-macros Summary: RPM macros for KDE Frameworks 5 +BuildArch: noarch %description rpm-macros RPM macros for building KDE Frameworks 5 packages. %install # See macros.kf5 where the directories are specified -mkdir -p %{buildroot}%{_libdir}/qt5/plugins/kf5 +mkdir -p %{buildroot}%{_prefix}/lib/qt5/plugins/kf5 +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt5/plugins/kf5 mkdir -p %{buildroot}%{_includedir}/KF5 mkdir -p %{buildroot}%{_libexecdir}/kf5 @@ -33,7 +37,8 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %files filesystem -%{_libdir}/qt5/plugins/kf5 +%{_prefix}/lib/qt5/plugins/kf5 +%{_prefix}/%{_lib}/qt5/plugins/kf5 %{_includedir}/KF5 %{_libexecdir}/kf5 @@ -43,6 +48,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Thu Dec 18 2014 Rex Dieter 5.5.0-2 +- make pkg arch'd, own %%_prefix/%%_lib and %%_prefix/lib + * Thu Dec 11 2014 Daniel Vrátil - 5.5.0-1 - KDE Frameworks 5.5.0 From 4056fe10574bd01f7681c750f09ec52ba1b06c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 8 Jan 2015 15:02:00 +0100 Subject: [PATCH 023/109] KDE Frameworks 5.6.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index d1ebb8d..e03a5e0 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.5.0 -Release: 2%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -48,6 +48,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Tue Jan 08 2015 Daniel Vrátil - 5.6.0-1 +- KDE Frameworks 5.6.0 + * Thu Dec 18 2014 Rex Dieter 5.5.0-2 - make pkg arch'd, own %%_prefix/%%_lib and %%_prefix/lib From 8245ee1ded3c7b5ec4245e96cc9d8f01f1247792 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 30 Jan 2015 11:53:57 -0600 Subject: [PATCH 024/109] own /etc/xdg/plasma-workspace/, /etc/xdg/plasma-workspace/{env,shutdown} --- kf5.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index e03a5e0..097db87 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -31,12 +31,14 @@ mkdir -p %{buildroot}%{_prefix}/lib/qt5/plugins/kf5 mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt5/plugins/kf5 mkdir -p %{buildroot}%{_includedir}/KF5 mkdir -p %{buildroot}%{_libexecdir}/kf5 +mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %files filesystem +%{_sysconfdir}/xdg/plasma-workspace/ %{_prefix}/lib/qt5/plugins/kf5 %{_prefix}/%{_lib}/qt5/plugins/kf5 %{_includedir}/KF5 @@ -48,6 +50,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Fri Jan 30 2015 Rex Dieter 5.6.0-2 +- own /etc/xdg/plasma-workspace/, /etc/xdg/plasma-workspace/{env,shutdown} + * Tue Jan 08 2015 Daniel Vrátil - 5.6.0-1 - KDE Frameworks 5.6.0 From 3290eea5badc7fceacc7c5852673bfadbd8c9364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 13 Feb 2015 13:19:24 +0100 Subject: [PATCH 025/109] KDE Frameworks 5.7.0 --- kf5.spec | 24 +++++++++++++----------- macros.kf5 | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/kf5.spec b/kf5.spec index 097db87..0957e54 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,15 +1,13 @@ Name: kf5 -Version: 5.6.0 +Version: 5.7.0 Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 +BuildArch: noarch License: BSD URL: http://www.kde.org Source0: macros.kf5 -# noarch -> arch transition -Obsoletes: kf5 < 5.5.0-2 - %description Filesystem and RPM macros for KDE Frameworks 5 @@ -20,15 +18,13 @@ Filesystem for KDE Frameworks 5. %package rpm-macros Summary: RPM macros for KDE Frameworks 5 -BuildArch: noarch %description rpm-macros RPM macros for building KDE Frameworks 5 packages. %install # See macros.kf5 where the directories are specified -mkdir -p %{buildroot}%{_prefix}/lib/qt5/plugins/kf5 -mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt5/plugins/kf5 +mkdir -p %{buildroot}%{_libdir}/qt5/plugins/kf5 mkdir -p %{buildroot}%{_includedir}/KF5 mkdir -p %{buildroot}%{_libexecdir}/kf5 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} @@ -50,22 +46,28 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Tue Feb 10 2015 Daniel Vrátil - 5.7.0-2 +- add %%find_lang_kf5 macro to macros.kf5 to workaround %%find_lang bugs + +* Mon Feb 09 2015 Daniel Vrátil - 5.7.0-1 +- KDE Frameworks 5.7.0 + * Fri Jan 30 2015 Rex Dieter 5.6.0-2 - own /etc/xdg/plasma-workspace/, /etc/xdg/plasma-workspace/{env,shutdown} * Tue Jan 08 2015 Daniel Vrátil - 5.6.0-1 - KDE Frameworks 5.6.0 -* Thu Dec 18 2014 Rex Dieter 5.5.0-2 -- make pkg arch'd, own %%_prefix/%%_lib and %%_prefix/lib +* Tue Jan 06 2015 Daniel Vrátil - 5.6.0-1 +- KDE Frameworks 5.6.0 -* Thu Dec 11 2014 Daniel Vrátil - 5.5.0-1 +* Sat Dec 06 2014 Daniel Vrátil - 5.5.0-1 - KDE Frameworks 5.5.0 * Mon Nov 24 2014 Rex Dieter 5.4.0-2 - macros.kf5: PATH, prepend %%_qt5_bindir instead of %%_kf5_bindir (ie, /usr/bin) -* Mon Nov 03 2014 Daniel Vrátil - 5.4.0-1 +* Mon Nov 03 2014 Daniel Vrátil - 5.3.0-1 - KDE Frameworks 5.4.0 * Tue Oct 14 2014 Rex Dieter 5.3.0-2 diff --git a/macros.kf5 b/macros.kf5 index 20d541e..cfa5bb0 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -47,3 +47,21 @@ -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\ -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} \\\ -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON + +# %%find_lang_kf5 +# +# This macro is used in KDE Frameworks 5 packages instead of %%find_lang, +# becasue find_lang is broken an it thinks that "_qt" in foobar_qt.qm is +# the name of the language. +# This macro should NOT be used with anything else but KDE Frameworks, since +# it does some assumptions regarding the names and locations and it might not +# work with other packages. +# We should eventually get this to RPM, or fix %%find_lang +# -- dvratil +# Usage: find_lang_kf5 fooBar5 +# - will look for fooBar5_qt.qm files in %%{buildroot}/usr/share/locale/ +# +%find_lang_kf5() \ + (find %{buildroot}/%{_datadir}/locale/ -name "%1.qm" -type f | sed ' \ + s:%{buildroot}/:: \ + s:%{_datadir}/locale/\\([a-zA-Z_\\@]*\\)/\\([a-zA-Z_]*\\)/%1.qm:%lang(\\1) %{_datadir}/locale/\\1/\\2/%1.qm:' > %1.lang) From 432c5c36313fff77041de1964f67ffd71f1f28d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 16 Mar 2015 15:28:38 +0100 Subject: [PATCH 026/109] KDE Frameworks 5.8.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 0957e54..88b0c1e 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.7.0 -Release: 2%{?dist} +Version: 5.8.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -46,6 +46,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Mon Mar 16 2015 Daniel Vrátil - 5.8.0-1 +- KDE Frameworks 5.8.0 + * Tue Feb 10 2015 Daniel Vrátil - 5.7.0-2 - add %%find_lang_kf5 macro to macros.kf5 to workaround %%find_lang bugs From 37fdbb4b57ab8281b2c80cb915d0a48d5edef8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 7 Apr 2015 14:49:49 +0200 Subject: [PATCH 027/109] KDE Frameworks 5.9.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 88b0c1e..e6dfc64 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.8.0 +Version: 5.9.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch @@ -46,6 +46,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %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 From f2ca05019dc3d1e36ac5360f6d20105477b375e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 11 May 2015 11:42:22 +0200 Subject: [PATCH 028/109] KDE Frameworks 5.10.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index e6dfc64..41cb24e 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.9.0 +Version: 5.10.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch @@ -46,6 +46,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Mon May 11 2015 Daniel Vrátil - 5.10.0-1 +- KDE Frameworks 5.10.0 + * Tue Apr 07 2015 Daniel Vrátil - 5.9.0-1 - KDE Frameworks 5.9.0 From 515da48a7b949d714593959915a53f5b2ab8aa3f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 3 Jun 2015 10:08:17 -0500 Subject: [PATCH 029/109] own %{_datadir}/kf5, make -filesystem arch'd --- kf5.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/kf5.spec b/kf5.spec index 41cb24e..53507ca 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,8 +1,7 @@ Name: kf5 Version: 5.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 -BuildArch: noarch License: BSD URL: http://www.kde.org @@ -13,39 +12,45 @@ Filesystem and RPM macros for KDE Frameworks 5 %package filesystem Summary: Filesystem for KDE Frameworks 5 +# noarch -> arch transition +Obsoletes: kf5-filesystem < 5.10.0-2 %description filesystem Filesystem for KDE Frameworks 5. %package rpm-macros Summary: RPM macros for KDE Frameworks 5 +BuildArch: noarch %description rpm-macros RPM macros for building KDE Frameworks 5 packages. %install # See macros.kf5 where the directories are specified -mkdir -p %{buildroot}%{_libdir}/qt5/plugins/kf5 +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/ mkdir -p %{buildroot}%{_includedir}/KF5 +mkdir -p %{buildroot}%{_datadir}/kf5 mkdir -p %{buildroot}%{_libexecdir}/kf5 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} -mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ -install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d +install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 %files filesystem %{_sysconfdir}/xdg/plasma-workspace/ -%{_prefix}/lib/qt5/plugins/kf5 -%{_prefix}/%{_lib}/qt5/plugins/kf5 -%{_includedir}/KF5 -%{_libexecdir}/kf5 - +%{_prefix}/lib/qt5/plugins/kf5/ +%{_prefix}/%{_lib}/qt5/plugins/kf5/ +%{_includedir}/KF5/ +%{_libexecdir}/kf5/ +%{_datadir}/kf5/ %files rpm-macros %{_rpmconfigdir}/macros.d/macros.kf5 %changelog +* Wed Jun 03 2015 Rex Dieter 5.10.0-2 +- own %%{_datadir}/kf5, make -filesystem arch'd + * Mon May 11 2015 Daniel Vrátil - 5.10.0-1 - KDE Frameworks 5.10.0 From ff271b899fe0128fde777e6487d83a4684c2733c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 10 Jun 2015 14:37:15 +0200 Subject: [PATCH 030/109] KDE Frameworks 5.11.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 53507ca..9ab4747 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.10.0 -Release: 2%{?dist} +Version: 5.11.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -48,6 +48,9 @@ install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/m %changelog +* Wed Jun 10 2015 Daniel Vrátil - 5.11.0-1 +- KDE Frameworks 5.11.0 + * Wed Jun 03 2015 Rex Dieter 5.10.0-2 - own %%{_datadir}/kf5, make -filesystem arch'd From b189a7df53d598a073f54a25d5e956f6f22e69e4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Jun 2015 19:45:51 -0500 Subject: [PATCH 031/109] own %_datadir/kconf_update --- kf5.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 9ab4747..7d52180 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -28,7 +28,7 @@ RPM macros for building KDE Frameworks 5 packages. # See macros.kf5 where the directories are specified mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/ mkdir -p %{buildroot}%{_includedir}/KF5 -mkdir -p %{buildroot}%{_datadir}/kf5 +mkdir -p %{buildroot}%{_datadir}/{kconf_update,kf5} mkdir -p %{buildroot}%{_libexecdir}/kf5 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} @@ -41,6 +41,7 @@ install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/m %{_prefix}/%{_lib}/qt5/plugins/kf5/ %{_includedir}/KF5/ %{_libexecdir}/kf5/ +%{_datadir}/kconf_update/ %{_datadir}/kf5/ %files rpm-macros @@ -48,6 +49,9 @@ install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/m %changelog +* Wed Jun 10 2015 Rex Dieter 5.11.0-2 +- own %%_datadir/kconf_update + * Wed Jun 10 2015 Daniel Vrátil - 5.11.0-1 - KDE Frameworks 5.11.0 From ac659c64dfedc03e76f1cefa046878baadb9e629 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 13:09:19 +0000 Subject: [PATCH 032/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 7d52180..0615269 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -49,6 +49,9 @@ install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/m %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 5.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 10 2015 Rex Dieter 5.11.0-2 - own %%_datadir/kconf_update From bc93da1719d04e8f5e784f9ee83125acf773fba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 17 Jul 2015 13:22:30 +0200 Subject: [PATCH 033/109] KDE Frameworks 5.12.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 0615269..1fad4da 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.11.0 -Release: 3%{?dist} +Version: 5.12.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -49,6 +49,9 @@ install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/m %changelog +* Fri Jul 17 2015 Daniel Vrátil - 5.12.0 +- KDE Frameworks 5.12.0 + * Wed Jun 17 2015 Fedora Release Engineering - 5.11.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 20c72e009b791978f480ea29bd999e6fec6e4fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 19 Aug 2015 17:04:41 +0200 Subject: [PATCH 034/109] KDE Frameworks 5.13.0 --- kf5.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 1fad4da..7907359 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.12.0 +Version: 5.13.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -33,6 +33,9 @@ mkdir -p %{buildroot}%{_libexecdir}/kf5 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 +sed -i \ + -e "s|@@KF5_VERSION@@|%{version}|g" \ + %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 %files filesystem @@ -49,6 +52,15 @@ install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/m %changelog +* Wed Aug 19 2015 Daniel Vrátil - 5.13.0-1 +- KDE Frameworks 5.13.0 + +* Wed Aug 19 2015 Rex Dieter 5.13.0-0.2 +- macros.kf5: add %%_kf5_version + +* Tue Aug 11 2015 Daniel Vrátil - 5.13.0-0.1 +- KDE Frameworks 5.13 + * Fri Jul 17 2015 Daniel Vrátil - 5.12.0 - KDE Frameworks 5.12.0 From 80bc7977779f1751d7c55ab47f7c60f84e3ac185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 19 Aug 2015 17:12:39 +0200 Subject: [PATCH 035/109] Update macros.kf5 --- macros.kf5 | 1 + 1 file changed, 1 insertion(+) diff --git a/macros.kf5 b/macros.kf5 index cfa5bb0..8d9270f 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -12,6 +12,7 @@ %_kf5_mandir %_kf5_datadir/man %_kf5_buildtype release %_kf5_qmldir %_qt5_prefix/qml +%_kf5_version @@KF5_VERSION@@ %cmake_kf5 \ QTDIR="%{_qt5_prefix}" ; export QTDIR ; \ From 085c4816b555541ffcc403a8fd498da764e790f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 16 Sep 2015 13:50:07 +0200 Subject: [PATCH 036/109] KDE Frameworks 5.14.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 7907359..4992d3f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.13.0 +Version: 5.14.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -52,6 +52,9 @@ sed -i \ %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 From 1c6a63d40fef926942eedf7b06997dee1350aeb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 8 Oct 2015 15:09:40 +0200 Subject: [PATCH 037/109] KDE Frameworks 5.15.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 4992d3f..c8cdf2e 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.14.0 +Version: 5.15.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -52,6 +52,9 @@ sed -i \ %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 From c299bcf952f212e554d08d698af267a9c99387a5 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 038/109] KDE Frameworks 5.16 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index c8cdf2e..516c8c4 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.15.0 +Version: 5.16.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -52,6 +52,9 @@ sed -i \ %changelog +* Sun Nov 08 2015 Daniel Vrátil - 5.16.0-1 +- KDE Frameworks 5.16.0 + * Thu Oct 08 2015 Daniel Vrátil - 5.15.0-1 - KDE Frameworks 5.15.0 From 4878a160445dc3c60d3a6f4007ce30666b4c7eff Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 16 Nov 2015 13:44:05 -0600 Subject: [PATCH 039/109] +%{_datadir}/{kservices5{,/ServiceMenus},kservicetypes5,solid{,/actions,/devices}} --- kf5.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 516c8c4..4f841e4 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -28,7 +28,9 @@ RPM macros for building KDE Frameworks 5 packages. # See macros.kf5 where the directories are specified mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/ mkdir -p %{buildroot}%{_includedir}/KF5 -mkdir -p %{buildroot}%{_datadir}/{kconf_update,kf5} +mkdir -p %{buildroot}%{_datadir}/{kconf_update,kf5,kservicetypes5} +mkdir -p %{buildroot}%{_datadir}/kservices5/ServiceMenus +mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices} mkdir -p %{buildroot}%{_libexecdir}/kf5 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} @@ -46,12 +48,18 @@ sed -i \ %{_libexecdir}/kf5/ %{_datadir}/kconf_update/ %{_datadir}/kf5/ +%{_datadir}/kservices5/ +%{_datadir}/kservicetypes5/ +%{_datadir}/solid/ %files rpm-macros %{_rpmconfigdir}/macros.d/macros.kf5 %changelog +* Mon Nov 16 2015 Rex Dieter 5.16.0-2 +- +%%{_datadir}/{kservices5{,/ServiceMenus},kservicetypes5,solid{,/actions,/devices}} + * Sun Nov 08 2015 Daniel Vrátil - 5.16.0-1 - KDE Frameworks 5.16.0 From 649046a0fc8189407faa30af2f861d5c5b37ce53 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 18 Nov 2015 12:40:48 -0600 Subject: [PATCH 040/109] kf5-filesystem: add versioned qt5-qtbase dep --- kf5.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 4f841e4..be43e58 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -14,6 +14,7 @@ Filesystem and RPM macros for KDE Frameworks 5 Summary: Filesystem for KDE Frameworks 5 # noarch -> arch transition Obsoletes: kf5-filesystem < 5.10.0-2 +%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} %description filesystem Filesystem for KDE Frameworks 5. @@ -57,6 +58,9 @@ sed -i \ %changelog +* Wed Nov 18 2015 Rex Dieter - 5.16.0-3 +- kf5-filesystem: add versioned qt5-qtbase dep + * Mon Nov 16 2015 Rex Dieter 5.16.0-2 - +%%{_datadir}/{kservices5{,/ServiceMenus},kservicetypes5,solid{,/actions,/devices}} From 55bfcae441a51d924b39928d87589da464c57415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 8 Dec 2015 23:31:47 +0100 Subject: [PATCH 041/109] KDE Frameworks 5.17.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index be43e58..c08f35c 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.16.0 -Release: 3%{?dist} +Version: 5.17.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -58,6 +58,9 @@ sed -i \ %changelog +* Tue Dec 08 2015 Daniel Vrátil - 5.17.0-1 +- KDE Frameworks 5.17.0 + * Wed Nov 18 2015 Rex Dieter - 5.16.0-3 - kf5-filesystem: add versioned qt5-qtbase dep From f463780f78d37666f4f3925ca54896d85a2f56c6 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sun, 13 Dec 2015 20:32:24 +0100 Subject: [PATCH 042/109] - Prepare to epel 7 --- kf5.spec | 5 ++++- macros.kf5 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index c08f35c..b932892 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -58,6 +58,9 @@ sed -i \ %changelog +* Sun Dec 13 2015 Helio Chissini de Castro - 5.17.0-2 +- Prepare to cmake3 epel + * Tue Dec 08 2015 Daniel Vrátil - 5.17.0-1 - KDE Frameworks 5.17.0 diff --git a/macros.kf5 b/macros.kf5 index 8d9270f..0ad17ba 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -21,7 +21,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ - %{__cmake} \\\ + %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_TESTING:BOOL=FALSE \\\ -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\ From e73ed7d64c8b9eefcdc9ca368df3a32a2c9db328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Sun, 3 Jan 2016 17:56:14 +0100 Subject: [PATCH 043/109] KDE Frameworks 5.18.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index b932892..e2b8848 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.17.0 -Release: 2%{?dist} +Version: 5.18.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -58,6 +58,9 @@ sed -i \ %changelog +* Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 +- KDE Frameworks 5.18.0 + * Sun Dec 13 2015 Helio Chissini de Castro - 5.17.0-2 - Prepare to cmake3 epel From 1a992363c870bf545c58fb1b260369b8bafd4a7b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Jan 2016 11:46:54 -0600 Subject: [PATCH 044/109] +kconf_update_bin, omit dup'd %changelog entry --- kf5.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kf5.spec b/kf5.spec index e2b8848..d113e69 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -28,6 +28,7 @@ RPM macros for building KDE Frameworks 5 packages. %install # See macros.kf5 where the directories are specified mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/ +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/kconf_update_bin mkdir -p %{buildroot}%{_includedir}/KF5 mkdir -p %{buildroot}%{_datadir}/{kconf_update,kf5,kservicetypes5} mkdir -p %{buildroot}%{_datadir}/kservices5/ServiceMenus @@ -45,6 +46,8 @@ sed -i \ %{_sysconfdir}/xdg/plasma-workspace/ %{_prefix}/lib/qt5/plugins/kf5/ %{_prefix}/%{_lib}/qt5/plugins/kf5/ +%{_prefix}/lib/kconf_update_bin/ +%{_prefix}/%{_lib}/kconf_update_bin/ %{_includedir}/KF5/ %{_libexecdir}/kf5/ %{_datadir}/kconf_update/ @@ -58,6 +61,9 @@ sed -i \ %changelog +* Fri Jan 08 2016 Rex Dieter 5.18.0-2 +- +kconf_update_bin, omit dup'd %%changelog entry + * Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 - KDE Frameworks 5.18.0 @@ -124,9 +130,6 @@ sed -i \ * Fri Jan 30 2015 Rex Dieter 5.6.0-2 - own /etc/xdg/plasma-workspace/, /etc/xdg/plasma-workspace/{env,shutdown} -* Tue Jan 08 2015 Daniel Vrátil - 5.6.0-1 -- KDE Frameworks 5.6.0 - * Tue Jan 06 2015 Daniel Vrátil - 5.6.0-1 - KDE Frameworks 5.6.0 From c9bc6d05f02c7ea79ea180280310cd580b35ed47 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 14 Jan 2016 06:45:50 -0600 Subject: [PATCH 045/109] rpm-macros: add cmake deps as needed --- kf5.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index d113e69..6fcd86e 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -20,6 +20,12 @@ Filesystem for KDE Frameworks 5. %package rpm-macros Summary: RPM macros for KDE Frameworks 5 +%if 0%{?fedora} +Requires: cmake >= 3 +%endif +%if 0%{?rhel} +Requires: cmake3 +%endif BuildArch: noarch %description rpm-macros RPM macros for building KDE Frameworks 5 packages. @@ -61,6 +67,9 @@ sed -i \ %changelog +* Thu Jan 14 2016 Rex Dieter 5.18.0-3 +- -rpm-macros: add cmake deps as needed + * Fri Jan 08 2016 Rex Dieter 5.18.0-2 - +kconf_update_bin, omit dup'd %%changelog entry From a4188d294ecc45ec12966d1618f449253d91a873 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 14 Jan 2016 07:45:05 -0600 Subject: [PATCH 046/109] rpm-macros: Requires: qt5-qtbase-devel needed for macros.qt5 --- kf5.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 6fcd86e..e15f0c1 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.18.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -26,6 +26,8 @@ Requires: cmake >= 3 %if 0%{?rhel} Requires: cmake3 %endif +# qt5-rpm-macros +Requires: qt5-qtbase-devel BuildArch: noarch %description rpm-macros RPM macros for building KDE Frameworks 5 packages. @@ -67,6 +69,9 @@ sed -i \ %changelog +* Thu Jan 14 2016 Rex Dieter 5.18.0-4 +- -rpm-macros: Requires: qt5-qtbase-devel + * Thu Jan 14 2016 Rex Dieter 5.18.0-3 - -rpm-macros: add cmake deps as needed From ea7f90915f03e434f1062c4991626ed9613d83b7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 01:57:19 +0000 Subject: [PATCH 047/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index e15f0c1..87e1ea5 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.18.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.18.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 14 2016 Rex Dieter 5.18.0-4 - -rpm-macros: Requires: qt5-qtbase-devel From 0e73ff5674af210ae142ed83a7ea0dc5f6b825f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Thu, 11 Feb 2016 15:17:40 +0100 Subject: [PATCH 048/109] KDE Frameworks 5.19.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 87e1ea5..bd634cb 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.18.0 -Release: 5%{?dist} +Version: 5.19.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %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-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 95f4db6302bcf524b6cb06cd0084647c672b9877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Mon, 14 Mar 2016 11:41:47 +0100 Subject: [PATCH 049/109] KDE Frameworks 5.20.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index bd634cb..3f30feb 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.19.0 +Version: 5.20.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -69,6 +69,9 @@ sed -i \ %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 From 9f4a2556ee74f7f317b35a303e458d4c54b49b39 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Apr 2016 08:18:10 -0500 Subject: [PATCH 050/109] KDE Frameworks 5.21.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 3f30feb..d0fe8d0 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.20.0 +Version: 5.21.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -69,6 +69,9 @@ sed -i \ %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 From f59847a212111659e2207952ea4cb43429d2c4b2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 9 May 2016 12:52:31 -0500 Subject: [PATCH 051/109] 5.22.0-1 - KDE Frameworks 5.22.0 - rpm-macros: update to use -DKDE_INSTALL_... style definitions --- kf5.spec | 6 +++++- macros.kf5 | 31 ++++++++++++------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/kf5.spec b/kf5.spec index d0fe8d0..b3ac5d8 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.21.0 +Version: 5.22.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -69,6 +69,10 @@ sed -i \ %changelog +* Mon May 09 2016 Rex Dieter - 5.22.0-1 +- KDE Frameworks 5.22.0 +- rpm-macros: update to use -DKDE_INSTALL_... style definitions + * Mon Apr 04 2016 Rex Dieter - 5.21.0-1 - KDE Frameworks 5.21.0 diff --git a/macros.kf5 b/macros.kf5 index 0ad17ba..7241d3b 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -25,28 +25,21 @@ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_TESTING:BOOL=FALSE \\\ -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\ + -DCMAKE_INSTALL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\ - -DCMAKE_INSTALL_FULL_BINDIR=%{_kf5_bindir} \\\ - -DCMAKE_INSTALL_FULL_LIBEXECDIR=%{_libexecdir} \\\ - -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\ -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ - -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{_lib} \\\ -%if "%{?_lib}" == "lib64" \ - %{?_cmake_lib_suffix64} \\\ -%endif \ - -DKCFG_INSTALL_DIR:PATH=%{_datadir}/config.kcfg \\\ - -DPLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ - -DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ - -DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\ - -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\ - -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_libdir}/qt5/mkspecs/modules \\\ - -DSYSCONF_INSTALL_DIR:PATH=%{_kf5_sysconfdir} \\\ - -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir} \\\ - -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\ - -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} \\\ + -DECM_MKSPECS_INSTALL_DIR:PATH=%{_qt5_archdatadir}/qt5/mkspecs/modules \\\ + -DKDE_INSTALL_BINDIR:PATH=%{_kf5_bindir} \\\ + -DKDE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \\\ + -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\ + -DKDE_INSTALL_LIBDIR:PATH=%{_kf5_libdir} \\\ + -DKDE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\ + -DKDE_INSTALL_PLUGINDIR:PATH=%{_qt5_plugindir} \\\ + -DKDE_INSTALL_QMLDIR:PATH=%{_kf5_qmldir} \\\ + -DKDE_INSTALL_QTPLUGINDIR:PATH=%{_qt5_plugindir} \\\ + -DKDE_INSTALL_QTQUICKIMPORTSDIR:PATH=%{_qt5_importdir} \\\ + -DKDE_INSTALL_SYSCONFDIR:PATH=%{_kf5_sysconfdir} \\\ -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON # %%find_lang_kf5 From 3bdc937e4f070b397aeb0a9934adc52f5f7c7609 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 14 May 2016 09:01:10 -0500 Subject: [PATCH 052/109] rpm-macros: fix KDE_INSTALL_INCLUDEDIR --- kf5.spec | 5 ++++- macros.kf5 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index b3ac5d8..d66f888 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Sat May 14 2016 Rex Dieter - 5.22.0-2 +- rpm-macros: fix KDE_INSTALL_INCLUDEDIR + * Mon May 09 2016 Rex Dieter - 5.22.0-1 - KDE Frameworks 5.22.0 - rpm-macros: update to use -DKDE_INSTALL_... style definitions diff --git a/macros.kf5 b/macros.kf5 index 7241d3b..57d6555 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -31,7 +31,7 @@ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DECM_MKSPECS_INSTALL_DIR:PATH=%{_qt5_archdatadir}/qt5/mkspecs/modules \\\ -DKDE_INSTALL_BINDIR:PATH=%{_kf5_bindir} \\\ - -DKDE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \\\ + -DKDE_INSTALL_INCLUDEDIR:PATH=%{_kf5_includedir} \\\ -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\ -DKDE_INSTALL_LIBDIR:PATH=%{_kf5_libdir} \\\ -DKDE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\ From 1aeb559ce5ab3e8f836c99b5acaef18010b32889 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 14 May 2016 09:12:21 -0500 Subject: [PATCH 053/109] rpm-macros: fix archdatadir, MKSPECS_INSTALL_DIR --- kf5.spec | 5 ++++- macros.kf5 | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index d66f888..82c7cc1 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.22.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Sat May 14 2016 Rex Dieter - 5.22.0-3 +- rpm-macros: fix archdatadir, MKSPECS_INSTALL_DIR + * Sat May 14 2016 Rex Dieter - 5.22.0-2 - rpm-macros: fix KDE_INSTALL_INCLUDEDIR diff --git a/macros.kf5 b/macros.kf5 index 57d6555..86a4a8b 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -1,5 +1,5 @@ %_kf5_prefix %_prefix -%_kf5_archdatadir %_libdir/qt5 +%_kf5_archdatadir %_qt5_archdatadir %_kf5_bindir %_kf5_prefix/bin %_kf5_datadir %_datadir %_kf5_docdir /usr/share/doc @@ -29,7 +29,7 @@ -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\ -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ - -DECM_MKSPECS_INSTALL_DIR:PATH=%{_qt5_archdatadir}/qt5/mkspecs/modules \\\ + -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_archdatadir}/mkspecs/modules \\\ -DKDE_INSTALL_BINDIR:PATH=%{_kf5_bindir} \\\ -DKDE_INSTALL_INCLUDEDIR:PATH=%{_kf5_includedir} \\\ -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\ From bcb23ce57b09615a226151fd6fb67e837bda49f9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 15 May 2016 13:44:23 -0500 Subject: [PATCH 054/109] rpm-macros: revert KDE_INSTALL_INCLUDEDIR change, set CMAKE_INSTALL_INCLUDEDIR_KF5 instead --- kf5.spec | 5 ++++- macros.kf5 | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 82c7cc1..0bc8edc 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.22.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Sun May 15 2016 Rex Dieter - 5.22.0-4 +- rpm-macros: revert KDE_INSTALL_INCLUDEDIR change, set CMAKE_INSTALL_INCLUDEDIR_KF5 instead + * Sat May 14 2016 Rex Dieter - 5.22.0-3 - rpm-macros: fix archdatadir, MKSPECS_INSTALL_DIR diff --git a/macros.kf5 b/macros.kf5 index 86a4a8b..0bd4828 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -25,13 +25,14 @@ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_TESTING:BOOL=FALSE \\\ -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\ - -DCMAKE_INSTALL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\ + -DCMAKE_INSTALL_INCLUDEDIR_KF5:PATH=%{_kf5_includedir} \\\ + -DCMAKE_INSTALL_LIBEXECDIR_KF5:PATH=%{_kf5_libexecdir} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\ -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_archdatadir}/mkspecs/modules \\\ -DKDE_INSTALL_BINDIR:PATH=%{_kf5_bindir} \\\ - -DKDE_INSTALL_INCLUDEDIR:PATH=%{_kf5_includedir} \\\ + -DKDE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \\\ -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\ -DKDE_INSTALL_LIBDIR:PATH=%{_kf5_libdir} \\\ -DKDE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\ From ac9e5ceae49b68176b6415ff6b259e7757bb0ee2 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 2 Jun 2016 15:41:05 +0200 Subject: [PATCH 055/109] Drop -O3 from default release build type flags --- kf5.spec | 5 ++++- macros.kf5 | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 0bc8edc..f7e4a86 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.22.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Thu Jun 02 2016 Than Ngo - 5.22.0-5 +- drop -O3 from default release build type flags + * Sun May 15 2016 Rex Dieter - 5.22.0-4 - rpm-macros: revert KDE_INSTALL_INCLUDEDIR change, set CMAKE_INSTALL_INCLUDEDIR_KF5 instead diff --git a/macros.kf5 b/macros.kf5 index 0bd4828..c3ff0a9 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -22,6 +22,9 @@ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\ + -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_TESTING:BOOL=FALSE \\\ -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\ From 7a2786af64a9a057a795ba654bb9aa0ec99cb443 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Jun 2016 08:17:52 -0500 Subject: [PATCH 056/109] 5.23.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index f7e4a86..c6f3f96 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.22.0 -Release: 5%{?dist} +Version: 5.23.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Tue Jun 07 2016 Rex Dieter - 5.23.0-1 +- 5.23.0 + * Thu Jun 02 2016 Than Ngo - 5.22.0-5 - drop -O3 from default release build type flags From 8e66e9c8c5613d4f5dc23f8b1921f4fd0b932284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Wed, 6 Jul 2016 17:54:08 +0200 Subject: [PATCH 057/109] KDE Frameworks 5.24.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index c6f3f96..a82f59b 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.23.0 +Version: 5.24.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -69,6 +69,9 @@ sed -i \ %changelog +* Wed Jul 06 2016 Daniel Vrátil - 5.24.0-1 +- KDE Frameworks 5.24.0 + * Tue Jun 07 2016 Rex Dieter - 5.23.0-1 - 5.23.0 From 66fd46de4ba01571efbe40585056867b13b51530 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 7 Aug 2016 19:46:04 -0500 Subject: [PATCH 058/109] 5.25.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index a82f59b..7b03582 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.24.0 +Version: 5.25.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -69,6 +69,9 @@ sed -i \ %changelog +* Sun Aug 07 2016 Rex Dieter - 5.25.0-1 +- 5.25.0 + * Wed Jul 06 2016 Daniel Vrátil - 5.24.0-1 - KDE Frameworks 5.24.0 From 46299d39c4c8382a66e5ffc421bbbd7234a6ed6f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Aug 2016 08:32:36 -0500 Subject: [PATCH 059/109] introduce %_kf5_metainfodir => %_kf5_datadir/appdata, set KDE_INSTALL_METAINFODIR accordingly --- kf5.spec | 5 ++++- macros.kf5 | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 7b03582..dedb6a6 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.25.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Mon Aug 08 2016 Rex Dieter - 5.25.0-2 +- introduce %%_kf5_metainfodir => %%_kf5_datadir/appdata, set KDE_INSTALL_METAINFODIR accordingly + * Sun Aug 07 2016 Rex Dieter - 5.25.0-1 - 5.25.0 diff --git a/macros.kf5 b/macros.kf5 index c3ff0a9..c7da9a0 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -6,6 +6,7 @@ %_kf5_includedir %_includedir/KF5 %_kf5_libdir %_libdir %_kf5_libexecdir %_libexecdir/kf5 +%_kf5_metainfodir %_kf5_datadir/appdata %_kf5_qtplugindir %_qt5_plugindir %_kf5_plugindir %_qt5_plugindir/kf5 %_kf5_sysconfdir %_sysconfdir @@ -39,6 +40,7 @@ -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\ -DKDE_INSTALL_LIBDIR:PATH=%{_kf5_libdir} \\\ -DKDE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\ + -DKDE_INSTALL_METAINFODIR:PATH=%{_kf5_metainfodir} \\\ -DKDE_INSTALL_PLUGINDIR:PATH=%{_qt5_plugindir} \\\ -DKDE_INSTALL_QMLDIR:PATH=%{_kf5_qmldir} \\\ -DKDE_INSTALL_QTPLUGINDIR:PATH=%{_qt5_plugindir} \\\ From f4675b9e7fff24625bdfef71d5788b97ecf07696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Thu, 8 Sep 2016 10:26:01 +0200 Subject: [PATCH 060/109] KDE Frameworks 5.26.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index dedb6a6..0954b8a 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.25.0 -Release: 2%{?dist} +Version: 5.26.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Wed Sep 07 2016 Daniel Vrátil - 5.26.0-1 +- KDE Frameworks 5.26.0 + * Mon Aug 08 2016 Rex Dieter - 5.25.0-2 - introduce %%_kf5_metainfodir => %%_kf5_datadir/appdata, set KDE_INSTALL_METAINFODIR accordingly From 1ce46959e475211f7b5cd3f4fc7183023aa927d9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Oct 2016 13:33:05 -0500 Subject: [PATCH 061/109] 5.27.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 0954b8a..bfe8227 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.26.0 +Version: 5.27.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -69,6 +69,9 @@ sed -i \ %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 From ab565d439ee0e4b7dac31b11405e6179c4dd0a1f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Dec 2016 08:05:35 -0600 Subject: [PATCH 062/109] 5.29.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index bfe8227..d3d7475 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.27.0 -Release: 1%{?dist} +Version: 5.29.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %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 defa72bb49d31f5d67449231077473bf0215b3f8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 6 Feb 2017 10:38:54 -0600 Subject: [PATCH 063/109] 5.31.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index d3d7475..39e920f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.29.0 -Release: 1%{?dist} +Version: 5.31.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %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 From c5b9c5250fa761a2b53d7e196425096010c5da13 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 4 Mar 2017 14:17:20 -0600 Subject: [PATCH 064/109] 5.32.0 --- kf5.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 39e920f..ce6afac 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.31.0 +Version: 5.32.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -22,12 +22,14 @@ Filesystem for KDE Frameworks 5. Summary: RPM macros for KDE Frameworks 5 %if 0%{?fedora} Requires: cmake >= 3 +Requires: qt5-rpm-macros %endif %if 0%{?rhel} Requires: cmake3 -%endif -# qt5-rpm-macros Requires: qt5-qtbase-devel +%endif +# misc build environment dependencies +Requires: gcc-c++ BuildArch: noarch %description rpm-macros RPM macros for building KDE Frameworks 5 packages. @@ -69,6 +71,12 @@ sed -i \ %changelog +* Sat Mar 04 2017 Rex Dieter - 5.32.0-1 +- 5.32.0 + +* Thu Mar 02 2017 Rex Dieter - 5.31.0-2 +- kf5-rpm-macros: Requires: qt5-rpm-macros gcc-c++ + * Mon Feb 06 2017 Rex Dieter - 5.31.0-1 - 5.31.0 From a770bf4075bc83a584088d60cbc798da8a66086c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Apr 2017 07:05:05 -0500 Subject: [PATCH 065/109] 5.33.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index ce6afac..5fa0058 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.32.0 +Version: 5.33.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -71,6 +71,9 @@ sed -i \ %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 From 3ad15e9cc4a3585d9542b0dbca2201a1e9a6c27a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 May 2017 09:27:15 -0500 Subject: [PATCH 066/109] 5.34.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 5fa0058..4ba7775 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.33.0 +Version: 5.34.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -71,6 +71,9 @@ sed -i \ %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 From 69817405e80da930eaa91ba3c23f5dc563410260 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 4 Jun 2017 07:13:24 -0500 Subject: [PATCH 067/109] 5.35.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 4ba7775..efabfc3 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.34.0 -Release: 1%{?dist} +Version: 5.35.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -71,6 +71,9 @@ sed -i \ %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 From 864dbb40108cc93297909324895b8fc31db23d2e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Jul 2017 09:09:43 -0500 Subject: [PATCH 068/109] 5.36.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index efabfc3..528e403 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.35.0 -Release: 1%{?dist} +Version: 5.36.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -71,6 +71,9 @@ sed -i \ %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 From 1c097a8e945ca598b8c6bf2cec293ff6d686d501 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 15:10:06 +0000 Subject: [PATCH 069/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 528e403..adbbd8f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.36.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -71,6 +71,9 @@ sed -i \ %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 7e63ef929a564ca4987204eccbf23ca56f337839 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 00:21:29 +0000 Subject: [PATCH 070/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index adbbd8f..45c90da 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.36.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -71,6 +71,9 @@ sed -i \ %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 bc9ab80d1d88b026fb50e1b3977657a77a22e97b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 25 Aug 2017 08:55:06 -0500 Subject: [PATCH 071/109] 5.37 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 45c90da..8869252 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.36.0 -Release: 3%{?dist} +Version: 5.37.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -71,6 +71,9 @@ sed -i \ %changelog +* Fri Aug 25 2017 Rex Dieter - 5.37.0-1 +- 5.37 + * Thu Aug 03 2017 Fedora Release Engineering - 5.36.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 91abe9d9a6278867f156cf13c92ee5ac1f14c33e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 11 Sep 2017 14:45:33 -0500 Subject: [PATCH 072/109] 5.38 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 8869252..e85afe7 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.37.0 +Version: 5.38.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -71,6 +71,9 @@ sed -i \ %changelog +* Mon Sep 11 2017 Rex Dieter - 5.38.0-1 +- 5.38 + * Fri Aug 25 2017 Rex Dieter - 5.37.0-1 - 5.37 From 9d9b4dea5f6094978b7541b16a455f0ece71b32d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Oct 2017 07:00:37 -0500 Subject: [PATCH 073/109] 5.39.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index e85afe7..535ad58 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.38.0 -Release: 1%{?dist} +Version: 5.39.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -71,6 +71,9 @@ sed -i \ %changelog +* Sun Oct 08 2017 Rex Dieter - 5.39.0-1 +- 5.39.0 + * Mon Sep 11 2017 Rex Dieter - 5.38.0-1 - 5.38 From bc1775867b1cd1f99b24316553198ba49549feb0 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 9 Nov 2017 07:49:02 -0800 Subject: [PATCH 074/109] Cleanup conditionals --- kf5.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kf5.spec b/kf5.spec index 535ad58..88a32b5 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.39.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -20,11 +20,10 @@ Filesystem for KDE Frameworks 5. %package rpm-macros Summary: RPM macros for KDE Frameworks 5 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 Requires: cmake >= 3 Requires: qt5-rpm-macros -%endif -%if 0%{?rhel} +%else Requires: cmake3 Requires: qt5-qtbase-devel %endif @@ -71,6 +70,9 @@ sed -i \ %changelog +* Thu Nov 09 2017 Troy Dawson - 5.39.0-2 +- Cleanup conditionals + * Sun Oct 08 2017 Rex Dieter - 5.39.0-1 - 5.39.0 From 988fe73aaf92f2f2fc5334af2f714ddf19c84d9c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 10 Nov 2017 08:12:59 -0600 Subject: [PATCH 075/109] 5.40.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 88a32b5..b1598bf 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.39.0 -Release: 2%{?dist} +Version: 5.40.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -70,6 +70,9 @@ sed -i \ %changelog +* Fri Nov 10 2017 Rex Dieter - 5.40.0-1 +- 5.40.0 + * Thu Nov 09 2017 Troy Dawson - 5.39.0-2 - Cleanup conditionals From 6b304b4ef3add828fa671633b8cb38f91d319556 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Nov 2017 15:39:28 -0600 Subject: [PATCH 076/109] %_kf5_metainfodir => %_kf5_datadir/metainfo open to considerng making this conditional for only newer releases (with older ones sticking with appdata) --- kf5.spec | 5 ++++- macros.kf5 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index b1598bf..7646730 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.40.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -70,6 +70,9 @@ sed -i \ %changelog +* Wed Nov 15 2017 Rex Dieter - 5.40.0-2 +- %%_kf5_metainfodir => %%_kf5_datadir/metainfo + * Fri Nov 10 2017 Rex Dieter - 5.40.0-1 - 5.40.0 diff --git a/macros.kf5 b/macros.kf5 index c7da9a0..ebcdda4 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -6,7 +6,7 @@ %_kf5_includedir %_includedir/KF5 %_kf5_libdir %_libdir %_kf5_libexecdir %_libexecdir/kf5 -%_kf5_metainfodir %_kf5_datadir/appdata +%_kf5_metainfodir %_kf5_datadir/metainfo %_kf5_qtplugindir %_qt5_plugindir %_kf5_plugindir %_qt5_plugindir/kf5 %_kf5_sysconfdir %_sysconfdir From 796aa96bcdb33615793db978515fb0be477aab6e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Dec 2017 10:18:38 -0600 Subject: [PATCH 077/109] 5.41.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 7646730..bac7b46 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.40.0 -Release: 2%{?dist} +Version: 5.41.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -70,6 +70,9 @@ sed -i \ %changelog +* Mon Dec 04 2017 Rex Dieter - 5.41.0-1 +- 5.41.0 + * Wed Nov 15 2017 Rex Dieter - 5.40.0-2 - %%_kf5_metainfodir => %%_kf5_datadir/metainfo From 8a1196371df990a8d43be24464b726f2c3fc38db Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 3 Jan 2018 14:09:18 -0600 Subject: [PATCH 078/109] own /usr/share/config.kcfg (shared with kde-filesystem) --- kf5.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index bac7b46..3005a98 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.41.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -39,7 +39,7 @@ RPM macros for building KDE Frameworks 5 packages. mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/ mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/kconf_update_bin mkdir -p %{buildroot}%{_includedir}/KF5 -mkdir -p %{buildroot}%{_datadir}/{kconf_update,kf5,kservicetypes5} +mkdir -p %{buildroot}%{_datadir}/{config.kcfg,kconf_update,kf5,kservicetypes5} mkdir -p %{buildroot}%{_datadir}/kservices5/ServiceMenus mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices} mkdir -p %{buildroot}%{_libexecdir}/kf5 @@ -59,6 +59,7 @@ sed -i \ %{_prefix}/%{_lib}/kconf_update_bin/ %{_includedir}/KF5/ %{_libexecdir}/kf5/ +%{_datadir}/config.kcfg/ %{_datadir}/kconf_update/ %{_datadir}/kf5/ %{_datadir}/kservices5/ @@ -70,6 +71,9 @@ sed -i \ %changelog +* Wed Jan 03 2018 Rex Dieter 5.41.0-2 +- own /usr/share/config.kcfg (shared with kde-filesystem) + * Mon Dec 04 2017 Rex Dieter - 5.41.0-1 - 5.41.0 From 9a3c93ea4317bd2d3320c092d0d9415f238423f1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Jan 2018 08:22:21 -0600 Subject: [PATCH 079/109] 5.42.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 3005a98..c71706f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.41.0 -Release: 2%{?dist} +Version: 5.42.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -71,6 +71,9 @@ sed -i \ %changelog +* Mon Jan 08 2018 Rex Dieter - 5.42.0-1 +- 5.42.0 + * Wed Jan 03 2018 Rex Dieter 5.41.0-2 - own /usr/share/config.kcfg (shared with kde-filesystem) From a0eb57b1e7781aa558da4ce5b49f81b500336842 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Jan 2018 12:25:58 -0600 Subject: [PATCH 080/109] kf5-rpm-macros: fix %_kf5_metainfodir macro for < f28 (#1532930) --- kf5.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index c71706f..77def08 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.42.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -50,6 +50,13 @@ sed -i \ -e "s|@@KF5_VERSION@@|%{version}|g" \ %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 +# stick to legacy appdata dir for < f28, use metainfo for new releases only +%if 0%{?fedora} && %{fedora} < 28 +sed -i \ + -e 's|^%%_kf5_metainfodir.*|%%_kf5_metainfodir %%_kf5_datadir/appdata|g' \ + %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 +%endif + %files filesystem %{_sysconfdir}/xdg/plasma-workspace/ @@ -71,6 +78,9 @@ sed -i \ %changelog +* Wed Jan 10 2018 Rex Dieter - 5.42.0-2 +- kf5-rpm-macros: fix %%_kf5_metainfodir macro for < f28 (#1532930) + * Mon Jan 08 2018 Rex Dieter - 5.42.0-1 - 5.42.0 From 3e4b1ecbec808c0b208e84a4e7130f248054e410 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 16 Jan 2018 13:25:11 +0100 Subject: [PATCH 081/109] fix cmake3 macro name --- kf5.spec | 5 ++++- macros.kf5 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 77def08..3c996cb 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.42.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -78,6 +78,9 @@ sed -i \ %changelog +* Tue Jan 16 2018 Karsten Hopp - 5.42.0-3 +- fix cmake3 macro name + * Wed Jan 10 2018 Rex Dieter - 5.42.0-2 - kf5-rpm-macros: fix %%_kf5_metainfodir macro for < f28 (#1532930) diff --git a/macros.kf5 b/macros.kf5 index ebcdda4..2881d78 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -22,7 +22,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ - %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\ + %{?fedora:%{__cmake}}%{?rhel:%{cmake3}} \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ From 4129492d111a5d1fbfa51d6ba2f5fbb2c312bf3f Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 16 Jan 2018 13:41:55 +0100 Subject: [PATCH 082/109] fix conditional --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 3c996cb..48d6b3b 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.42.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -51,7 +51,7 @@ sed -i \ %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 # stick to legacy appdata dir for < f28, use metainfo for new releases only -%if 0%{?fedora} && %{fedora} < 28 +%if 0%{?fedora} && 0%{?fedora} < 28 sed -i \ -e 's|^%%_kf5_metainfodir.*|%%_kf5_metainfodir %%_kf5_datadir/appdata|g' \ %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 @@ -78,6 +78,9 @@ sed -i \ %changelog +* Tue Jan 16 2018 Karsten Hopp - 5.42.0-4 +- fix conditional + * Tue Jan 16 2018 Karsten Hopp - 5.42.0-3 - fix cmake3 macro name From ceb8fd237e65f3b4659596818f3fab8fdba0eda2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 22 Jan 2018 07:02:43 -0600 Subject: [PATCH 083/109] own /usr/share/kpackage/{genericqml,kcms} (#1536892) --- kf5.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kf5.spec b/kf5.spec index 48d6b3b..acbe3bf 100644 --- a/kf5.spec +++ b/kf5.spec @@ -40,6 +40,7 @@ mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/ mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/kconf_update_bin mkdir -p %{buildroot}%{_includedir}/KF5 mkdir -p %{buildroot}%{_datadir}/{config.kcfg,kconf_update,kf5,kservicetypes5} +mkdir -p %{buildroot}%{_datadir}/kpackage/{genericqml,kcms} mkdir -p %{buildroot}%{_datadir}/kservices5/ServiceMenus mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices} mkdir -p %{buildroot}%{_libexecdir}/kf5 @@ -69,6 +70,7 @@ sed -i \ %{_datadir}/config.kcfg/ %{_datadir}/kconf_update/ %{_datadir}/kf5/ +%{_datadir}/kpackage/ %{_datadir}/kservices5/ %{_datadir}/kservicetypes5/ %{_datadir}/solid/ @@ -78,6 +80,9 @@ sed -i \ %changelog +* Mon Jan 22 2018 Rex Dieter - 5.42.0-4 +- own /usr/share/kpackage/{genericqml,kcms} (#1536892) + * Tue Jan 16 2018 Karsten Hopp - 5.42.0-4 - fix conditional From 7eac0e13dc862ad2c87d00690d1ff1b23d3ac1c6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 22 Jan 2018 07:06:03 -0600 Subject: [PATCH 084/109] Release++ --- kf5.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index acbe3bf..0fd0d6f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.42.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,7 +80,7 @@ sed -i \ %changelog -* Mon Jan 22 2018 Rex Dieter - 5.42.0-4 +* Mon Jan 22 2018 Rex Dieter - 5.42.0-5 - own /usr/share/kpackage/{genericqml,kcms} (#1536892) * Tue Jan 16 2018 Karsten Hopp - 5.42.0-4 From 36def636db1e508b652b2aa38674ec3041db57b0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 7 Feb 2018 09:26:41 -0600 Subject: [PATCH 085/109] 5.43.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 0fd0d6f..9c5abda 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.42.0 -Release: 5%{?dist} +Version: 5.43.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,6 +80,9 @@ sed -i \ %changelog +* Wed Feb 07 2018 Rex Dieter - 5.43.0-1 +- 5.43.0 + * Mon Jan 22 2018 Rex Dieter - 5.42.0-5 - own /usr/share/kpackage/{genericqml,kcms} (#1536892) From 25e20bd582b8ee600065bcaa1ab7c194c690d28c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 3 Mar 2018 07:52:12 -0600 Subject: [PATCH 086/109] 5.44.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 9c5abda..a66dfbc 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.43.0 +Version: 5.44.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %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 From 5fb844e3bcfeb863e4d08d6c3547c29ea0c63710 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Apr 2018 07:23:10 -0500 Subject: [PATCH 087/109] 5.45.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index a66dfbc..b01773a 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.44.0 +Version: 5.45.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %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 From 38b171c35c68f31e237d511f44bf27cab6782d6e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 5 May 2018 16:03:08 -0500 Subject: [PATCH 088/109] 5.460 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index b01773a..5349249 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.45.0 +Version: 5.460 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %changelog +* Sat May 05 2018 Rex Dieter - 5.460-1 +- 5.460 + * Sun Apr 08 2018 Rex Dieter - 5.45.0-1 - 5.45.0 From 4a6066d14c8d6764d19bb35b3b3ee459e8e11301 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 5 May 2018 16:04:17 -0500 Subject: [PATCH 089/109] 5.460 => 5.46.0 --- kf5.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 5349249..85cc9f3 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.460 +Version: 5.46.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,8 +80,8 @@ sed -i \ %changelog -* Sat May 05 2018 Rex Dieter - 5.460-1 -- 5.460 +* 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 From a2a576446ed7104dc5c17ab66715ba311ed73bd5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 2 Jun 2018 15:36:19 -0500 Subject: [PATCH 090/109] 5.47.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 85cc9f3..dff4852 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.46.0 +Version: 5.47.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %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 From b7fdc1799b06ea02ba06dd0ca94c97b3604ba3ad Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Jul 2018 18:39:53 -0500 Subject: [PATCH 091/109] 5.48.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index dff4852..16d3d5e 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.47.0 +Version: 5.48.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %changelog +* Sun Jul 08 2018 Rex Dieter - 5.48.0-1 +- 5.48.0 + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0 From 05981c814847c9d879ca7d303ee9c9e7f9bb1781 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 9 Jul 2018 20:37:47 -0500 Subject: [PATCH 092/109] fix %kf5_qmldir definition (since %_qt5_prefix change in rawhide) --- kf5.spec | 5 ++++- macros.kf5 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 16d3d5e..1b022ac 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.48.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,6 +80,9 @@ sed -i \ %changelog +* Mon Jul 09 2018 Rex Dieter - 5.48.0-2 +- fix %%kf5_qmldir definition (since %%_qt5_prefix change in rawhide) + * Sun Jul 08 2018 Rex Dieter - 5.48.0-1 - 5.48.0 diff --git a/macros.kf5 b/macros.kf5 index 2881d78..c699e1b 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -12,7 +12,7 @@ %_kf5_sysconfdir %_sysconfdir %_kf5_mandir %_kf5_datadir/man %_kf5_buildtype release -%_kf5_qmldir %_qt5_prefix/qml +%_kf5_qmldir %_kf5_archdatadir/qml %_kf5_version @@KF5_VERSION@@ %cmake_kf5 \ From a0e6400b3f4bd4f2460df6165b63eeb3d14bf577 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:01:06 +0000 Subject: [PATCH 093/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 1b022ac..c31ce0a 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.48.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,6 +80,9 @@ sed -i \ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 5.48.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Rex Dieter - 5.48.0-2 - fix %%kf5_qmldir definition (since %%_qt5_prefix change in rawhide) From 2aebc63c80f6a69d3fe3cdf324b2de85cee74741 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Aug 2018 10:04:58 -0500 Subject: [PATCH 094/109] 5.49.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index c31ce0a..df58760 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.48.0 -Release: 3%{?dist} +Version: 5.49.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,6 +80,9 @@ sed -i \ %changelog +* Tue Aug 07 2018 Rex Dieter - 5.49.0-1 +- 5.49.0 + * Fri Jul 13 2018 Fedora Release Engineering - 5.48.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 280292745d31aa5507fcdf998fff49a5eb61e7dd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Aug 2018 12:37:08 -0500 Subject: [PATCH 095/109] use %__cmake3 on rhel --- macros.kf5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.kf5 b/macros.kf5 index c699e1b..065491d 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -22,7 +22,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ - %{?fedora:%{__cmake}}%{?rhel:%{cmake3}} \\\ + %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ From bbcb2b3e9420eb5ccff489d4ff53ae46002b0357 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 4 Sep 2018 13:30:13 -0500 Subject: [PATCH 096/109] 5.50 .spec cosmetics macros.kf5: use %_metainfodir explicitly --- kf5.spec | 31 ++++++++++++++++++------------- macros.kf5 | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/kf5.spec b/kf5.spec index df58760..212b24f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,25 +1,25 @@ -Name: kf5 -Version: 5.49.0 +Name: kf5 +Version: 5.50.0 Release: 1%{?dist} -Summary: Filesystem and RPM macros for KDE Frameworks 5 -License: BSD -URL: http://www.kde.org +Summary: Filesystem and RPM macros for KDE Frameworks 5 +License: BSD +URL: http://www.kde.org -Source0: macros.kf5 +Source0: macros.kf5 %description Filesystem and RPM macros for KDE Frameworks 5 -%package filesystem -Summary: Filesystem for KDE Frameworks 5 +%package filesystem +Summary: Filesystem for KDE Frameworks 5 # noarch -> arch transition -Obsoletes: kf5-filesystem < 5.10.0-2 +Obsoletes: kf5-filesystem < 5.10.0-2 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} -%description filesystem +%description filesystem Filesystem for KDE Frameworks 5. -%package rpm-macros -Summary: RPM macros for KDE Frameworks 5 +%package rpm-macros +Summary: RPM macros for KDE Frameworks 5 %if 0%{?fedora} || 0%{?rhel} > 7 Requires: cmake >= 3 Requires: qt5-rpm-macros @@ -30,7 +30,7 @@ Requires: qt5-qtbase-devel # misc build environment dependencies Requires: gcc-c++ BuildArch: noarch -%description rpm-macros +%description rpm-macros RPM macros for building KDE Frameworks 5 packages. @@ -80,6 +80,11 @@ sed -i \ %changelog +* Tue Sep 04 2018 Rex Dieter - 5.50.0-1 +- 5.50 +- .spec cosmetics +- macros.kf5: use %%_metainfodir explicitly + * Tue Aug 07 2018 Rex Dieter - 5.49.0-1 - 5.49.0 diff --git a/macros.kf5 b/macros.kf5 index 065491d..b4975ff 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -6,7 +6,7 @@ %_kf5_includedir %_includedir/KF5 %_kf5_libdir %_libdir %_kf5_libexecdir %_libexecdir/kf5 -%_kf5_metainfodir %_kf5_datadir/metainfo +%_kf5_metainfodir %_metainfodir %_kf5_qtplugindir %_qt5_plugindir %_kf5_plugindir %_qt5_plugindir/kf5 %_kf5_sysconfdir %_sysconfdir From b701cdf196982a193b5d1d35f233f537b7379e9e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 12 Sep 2018 10:42:07 -0500 Subject: [PATCH 097/109] drop f27 appdata/metainfo hack no longer needed, using %%_metainfodir directly now --- kf5.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kf5.spec b/kf5.spec index 212b24f..e5e6843 100644 --- a/kf5.spec +++ b/kf5.spec @@ -51,13 +51,6 @@ sed -i \ -e "s|@@KF5_VERSION@@|%{version}|g" \ %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 -# stick to legacy appdata dir for < f28, use metainfo for new releases only -%if 0%{?fedora} && 0%{?fedora} < 28 -sed -i \ - -e 's|^%%_kf5_metainfodir.*|%%_kf5_metainfodir %%_kf5_datadir/appdata|g' \ - %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 -%endif - %files filesystem %{_sysconfdir}/xdg/plasma-workspace/ From 4d370bbe87c49dd2afc8980ba9d3641594b91dee Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Oct 2018 15:35:24 -0500 Subject: [PATCH 098/109] 5.51.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index e5e6843..47a89f9 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.50.0 +Version: 5.51.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -73,6 +73,9 @@ sed -i \ %changelog +* Wed Oct 10 2018 Rex Dieter - 5.51.0-1 +- 5.51.0 + * Tue Sep 04 2018 Rex Dieter - 5.50.0-1 - 5.50 - .spec cosmetics From f27038fd78e0ebd1c026bd458f2be6dbf51a1284 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 4 Nov 2018 12:23:25 -0600 Subject: [PATCH 099/109] 5.52.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 47a89f9..6488d38 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.51.0 +Version: 5.52.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -73,6 +73,9 @@ sed -i \ %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 From b0b8df66a02f7942d6fe271955de469636aedd9d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 9 Dec 2018 08:10:03 -0600 Subject: [PATCH 100/109] 5.53.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 6488d38..4f62ec0 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.52.0 +Version: 5.53.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -73,6 +73,9 @@ sed -i \ %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 From 6a853d8fcada73340344c18c97fe9a6e3aba816d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 8 Jan 2019 16:54:27 -0600 Subject: [PATCH 101/109] 18.12.1 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 4f62ec0..e2bed76 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.53.0 +Version: 18.12.1 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -73,6 +73,9 @@ sed -i \ %changelog +* Tue Jan 08 2019 Rex Dieter - 18.12.1-1 +- 18.12.1 + * Sun Dec 09 2018 Rex Dieter - 5.53.0-1 - 5.53.0 From ba5bb5673c904ede5ea94e855d520835558fec8e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 9 Jan 2019 08:08:07 -0600 Subject: [PATCH 102/109] 5.54.0 fix botched upgrade script still configured for kde-apps-18.12.1 --- kf5.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index e2bed76..349c6fb 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 18.12.1 +Version: 5.54.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -73,8 +73,8 @@ sed -i \ %changelog -* Tue Jan 08 2019 Rex Dieter - 18.12.1-1 -- 18.12.1 +* Wed Jan 09 2019 Rex Dieter - 5.54.0-1 +- 5.54.0 * Sun Dec 09 2018 Rex Dieter - 5.53.0-1 - 5.53.0 From 5cb43ca5b21304e86a909c9bebaf2d696907febe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 05:22:15 +0000 Subject: [PATCH 103/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 349c6fb..a64906c 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.54.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -73,6 +73,9 @@ sed -i \ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 5.54.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 09 2019 Rex Dieter - 5.54.0-1 - 5.54.0 From 5db56dea8352edee0ba6bf1b628f8e6b374da9f6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Feb 2019 10:49:05 -0600 Subject: [PATCH 104/109] 5.55.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index a64906c..287353e 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.54.0 -Release: 2%{?dist} +Version: 5.55.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -73,6 +73,9 @@ sed -i \ %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 From 03e0f5aa244d26cbb10a51d164be6bec657bcd81 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 5 Mar 2019 08:49:48 -0600 Subject: [PATCH 105/109] 5.56.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 287353e..987626f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.55.0 +Version: 5.56.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -73,6 +73,9 @@ sed -i \ %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 From 74eb9382c41a0c5a3f22306cf14286e22ede60ae Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Apr 2019 13:29:27 -0500 Subject: [PATCH 106/109] 5.57.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 987626f..18e42cf 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.56.0 +Version: 5.57.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -73,6 +73,9 @@ sed -i \ %changelog +* Mon Apr 08 2019 Rex Dieter - 5.57.0-1 +- 5.57.0 + * Tue Mar 05 2019 Rex Dieter - 5.56.0-1 - 5.56.0 From 100908b7146ea00d3ccdee432f434cdd2812498c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 May 2019 13:42:17 -0500 Subject: [PATCH 107/109] 5.58.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 18e42cf..5ef2782 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.57.0 +Version: 5.58.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -73,6 +73,9 @@ sed -i \ %changelog +* Tue May 07 2019 Rex Dieter - 5.58.0-1 +- 5.58.0 + * Mon Apr 08 2019 Rex Dieter - 5.57.0-1 - 5.57.0 From e23a830251ca092244979f0b9c0de0d2518f85fc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 23 May 2019 10:37:29 -0500 Subject: [PATCH 108/109] -rpm-macros: enforce min qt5 dep (5.10) --- kf5.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 5ef2782..0820663 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.58.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -22,10 +22,10 @@ Filesystem for KDE Frameworks 5. Summary: RPM macros for KDE Frameworks 5 %if 0%{?fedora} || 0%{?rhel} > 7 Requires: cmake >= 3 -Requires: qt5-rpm-macros +Requires: qt5-rpm-macros >= 5.10 %else Requires: cmake3 -Requires: qt5-qtbase-devel +Requires: qt5-qtbase-devel >= 5.10 %endif # misc build environment dependencies Requires: gcc-c++ @@ -73,6 +73,9 @@ sed -i \ %changelog +* Thu May 23 2019 Rex Dieter - 5.58.0-2 +- -rpm-macros: enforce min qt5 dep (5.10) + * Tue May 07 2019 Rex Dieter - 5.58.0-1 - 5.58.0 From 4444da643190a539045460b869fe89f404e6c953 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 6 Jun 2019 12:26:41 -0500 Subject: [PATCH 109/109] 5.59.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 0820663..6d6cd6e 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.58.0 -Release: 2%{?dist} +Version: 5.59.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -73,6 +73,9 @@ sed -i \ %changelog +* Thu Jun 06 2019 Rex Dieter - 5.59.0-1 +- 5.59.0 + * Thu May 23 2019 Rex Dieter - 5.58.0-2 - -rpm-macros: enforce min qt5 dep (5.10)