2.30.1

.cvsignore

@@ -1 +1 @@
-brasero-2.30.0.tar.bz2
+brasero-2.30.1.tar.bz2

brasero.spec

@@ -5,7 +5,7 @@
 %endif
 
 Name:      brasero
-Version:   2.30.0
+Version:   2.30.1
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
@@ -100,11 +100,11 @@ developing brasero applications.
 %build
 %configure \
         --enable-nautilus \
-	--enable-libburnia \
+        --enable-libburnia \
-	--enable-search \
+        --enable-search \
-	--enable-playlist \
+        --enable-playlist \
         --enable-preview \
-	--enable-inotify \
+        --enable-inotify \
         --disable-caches \
         --disable-static \
         --disable-schemas-install
@@ -113,7 +113,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -129,18 +128,13 @@ desktop-file-install --vendor ""                   \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-nautilus.desktop
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post
 umask 022
 update-mime-database %{_datadir}/mime &> /dev/null || :
+%gconf_schema_upgrade brasero
 touch --no-create %{_datadir}/icons/hicolor || :
 update-desktop-database &> /dev/null ||:
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null  || :
-killall -HUP gconfd-2 &>/dev/null || :
 
 
 %post libs -p /sbin/ldconfig
@@ -154,11 +148,6 @@ if [ $1 -eq 0 ]; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null|| :
 fi
 update-desktop-database &> /dev/null ||:
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
-  killall -HUP gconfd-2 &>/dev/null || :
-fi
 
 
 %postun libs -p /sbin/ldconfig
@@ -168,12 +157,11 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null|| :
 
 
+%pre
+%gconf_schema_prepare brasero
+
 %preun
-if [ "$1" -eq 0 ]; then
+%gconf_schema_remove brasero
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-  killall -HUP gconfd-2 &>/dev/null || :
-fi
 
 
 %files -f %{name}.lang
@@ -215,6 +203,10 @@ fi
 
 
 %changelog
+* Tue Apr 27 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.1-1
+- Update to 2.30.1
+- Spec file cleanups
+
 * Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
 - Update to 2.30.0
 

sources

@@ -1 +1 @@
-005f3f4ab586155645d1e8301a42fecc  brasero-2.30.0.tar.bz2
+01c313f02939ee7dd277cafe11a5ef89  brasero-2.30.1.tar.bz2