rpms/gnome-media/devel gnome-media.spec,1.174,1.175

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16198

Modified Files:
	gnome-media.spec 
Log Message:
Split off an apps subpackage



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- gnome-media.spec	27 Jul 2009 22:12:49 -0000	1.174
+++ gnome-media.spec	31 Jul 2009 04:45:46 -0000	1.175
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.27.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.27/gnome-media-%{version}.tar.bz2
@@ -24,8 +24,6 @@ Obsoletes:      gnome
 URL:            http://www.gnome.org
 ExcludeArch:    s390 s390x
 
-Requires(post): scrollkeeper >= 0.1.4
-Requires(postun): scrollkeeper >= 0.1.4
 Requires(post): GConf2 >= 2.14
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
@@ -73,6 +71,16 @@ Requires: %{name} = %{version}-%{release
 This package contains the libraries required for using encoding profiles
 in GNOME media applications.
 
+%package apps
+Summary: Some media-related applications for the GNOME desktop
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+
+%description apps
+This package contains an application to record and play sound files
+in various formats, a configuration utility for audio profiles and
+a configuration utility for the gstreamer media framework.
+
 %prep
 %setup -q
 
@@ -139,17 +147,32 @@ for helpdir in $RPM_BUILD_ROOT%{_datadir
   done
 done
 
-%find_lang %{gettext_package} --all-name --with-gnome
+%find_lang %{gettext_package}
+%find_lang gnome-audio-profiles --with-gnome
+%find_lang gnome-sound-recorder --with-gnome
+%find_lang gstreamer-properties --with-gnome
+cat gnome-audio-profiles.lang >> apps.lang
+cat gnome-sound-recorder.lang >> apps.lang
+cat gstreamer-properties.lang >> apps.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+%post apps
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas \
     > /dev/null || :
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %post libs
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -187,6 +210,16 @@ if [ "$1" -gt 1 ]; then
   > /dev/null || :
 fi
 
+%pre apps
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas ] ; then
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas \
+      > /dev/null || :
+  fi
+fi
+
 %preun
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -208,6 +241,16 @@ if [ "$1" -eq 0 ]; then
   fi
 fi
 
+%preun apps
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas ] ; then
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas \
+      > /dev/null || :
+  fi
+fi
+
 %preun libs
 if [ "$1" -eq 0 ]; then
   if [ -f %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas ] ; then
@@ -219,25 +262,28 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-scrollkeeper-update -q || :
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
-%postun libs
-/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%postun apps
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %files
 %defattr(-, root, root)
-
 %doc AUTHORS COPYING NEWS README
-%config %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas
-
+%{_bindir}/gnome-volume-control
+%{_bindir}/gnome-volume-control-applet
 %{_sysconfdir}/xdg/autostart/gnome-volume-control-applet.desktop
-
-%{_datadir}/applications/*
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/applications/gnome-volume-control.desktop
+%{_datadir}/icons/hicolor/*/apps/gnome-volume-control*
 %{_datadir}/gnome-media
-%{_datadir}/gstreamer-properties
-%{_datadir}/gnome-sound-recorder
-%{_bindir}/*
 %{_datadir}/sounds/gnome/
 
 %files libs -f %{gettext_package}.lang
@@ -252,7 +298,24 @@ scrollkeeper-update -q || :
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files apps -f apps.lang
+%defattr(-, root, root)
+%{_bindir}/gnome-sound-recorder
+%{_bindir}/gnome-audio-profiles-properties
+%{_bindir}/gstreamer-properties
+%{_datadir}/gnome-sound-recorder
+%{_datadir}/gstreamer-properties
+%config %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas
+%{_datadir}/applications/gnome-sound-recorder.desktop
+%{_datadir}/applications/gstreamer-properties.desktop
+%{_datadir}/icons/hicolor/*/apps/gnome-sound-recorder*
+%{_datadir}/icons/hicolor/*/apps/gstreamer-properties*
+
+
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-2
+- Split off an apps subpackage
+
 * Mon Jul 27 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-1
 - Update to 2.27.5