Hello community, here is the log from the commit of package kf5-filesystem for openSUSE:Factory checked in at 2017-05-08 18:44:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf5-filesystem (Old) and /work/SRC/openSUSE:Factory/.kf5-filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf5-filesystem" Mon May 8 18:44:22 2017 rev:20 rq:488085 version:20170414 Changes: -------- --- /work/SRC/openSUSE:Factory/kf5-filesystem/kf5-filesystem.changes 2017-03-28 15:14:19.276710939 +0200 +++ /work/SRC/openSUSE:Factory/.kf5-filesystem.new/kf5-filesystem.changes 2017-05-08 18:44:27.285482400 +0200 @@ -1,0 +2,18 @@ +Fri Apr 14 16:18:37 UTC 2017 - [email protected] + +- Add %kf5_find_htmldocs macro to generate a filelist of all + translated htmldocs +- Own all directories for supported htmldoc translations +- Same for man + +------------------------------------------------------------------- +Wed Apr 5 19:25:58 UTC 2017 - [email protected] + +- Add %_kf5_py2kf5dir and %_kf5_py3kf5dir, create __init__.py within +- Do not own %_kf5_sharedir (/usr/share) as it's part of filesystem +- Add %_kf5_pysipdir, but do not own it. Used for devel packages of + python bindings +- Add %kf5_python_bindings_package to auto-generate Python binding + subpackage descriptions (for both Python 2 and 3). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf5-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.awllyQ/_old 2017-05-08 18:44:27.961386820 +0200 +++ /var/tmp/diff_new_pack.awllyQ/_new 2017-05-08 18:44:27.965386255 +0200 @@ -16,14 +16,25 @@ # +%if 0%{?suse_version} >= 1330 +# Not set to 0 in the else branch, so it can be overwritten in the prjconf +%global with_python 0 +%endif + Name: kf5-filesystem Url: http://www.kde.org -Version: 20160807 +Version: 20170414 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KF5 Directory Layout License: LGPL-2.1+ Group: System/Fhs +%if 0%{?with_python} +# Yes, we need this just to get the site-packages path... +BuildRequires: python-base +BuildRequires: python-rpm-macros +BuildRequires: python3-base +%endif Source0: macros.kf5 Source1: COPYING @@ -57,6 +68,9 @@ %define _kf5_servicetypesdir %{_kf5_sharedir}/kservicetypes5 %define _kf5_htmldir %{_kf5_sharedir}/doc/HTML %define _kf5_kxmlguidir %{_kf5_sharedir}/kxmlgui5 +%define _kf5_py2kf5dir %{python2_sitelib}/PyKF5 +%define _kf5_py3kf5dir %{python3_sitelib}/PyKF5 +%define _kf5_pysipdir %{_kf5_sharedir}/sip/PyKF5 %prep @@ -95,21 +109,37 @@ mkdir -p %{buildroot}%{_kf5_servicetypesdir} mkdir -p %{buildroot}%{_kf5_configdir} mkdir -p %{buildroot}%{_kf5_sharedir} -mkdir -p %{buildroot}%{_kf5_sharedir}/doc/HTML -mkdir -p %{buildroot}%{_kf5_sharedir}/doc/HTML/en +mkdir -p %{buildroot}%{_kf5_htmldir} mkdir -p %{buildroot}%{_kf5_kxmlguidir} mkdir -p %{buildroot}%{_kf5_appstreamdir} for size in scalable 128x128 64x64 48x48 32x32 22x22 16x16; do -for type in actions apps devices filesystems mimetypes places status; do + for type in actions apps devices filesystems mimetypes places status; do for theme in crystalsvg oxygen hicolor locolor; do mkdir -p %{buildroot}%{_kf5_sharedir}/icons/$theme/$size/$type done -done + done done mkdir -p %{buildroot}%{_kf5_sharedir}/icons/oxygen/scalable/apps/small/{16x16,32x32} mkdir -p %{buildroot}%{_kf5_sharedir}/icons/oxygen/scalable/status/small/{16x16,22x22,48x48} +%if 0%{?with_python} +mkdir -p %{buildroot}%{_kf5_py2kf5dir} +mkdir -p %{buildroot}%{_kf5_py3kf5dir} + +touch %{buildroot}%{_kf5_py2kf5dir}/__init__.py +touch %{buildroot}%{_kf5_py3kf5dir}/__init__.py +%endif + +# Own the htmldocs directories for all supported languages +pushd /usr/share/locale +for i in *; do + mkdir %{buildroot}%{_kf5_htmldir}/$i + # Work around that filesystem does not own all supported subdirs... + mkdir -p %{buildroot}%{_mandir}/$i/man1 +done +popd + %files %defattr(-,root,root) %{_sysconfdir}/rpm/macros.kf5 @@ -136,7 +166,6 @@ %dir %{_kf5_dbusinterfacesdir} %dir %{_kf5_servicesdir} %dir %{_kf5_servicetypesdir} -%dir %{_kf5_sharedir} %dir %{_kf5_configdir} %dir %{_kf5_sharedir}/icons/* %dir %{_kf5_sharedir}/icons/*/* @@ -145,5 +174,12 @@ %dir %{_kf5_sharedir}/doc/HTML/en %dir %{_kf5_kxmlguidir} %dir %{_kf5_appstreamdir} +%if 0%{?with_python} +%{_kf5_py2kf5dir}/ +%{_kf5_py3kf5dir}/ +%endif +%{_kf5_htmldir}/ +%exclude %{_mandir}/man* +%{_mandir}/* %changelog ++++++ macros.kf5 ++++++ --- /var/tmp/diff_new_pack.awllyQ/_old 2017-05-08 18:44:28.053373812 +0200 +++ /var/tmp/diff_new_pack.awllyQ/_new 2017-05-08 18:44:28.053373812 +0200 @@ -31,6 +31,9 @@ %_kf5_htmldir %{_kf5_sharedir}/doc/HTML %_kf5_kxmlguidir %{_kf5_sharedir}/kxmlgui5 %_kf5_appstreamdir %{_kf5_sharedir}/metainfo +%_kf5_py2kf5dir %{python2_sitelib}/PyKF5 +%_kf5_py3kf5dir %{python3_sitelib}/PyKF5 +%_kf5_pysipdir %{_kf5_sharedir}/sip/PyKF5 %_kf5_build_type None @@ -171,3 +174,41 @@ fi \ sort -u $MO_NAME_NEW >> $MO_NAME \ rm -f $MO_NAME_NEW + +%kf5_find_htmldocs() \ +CURDIR=`pwd` \ +pushd %{buildroot}%{_kf5_htmldir} \ +for i in *; do \ + if ! [ -d "/usr/share/locale/${i}" ]; then \ + echo "Removing unsupported translation %{_kf5_htmldir}/${i}" \ + rm -rf "$i" \ + elif [ "$i" != "en" ]; then \ + echo "%doc %lang($i) %{_kf5_htmldir}/${i}" >> $CURDIR/%{name}.lang \ + fi \ +done \ +popd + +%kf5_python_bindings_package \ +%package -n python2-%{name} \ +Summary: Python bindings for %{name} \ +Group: Development/Libraries/KDE \ +Requires: %{name} = %{version} \ +%requires_python_sip_api \ +%description -n python2-%{name} \ +This package contains Python 2 bindings for %{name}. \ + \ +%package -n python3-%{name} \ +Summary: Python 3 bindings for %{name} \ +Group: Development/Libraries/KDE \ +Requires: %{name} = %{version} \ +%requires_python3_sip_api \ +%description -n python3-%{name} \ +This package contains Python 3 bindings for %{name}. \ + \ +%package -n python-%{name}-devel \ +Provides: %{python_module %{name}-devel} = %{version} \ +Requires: %{python_module %{name}-devel} = %{version} \ +Summary: Development files for %{name} Python bindings \ +Group: Development/Libraries/KDE \ +%description -n python-%{name}-devel \ +This package contains the SIP files used to generate the Python bindings for %{name}.
