Merge branch epel8-next into epel8

Need to come up with something better that works for both
fedora/epel, or just continue to conditionalize things

BSD-3-Clause.txt

@@ -1,11 +0,0 @@
-Copyright (c) <year> <owner>. 
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

kf5.spec

@@ -1,21 +1,17 @@
 Name:    kf5
-Version: 5.115.0
+Version: 5.96.0
 Release: 1%{?dist}
 Summary: Filesystem and RPM macros for KDE Frameworks 5
-License: BSD-3-Clause
+License: BSD
 URL:     http://www.kde.org
 
 Source0: macros.kf5
-Source1: BSD-3-Clause.txt
 
 %description
 Filesystem and RPM macros for KDE Frameworks 5
 
 %package filesystem
 Summary: Filesystem for KDE Frameworks 5
-%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
-Requires: kde-filesystem >= 5
-%endif
 # noarch -> arch transition
 Obsoletes: kf5-filesystem < 5.10.0-2
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -42,27 +38,22 @@ BuildArch: noarch
 %description rpm-macros
 RPM macros for building KDE Frameworks 5 packages.
 
-%prep
-cp %{S:1} LICENSE
 
 %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}/{kf5,kservicetypes5}
+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}/knsrcfiles/
 mkdir -p %{buildroot}%{_datadir}/qlogging-categories5/
+mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices}
 mkdir -p %{buildroot}%{_docdir}/qt5
 mkdir -p %{buildroot}%{_libexecdir}/kf5
-mkdir -p %{buildroot}%{_datadir}/locale/tok
-%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)
-mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/kconf_update_bin
-mkdir -p %{buildroot}%{_datadir}/{config.kcfg,kconf_update}
-mkdir -p %{buildroot}%{_datadir}/kpackage/{genericqml,kcms}
-mkdir -p %{buildroot}%{_datadir}/knsrcfiles/
-mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown}
-%endif
+
 install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
 sed -i \
   -e "s|@@KF5_VERSION@@|%{version}|g" \
@@ -73,111 +64,29 @@ sed -i \
 
 
 %files filesystem
-%license LICENSE
+%{_sysconfdir}/xdg/plasma-workspace/
 %{_prefix}/lib/qt5/plugins/kf5/
 %{_prefix}/%{_lib}/qt5/plugins/kf5/
-%{_includedir}/KF5/
-%{_libexecdir}/kf5/
-%{_datadir}/kf5/
-%{_datadir}/kservices5/
-%{_datadir}/kservicetypes5/
-%{_datadir}/qlogging-categories5/
-%{_docdir}/qt5/
-%{_datadir}/locale/tok
-%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)
-%{_sysconfdir}/xdg/plasma-workspace/
 %{_prefix}/lib/kconf_update_bin/
 %{_prefix}/%{_lib}/kconf_update_bin/
+%{_includedir}/KF5/
+%{_libexecdir}/kf5/
 %{_datadir}/config.kcfg/
 %{_datadir}/kconf_update/
+%{_datadir}/kf5/
 %{_datadir}/kpackage/
+%{_datadir}/kservices5/
+%{_datadir}/kservicetypes5/
 %{_datadir}/knsrcfiles/
+%{_datadir}/qlogging-categories5/
 %{_datadir}/solid/
-%endif
+%{_docdir}/qt5/
 
 %files rpm-macros
 %{_rpmconfigdir}/macros.d/macros.kf5
 
 
 %changelog
-* Sat Feb 10 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.115.0-1
-- 5.115.0
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.113.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.113.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Dec 08 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.113.0-1
-- 5.113.0
-
-* Mon Oct 30 2023 Steve Cossette <farchord@gmail.com> - 5.111.0-2
-- Added SPDX licensing information
-
-* Tue Oct 10 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.111.0-1
-- 5.111.0
-
-* Sun Oct 08 2023 Steve Cossette <farchord@gmail.com> - 5.110.0-3
-- Added kf5-filesystem ownership of /usr/share/locale/tok (Toki Pona).
-
-* Thu Sep 14 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5.110.0-2
-- Use kde-filesystem for unversioned directories in F40+
-
-* Tue Sep 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.110.0-1
-- 5.110.0
-
-* Sat Aug 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.109.0-1
-- 5.109.0
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.108.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Jul 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.108.0-1
-- 5.108.0
-
-* Sat Jun 03 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.107.0-1
-- 5.107.0
-
-* Mon May 15 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.106.0-1
-- 5.106.0
-
-* Sun Apr 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.105.0-1
-- 5.105.0
-
-* Sat Mar 04 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.104.0-1
-- 5.104.0
-
-* Sun Feb 05 2023 Marc Deop <marcdeop@fedoraproject.org> - 5.103.0-1
-- 5.103.0
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.102.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jan 14 2023 Marc Deop <marcdeop@fedoraproject.org> - 5.102.0-1
-- 5.102.0
-
-* Mon Dec 12 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.101.0-1
-- 5.101.0
-
-* Wed Dec 07 2022 Marc Deop marcdeop@fedoraproject.org - 5.100.0-2
-- Add %%stable_kf5, %%majmin_ver_kf5 and helper macros.
-
-* Sun Nov 06 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.100.0-1
-- 5.100.0
-
-* Fri Oct 14 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.99.0-1
-- 5.99.0
-
-* Thu Sep 15 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.98.0-1
-- 5.98.0
-
-* Sun Aug 14 2022 Justin Zobel <justin@1707.io> - 5.97.0-1
-- Update to 5.97.0
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.96.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Sun Jul 03 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.96.0-1
 - 5.96.0
 

macros.kf5

@@ -68,32 +68,3 @@
     (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)
-
-# Start of backwards compatible macros
-# Used mostly in plasma and gear packages:
-# %%maj_ver_kf5
-# %%min_ver_kf5
-# %%bug_ver_kf5
-# %%majmin_ver_kf5
-# %%stable_kf5
-
-%maj_ver_kf5 %(echo %{version} | cut -d. -f1)
-%min_ver_kf5 %(echo %{version} | cut -d. -f2)
-%bug_ver_kf5 %(echo %{version} | cut -d. -f3)
-
-%stable_kf5 %( \
-    if test %bug_ver_kf5 -ge 50 ; then
-        echo "unstable"
-    else
-        echo "stable"
-    fi
-    )
-
-%majmin_ver_kf5 %( \
-    if test %bug_ver_kf5 -ge 50 ; then
-        echo %{maj_ver_kf5}.%{min_ver_kf5}.50
-    else
-        echo %{maj_ver_kf5}.%{min_ver_kf5}
-    fi
-    )
-# End of backwards compatible macros