Hello community, here is the log from the commit of package apper for openSUSE:13.1 checked in at 2013-10-18 11:31:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/apper (Old) and /work/SRC/openSUSE:13.1/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apper" Changes: -------- --- /work/SRC/openSUSE:13.1/apper/apper.changes 2013-09-23 10:47:12.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.apper.new/apper.changes 2013-10-19 16:48:16.000000000 +0200 @@ -1,0 +2,19 @@ +Thu Oct 17 13:47:08 UTC 2013 - [email protected] + +- add back provides for org.freedesktop.PackageKit.service + +------------------------------------------------------------------- +Thu Oct 17 11:24:44 UTC 2013 - [email protected] + +- remove conflict with + otherproviders(org.freedesktop.PackageKit.service) and rename the + DBus service file since it affects parallel installation with + GNOME/Xfce (bnc#846342) + +------------------------------------------------------------------- +Thu Aug 15 19:24:34 UTC 2013 - [email protected] + +- fix URL +- minor spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.JxCbCx/_old 2013-10-19 16:48:16.000000000 +0200 +++ /var/tmp/diff_new_pack.JxCbCx/_new 2013-10-19 16:48:16.000000000 +0200 @@ -29,7 +29,7 @@ Version: 0.8.0 Release: 0 #http://websvn.kde.org/trunk/playground/sysadmin/kpackagekit/ -# http://kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.7z +#http://kde-apps.org/CONTENT/content-files/84745-kpackagekit-%%{version}.7z Source0: %{name}-%{version}.tar.bz2 Source1: 10-opensuse-apper.js Patch0: 0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch @@ -61,30 +61,29 @@ # setting proxy requires polkit permissions - for very little gain Patch103: apper-no-user-proxy.diff Patch104: apper-0.8.0-extra-defines.patch -Url: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745 +Url: http://kde-apps.org/content/show.php/Apper?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PackageKit-Qt-devel >= 0.8.8 BuildRequires: kdebase4-workspace-devel BuildRequires: libkde4-devel BuildRequires: libxml2-tools +Recommends: %{name}-lang = %{version} Provides: org.freedesktop.PackageKit.service -Conflicts: otherproviders(org.freedesktop.PackageKit.service) Requires: PackageKit >= 0.8.8 # last used in 11.3 Provides: kupdateapplet = 0.9.18 Obsoletes: kupdateapplet <= 0.9.17 # last used in 11.0 -Provides: kde4-opensuse-updater < 0.8 +Provides: kde4-opensuse-updater = 0.8 Obsoletes: kde4-opensuse-updater < 0.8 +# last used in 11.3 Obsoletes: kpackagekit < %{version} Provides: kpackagekit = %{version} %if !%{split_plasmoid} Obsoletes: apper-plasmoid < %{version} Provides: apper-plasmoid = %{version} %endif -Obsoletes: kupjk -Recommends: %{name}-lang %kde4_runtime_requires %description @@ -145,6 +144,10 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/10-opensuse-apper.js %endif +# hack around gnome-packagekit conflict (bnc#846342) +mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ + %{buildroot}%{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service + %kde_post_install %find_lang %{name} %{name}.lang %find_lang plasma_package_updater %{name}.lang @@ -163,21 +166,21 @@ %doc COPYING TODO %_kde4_libexecdir/apper-pk-session %_kde4_appsdir/apperd/ -%config %{_kde4_sysconfdir}/ld.so.conf.d/apper.conf -%_kde4_modulesdir/*.so %_kde4_appsdir/apper/ %_kde4_bindir/apper %dir %_kde4_libdir/apper -%_kde4_libdir/apper/libapper.so %_kde4_applicationsdir/apper*.desktop %_kde4_servicesdir/kcm_apper.desktop %_kde4_servicesdir/kded/apperd.desktop +%{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service %if !%{split_plasmoid} %_kde4_appsdir/plasma/ %_kde4_servicesdir/plasma-applet-updater.desktop %endif -/usr/share/dbus-1/services/org.freedesktop.PackageKit.service -%{_mandir}/ +%doc %{_kde4_mandir}/man1/* +%_kde4_libdir/%{name}/libapper.so +%_kde4_modulesdir/*.so +%config %{_kde4_sysconfdir}/ld.so.conf.d/apper.conf %if %{split_plasmoid} %files plasmoid -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
