rpms/gnome-media/devel gnome-media.spec,1.111,1.112

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29975

Modified Files:
	gnome-media.spec 
Log Message:
* Fri Oct 05 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-2
- Remove gnome-cd (#278321)



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- gnome-media.spec	19 Sep 2007 10:22:40 -0000	1.111
+++ gnome-media.spec	5 Oct 2007 16:24:51 -0000	1.112
@@ -12,7 +12,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.20.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz
@@ -78,7 +78,7 @@
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
-%configure --disable-schemas-install --enable-grecord=no
+%configure --disable-schemas-install --enable-grecord=no --enable-gnomecd=no --enable-cddbslave=no
 make #%{?_smp_mflags}
 
 %install
@@ -98,10 +98,6 @@
 ## only show in GNOME
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-cd.desktop 
-
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-volume-control.desktop
 
@@ -130,27 +126,34 @@
 gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/CDDB-Slave2.schemas \
     %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
-    %{_sysconfdir}/gconf/schemas/gnome-cd.schemas \
     > /dev/null || :
 /sbin/ldconfig
 
 %pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f %{_sysconfdir}/gconf/schemas/gnome-cd.schemas ] ; then
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-cd.schemas \
+      %> /dev/null || :
+  fi
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/CDDB-Slave2.schemas \
     %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
-    %{_sysconfdir}/gconf/schemas/gnome-cd.schemas \
     > /dev/null || :
 fi
 
 %preun
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f %{_sysconfdir}/gconf/schemas/gnome-cd.schemas ] ; then
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-cd.schemas \
+      %> /dev/null || :
+  fi
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/CDDB-Slave2.schemas \
     %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
-    %{_sysconfdir}/gconf/schemas/gnome-cd.schemas \
     > /dev/null || :
 fi
 
@@ -166,7 +169,6 @@
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 
 %{_libexecdir}/*
-%{_datadir}/idl/GNOME_Media_CDDBSlave2.idl
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
@@ -175,7 +177,6 @@
 
 %{_libdir}/*.so.*
 %{_libdir}/libglade/2.0/*.so
-%{_libdir}/bonobo/servers/GNOME_Media_CDDBSlave2.server
 %{_bindir}/*
 
 %files devel
@@ -185,6 +186,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Oct 05 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-2
+- Remove gnome-cd (#278321)
+
 * Wed Sep 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-1
 - Update to 2.20.1
 - Remove obsolete icons patch