Hello community, here is the log from the commit of package kwalletmanager for openSUSE:Factory checked in at 2016-02-22 10:19:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwalletmanager (Old) and /work/SRC/openSUSE:Factory/.kwalletmanager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwalletmanager" Changes: -------- --- /work/SRC/openSUSE:Factory/kwalletmanager/kwalletmanager.changes 2015-07-14 17:38:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwalletmanager.new/kwalletmanager.changes 2016-02-22 10:19:16.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 15 10:31:13 UTC 2016 - [email protected] + +- do not install icons on Leap and Tumbleweed (they conflict with + kwalletmanager5) and require kwalletmanager5 instead (boo#954371) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwalletmanager.spec ++++++ --- /var/tmp/diff_new_pack.OrBHer/_old 2016-02-22 10:19:17.000000000 +0100 +++ /var/tmp/diff_new_pack.OrBHer/_new 2016-02-22 10:19:17.000000000 +0100 @@ -27,6 +27,9 @@ Patch1: desktop-files.diff BuildRequires: libkde4-devel BuildRequires: xz +%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} +Requires: kwalletmanager5 +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -45,7 +48,9 @@ cd build %make_install %suse_update_desktop_file kwalletmanager Applet - +%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} +rm -r %{buildroot}/%_kde4_iconsdir +%endif %kde_post_install %post -p /sbin/ldconfig @@ -61,7 +66,9 @@ %_kde4_applicationsdir/kwalletmanager*.desktop %_kde4_htmldir/en/kwallet/ %_kde4_servicesdir/*.desktop +%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse} %_kde4_iconsdir/hicolor/*/apps/%{name}*.png +%endif %config %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkwallet.conf %{_kde4_modulesdir}/libexec/kcm_kwallet_helper %{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmkwallet.service
