Hello community, here is the log from the commit of package kf5-filesystem for openSUSE:Factory checked in at 2016-08-29 15:23:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf5-filesystem (Old) and /work/SRC/openSUSE:Factory/.kf5-filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf5-filesystem" Changes: -------- --- /work/SRC/openSUSE:Factory/kf5-filesystem/kf5-filesystem.changes 2016-04-30 23:28:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kf5-filesystem.new/kf5-filesystem.changes 2016-08-29 15:23:29.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Aug 24 09:32:33 UTC 2016 - [email protected] + +- Own %_kf5_appstreamdir + +------------------------------------------------------------------- +Wed Aug 17 15:54:47 UTC 2016 - [email protected] + +- Use metainfo for %_kf5_appstreamdir on Leap >= 42.2 + +------------------------------------------------------------------- +Sun Aug 7 21:50:36 UTC 2016 - [email protected] + +- Use appdata dir for %_kf5_appstreamdir on older oS releases + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf5-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.o6FAjn/_old 2016-08-29 15:23:32.000000000 +0200 +++ /var/tmp/diff_new_pack.o6FAjn/_new 2016-08-29 15:23:32.000000000 +0200 @@ -18,7 +18,7 @@ Name: kf5-filesystem Url: http://www.kde.org -Version: 20160420 +Version: 20160807 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KF5 Directory Layout @@ -30,14 +30,6 @@ %description This package provides macros which are utilized with extra-cmake-modules' KDEInstallDirs. -%prep - -%build - -%install -install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm/macros.kf5 -install -D -m644 %{SOURCE1} %{buildroot}%{_docdir}/kf5-filesystem/COPYING - %define _kf5_prefix %{_prefix} %define _kf5_bindir %{_kf5_prefix}/bin %define _kf5_sharedir %{_datadir} @@ -66,6 +58,20 @@ %define _kf5_htmldir %{_kf5_sharedir}/doc/HTML %define _kf5_kxmlguidir %{_kf5_sharedir}/kxmlgui5 +%prep + +%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}%{_sysconfdir}/rpm/macros.kf5 +install -D -m644 %{SOURCE1} %{buildroot}%{_docdir}/kf5-filesystem/COPYING + mkdir -p %{buildroot}%{_kf5_includedir} mkdir -p %{buildroot}%{_kf5_libexecdir} mkdir -p %{buildroot}%{_kf5_libdir}/qt5 @@ -92,6 +98,7 @@ mkdir -p %{buildroot}%{_kf5_sharedir}/doc/HTML mkdir -p %{buildroot}%{_kf5_sharedir}/doc/HTML/en 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 @@ -137,5 +144,6 @@ %dir %{_kf5_sharedir}/doc/HTML %dir %{_kf5_sharedir}/doc/HTML/en %dir %{_kf5_kxmlguidir} +%dir %{_kf5_appstreamdir} %changelog ++++++ macros.kf5 ++++++ --- /var/tmp/diff_new_pack.o6FAjn/_old 2016-08-29 15:23:32.000000000 +0200 +++ /var/tmp/diff_new_pack.o6FAjn/_new 2016-08-29 15:23:32.000000000 +0200 @@ -30,7 +30,7 @@ %_kf5_servicetypesdir %{_kf5_sharedir}/kservicetypes5 %_kf5_htmldir %{_kf5_sharedir}/doc/HTML %_kf5_kxmlguidir %{_kf5_sharedir}/kxmlgui5 -%_kf5_appstreamdir %{_kf5_sharedir}/appdata +%_kf5_appstreamdir %{_kf5_sharedir}/metainfo %_kf5_build_type None @@ -58,6 +58,7 @@ -DKDE_INSTALL_QMLDIR=%{_lib}/qt5/qml \\\ -DKDE_INSTALL_QTQUICKIMPORTSDIR=%{_lib}/qt5/imports \\\ -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \\\ + -DKDE_INSTALL_METAINFODIR=%{_kf5_appstreamdir} \\\ -DBUILD_TESTING=OFF \\\ $bdir %* \ %{nil}
