Hello community,

here is the log from the commit of package kf5-filesystem for openSUSE:Factory 
checked in at 2020-04-05 20:49:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf5-filesystem (Old)
 and      /work/SRC/openSUSE:Factory/.kf5-filesystem.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kf5-filesystem"

Sun Apr  5 20:49:17 2020 rev:26 rq:791011 version:20170414

Changes:
--------
--- /work/SRC/openSUSE:Factory/kf5-filesystem/kf5-filesystem.changes    
2019-07-26 12:24:25.262458720 +0200
+++ /work/SRC/openSUSE:Factory/.kf5-filesystem.new.3248/kf5-filesystem.changes  
2020-04-05 20:49:20.368941198 +0200
@@ -1,0 +2,7 @@
+Tue Mar 31 15:03:40 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Use %license
+- Drop condition for Leap <= 42.1
+- Add localekf5.attr and localekf5.prov (boo#1167317)
+
+-------------------------------------------------------------------

New:
----
  localekf5.attr
  localekf5.prov

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kf5-filesystem.spec ++++++
--- /var/tmp/diff_new_pack.XeLeYb/_old  2020-04-05 20:49:21.088941887 +0200
+++ /var/tmp/diff_new_pack.XeLeYb/_new  2020-04-05 20:49:21.088941887 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kf5-filesystem
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 %endif
 
 Name:           kf5-filesystem
-Url:            http://www.kde.org
+URL:            http://www.kde.org
 Version:        20170414
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -37,6 +37,10 @@
 %endif
 Source0:        macros.kf5
 Source1:        COPYING
+# 
https://github.com/openSUSE/rpm-config-SUSE/blob/54f9f71bacdfb944d88f722d71a4d35651f7cc8a/fileattrs/locale.attr
+# edited for /usr/share/locale/kf5/
+Source2:        localekf5.attr
+Source3:        
https://raw.githubusercontent.com/openSUSE/rpm-config-SUSE/54f9f71bacdfb944d88f722d71a4d35651f7cc8a/scripts/locale.prov#/localekf5.prov
 
 %description
 This package provides macros which are utilized with extra-cmake-modules' 
KDEInstallDirs.
@@ -58,6 +62,7 @@
 %define _kf5_qmldir     %{_kf5_libdir}/qt5/qml
 %define _kf5_cmakedir   %{_kf5_libdir}/cmake
 %define _kf5_mkspecsdir %{_kf5_libdir}/qt5/mkspecs/modules
+%define _kf5_appstreamdir    %{_kf5_sharedir}/metainfo
 %define _kf5_dbusinterfacesdir %{_kf5_sharedir}/dbus-1/interfaces
 %define _kf5_dbuspolicydir   %{_kf5_sharedir}/dbus-1/system.d
 %define _kf5_configdir       %{_kf5_sysconfdir}/xdg
@@ -76,18 +81,19 @@
 %define _kf5_debugdir        %{_kf5_sharedir}/qlogging-categories5
 
 %prep
+%autosetup -T -c
+cp %{SOURCE1} .
 
 %build
-%if 0%{?suse_version} <= 1320 && 0%{?sle_version} <= 120100
-    sed -i 's|%%{_kf5_sharedir}/metainfo|%%{_kf5_sharedir}/appdata|g' 
$RPM_SOURCE_DIR/macros.kf5
-%define _kf5_appstreamdir    %{_kf5_sharedir}/appdata
-%else
-%define _kf5_appstreamdir    %{_kf5_sharedir}/metainfo
-%endif
 
 %install
 install -D -m644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
-install -D -m644 %{SOURCE1} %{buildroot}%{_docdir}/kf5-filesystem/COPYING
+%if 0%{?suse_version} >= 1550
+# On TW, foo-lang packages use automatic locale(foo:en) provides, but that
+# does not match locale/kf5
+install -D -m644 %{SOURCE2} 
%{buildroot}%{_rpmconfigdir}/fileattrs/localekf5.attr
+install -D -m755 %{SOURCE3} 
%{buildroot}%{_rpmconfigdir}/fileattrs/localekf5.prov
+%endif
 
 mkdir -p %{buildroot}%{_kf5_includedir}
 mkdir -p %{buildroot}%{_kf5_libexecdir}
@@ -146,9 +152,12 @@
 
 %files
 %defattr(-,root,root)
+%license COPYING
 %{_rpmconfigdir}/macros.d/macros.kf5
-%dir %{_docdir}/kf5-filesystem
-%{_docdir}/kf5-filesystem/COPYING
+%if 0%{?suse_version} >= 1550
+%{_rpmconfigdir}/fileattrs/localekf5.attr
+%{_rpmconfigdir}/fileattrs/localekf5.prov
+%endif
 %dir %{_kf5_includedir}
 %dir %{_kf5_plugindir}
 %dir %{_kf5_libdir}/libexec

++++++ localekf5.attr ++++++
%__localekf5_provides   %{_rpmconfigdir}/locale.prov
%__localekf5_path               
^%{_datadir}/locale/kf5/[^/]*/LC_MESSAGES/.*\\.mo$
%__localekf5_provides_opts      %{name}
%__localekf5_namespace  locale
++++++ localekf5.prov ++++++
#!/bin/bash
targetpkg="$1"
if [ "${targetpkg%-lang}" != "$1" ]; then
        targetpkg="${targetpkg%-lang}"
elif [ "${targetpkg%-locale}" != "$1" ]; then
        targetpkg="${targetpkg%-locale}"
else
        # discard input
        cat >/dev/null
        exit 0
fi
while read line; do
        l="${line%%/LC_MESSAGES/*}"
        l="${l##*/}"
        echo "$targetpkg:$l"
done

Reply via email to