From 1e85add7f45b552ca9299e3b3fc7973aff19957e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 1 Oct 2012 17:12:19 +0100 Subject: [PATCH] Split out PackageKit into a sub package. Fixes #699348 --- .gitignore | 52 +------------------------------------- gnome-settings-daemon.spec | 32 ++++++++++++++++++----- 2 files changed, 27 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 58b5696..ec5e73a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,51 +1 @@ -gnome-settings-daemon-2.31.5.1.tar.bz2 -gnome-settings-daemon-2.31.6.tar.bz2 -/gnome-settings-daemon-2.31.91.tar.bz2 -/gnome-settings-daemon-2.90.1.tar.bz2 -/gnome-settings-daemon-2.91.0.tar.bz2 -/gnome-settings-daemon-2.91.2-20101102.tar.bz2 -/gnome-settings-daemon-2.91.2.1.tar.bz2 -/gnome-settings-daemon-2.91.3.tar.bz2 -/gnome-settings-daemon-2.91.4.tar.bz2 -/gnome-settings-daemon-2.91.5.tar.bz2 -/gnome-settings-daemon-2.91.5.1.tar.bz2 -/gnome-settings-daemon-2.91.6.2.tar.bz2 -/gnome-settings-daemon-2.91.7.tar.bz2 -/gnome-settings-daemon-2.91.8.tar.bz2 -/gnome-settings-daemon-2.91.9.tar.bz2 -/gnome-settings-daemon-2.91.90.tar.bz2 -/gnome-settings-daemon-2.91.91.tar.bz2 -/gnome-settings-daemon-2.91.92.tar.bz2 -/gnome-settings-daemon-2.91.93.tar.bz2 -/gnome-settings-daemon-3.0.0.tar.bz2 -/gnome-settings-daemon-3.0.0.1.tar.bz2 -/gnome-settings-daemon-3.0.1.tar.bz2 -/gnome-settings-daemon-3.1.1.tar.bz2 -/gnome-settings-daemon-3.1.2.tar.xz -/gnome-settings-daemon-3.1.3.tar.xz -/gnome-settings-daemon-3.1.4.tar.xz -/gnome-settings-daemon-3.1.91.tar.xz -/gnome-settings-daemon-3.1.92.tar.xz -/gnome-settings-daemon-3.2.0.tar.xz -/gnome-settings-daemon-3.2.1.tar.xz -/gnome-settings-daemon-3.2.2.tar.xz -/gnome-settings-daemon-3.3.2.tar.xz -/gnome-settings-daemon-3.3.3.tar.xz -/gnome-settings-daemon-3.3.3.1.tar.xz -/gnome-settings-daemon-3.3.4.tar.xz -/gnome-settings-daemon-3.3.5.tar.xz -/gnome-settings-daemon-3.3.90.1.tar.xz -/gnome-settings-daemon-3.3.91.tar.xz -/gnome-settings-daemon-3.3.92.tar.xz -/gnome-settings-daemon-3.4.0.tar.xz -/gnome-settings-daemon-3.4.1.tar.xz -/gnome-settings-daemon-3.4.2.tar.xz -/gnome-settings-daemon-3.5.2.tar.xz -/gnome-settings-daemon-3.5.3.tar.xz -/gnome-settings-daemon-3.5.4.tar.xz -/gnome-settings-daemon-3.5.5.tar.xz -/gnome-settings-daemon-3.5.6.tar.xz -/gnome-settings-daemon-3.5.90.tar.xz -/gnome-settings-daemon-3.5.91.tar.xz -/gnome-settings-daemon-3.5.92.tar.xz -/gnome-settings-daemon-3.6.0.tar.xz +/gnome-settings-daemon-*.tar.xz diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 8c583ef..f91d90c 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -60,6 +60,14 @@ Requires: dbus-glib-devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package updates +Summary: updates plugin for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description updates +The %{name}-updates package contains the updates plugin for %{name} + %prep %setup -q %if 0%{?rhel} @@ -98,6 +106,13 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +%postun updates +if [ $1 -eq 0 ]; then + glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi + +%posttrans updates +glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files -f %{name}.lang %doc AUTHORS COPYING NEWS @@ -151,10 +166,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/gnome-settings-daemon-3.0/sound.gnome-settings-plugin %{_libdir}/gnome-settings-daemon-3.0/libsound.so -%{_libdir}/gnome-settings-daemon-3.0/updates.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libupdates.so -%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml - %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml %ifnarch s390 s390x %{?rhel:ppc ppc64} @@ -202,7 +213,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml -%{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml %{_datadir}/dbus-1/services/org.freedesktop.IBus.service %{_datadir}/man/man1/gnome-settings-daemon.1.gz @@ -231,7 +241,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libexecdir}/gsd-test-sound %{_libexecdir}/gsd-test-xsettings + +%files updates +%{_libdir}/gnome-settings-daemon-3.0/updates.gnome-settings-plugin +%{_libdir}/gnome-settings-daemon-3.0/libupdates.so +%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml +%{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml + %changelog +* Fri Sep 28 2012 Peter Robinson - 3.6.0-2 +- Split out PackageKit into a sub package. Fixes #699348 + * Tue Sep 25 2012 Richard Hughes - 3.6.0-1 - Update to 3.6.0