Hello community, here is the log from the commit of package PackageKit for openSUSE:12.3 checked in at 2013-02-20 09:33:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/PackageKit (Old) and /work/SRC/openSUSE:12.3/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/PackageKit/PackageKit.changes 2013-02-14 21:29:28.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.PackageKit.new/PackageKit.changes 2013-02-20 09:33:53.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Feb 19 08:01:34 UTC 2013 - dims...@opensuse.org + +- Add PackageKit-allow-to-disable-systemd-updates.patch: Disabling + systemd-updates has the effect that HAVE_SYSTEMD is completely + ignored, causing build failures. +- Introduce with_systemd_updates (currently set to 0) to have an + easy way enabling/disabling systemd offline updates. For openSUSE + 12.3 this is not fully ready, and instead of the UI offering it + and having any kind of side effect, we for now decide to disable + it. The defines conditionally does: + + Pass --disable-systemd-updates to configure + + Add a section to the %post scripts, removing remnant files if + left there. + + Adjust the files section. + +------------------------------------------------------------------- New: ---- PackageKit-allow-to-disable-systemd-updates.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.RyDlKR/_old 2013-02-20 09:33:54.000000000 +0100 +++ /var/tmp/diff_new_pack.RyDlKR/_new 2013-02-20 09:33:54.000000000 +0100 @@ -18,6 +18,7 @@ # $ pkcon search file /usr/bin/anjuta %define BUILD_CNF 1 +%define with_offline_updates 0 Name: PackageKit Version: 0.8.7 @@ -56,6 +57,8 @@ Patch13: 0012-zypp-less-debug-in-progress-functions.patch # PATCH-FIX-UPSTREAM 0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch co...@suse.de -- search in ppds Patch14: 0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch +# PATCH-FIX-UPSTREAM PackageKit-allow-to-disable-systemd-updates.patch fdo#61103 dims...@opensuse.org -- Fix build with --disable-systemd-updates +Patch15: PackageKit-allow-to-disable-systemd-updates.patch # To update this package, please git-format-patch the tag of the # tarball version (eg: PACKAGEKIT_0_6_19) vs the distro tag (eg: openSUSE_Factory) # in https://github.com/openSUSE/PackageKit and keep the patches @@ -288,6 +291,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 translation-update-upstream %build @@ -305,6 +309,12 @@ %else --enable-command-not-found \ %endif + --enable-systemd \ +%if %{with_offline_updates} + --enable-systemd-updates \ +%else + --disable-systemd-updates \ +%endif %{nil} make %{?_smp_mflags} V=1 @@ -325,20 +335,35 @@ %find_lang %{name} %{?no_lang_C} %fdupes $RPM_BUILD_ROOT +%if %{with_offline_updates} %pre %service_add_pre packagekit-offline-update.service +%endif %post %{fillup_only -n packagekit-background} %mime_database_post +%if %{with_offline_updates} %service_add_post packagekit-offline-update.service +%else + if [ -L system-update ]; then + rm system-update + fi + if [ -f var/lib/PackageKit/prepared-update ]; then + rm var/lib/PackageKit/prepared-update + fi +%endif +%if %{with_offline_updates} %preun %service_del_preun packagekit-offline-update.service +%endif %postun %mime_database_postun +%if %{with_offline_updates} %service_del_postun packagekit-offline-update.service +%endif %post gstreamer-plugin update-alternatives --install %{_libexecdir}/gst-install-plugins-helper gst-install-plugins-helper %{_libexecdir}/pk-gstreamer-install 10 @@ -403,9 +428,6 @@ %{_libdir}/packagekit-plugins/libpk_plugin-systemd-updates.so %{_libdir}/packagekit-plugins/libpk_plugin-update-package-cache.so %{_libexecdir}/packagekitd -%{_libexecdir}/pk-clear-offline-update -%{_libexecdir}/pk-offline-update -%{_libexecdir}/pk-trigger-offline-update %{_libexecdir}/pm-utils/sleep.d/95packagekit %if %BUILD_CNF %{_libexecdir}/pk-command-not-found @@ -421,7 +443,12 @@ %{_datadir}/dbus-1/system-services/* %doc %{_mandir}/man?/*.* %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db +%if %{with_offline_updates} +%{_libexecdir}/pk-clear-offline-update +%{_libexecdir}/pk-offline-update +%{_libexecdir}/pk-trigger-offline-update %{_unitdir}/packagekit-offline-update.service +%endif %files backend-zypp %defattr(-,root,root) ++++++ PackageKit-allow-to-disable-systemd-updates.patch ++++++ Index: PackageKit-0.8.7/configure.ac =================================================================== --- PackageKit-0.8.7.orig/configure.ac +++ PackageKit-0.8.7/configure.ac @@ -460,8 +460,8 @@ if test x$build_systemd_updates = xyes; [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) - AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) fi +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) # backends AC_ARG_ENABLE(alpm, AS_HELP_STRING([--enable-alpm],[use the ALPM backend]),enable_alpm=$enableval,enable_alpm=no) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
