rpms/nautilus-cd-burner/devel .cvsignore, 1.51, 1.52 nautilus-cd-burner.spec, 1.96, 1.97 sources, 1.51, 1.52

[William Jon McCann (mccann)]

Author: mccann

Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18467

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
- Update to 2.21.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	18 Sep 2007 03:21:36 -0000	1.51
+++ .cvsignore	21 Jan 2008 18:34:23 -0000	1.52
@@ -1 +1 @@
-nautilus-cd-burner-2.20.0.tar.bz2
+nautilus-cd-burner-2.21.5.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- nautilus-cd-burner.spec	18 Jan 2008 05:47:53 -0000	1.96
+++ nautilus-cd-burner.spec	21 Jan 2008 18:34:23 -0000	1.97
@@ -1,5 +1,4 @@
-%define gnome_vfs_version 2.1.3.1
-%define glib_version 2.10.0
+%define glib_version 2.15.0
 %define gtk_version 2.5.4
 %define libglade_version 2.0.0
 %define libgnome_version 2.14.0
@@ -12,12 +11,9 @@
 
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.20.0
-Release: 5%{?dist}
-Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.20/%{name}-%{version}.tar.bz2
-Patch0: extensionsdir.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=510321
-Patch1: x-content.patch
+Version: 2.21.5
+Release: 1%{?dist}
+Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.21/%{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -35,7 +31,6 @@
 Requires(pre): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
 
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs_version}
 BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: glib2-devel >= %{glib_version}
 BuildRequires: gtk2-devel >= %{gtk_version}
@@ -68,8 +63,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .extensionsdir
-%patch1 -p1 -b .x-content
 
 %build
 %configure --enable-hal --enable-gnome-mount
@@ -88,8 +81,9 @@
 %find_lang %name
 
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libmapping.la
 rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
+# 2.21.5 still has this file
+rm $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/mapping-modules.conf
 
 %post
 /sbin/ldconfig
@@ -130,12 +124,9 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/gnome-vfs-2.0/modules/mapping-modules.conf
-%{_libdir}/gnome-vfs-2.0/modules/*.so
 %{_libdir}/nautilus/extensions-2.0/*.so*
 %{_libdir}/lib*.so.*
 %{_bindir}/nautilus-cd-burner
-%{_libexecdir}/mapping-daemon
 %{_datadir}/nautilus-cd-burner
 %{_datadir}/applications/nautilus-cd-burner.desktop
 %{_datadir}/applications/nautilus-cd-burner-open-iso.desktop
@@ -149,6 +140,9 @@
 
 
 %changelog
+* Mon Jan 21 2008 Jon McCann <jmccann at redhat.com> - 2.21.5-1
+- Update to 2.21.5
+
 * Fri Jan 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
 - Also call update-desktop-database
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	18 Sep 2007 03:21:36 -0000	1.51
+++ sources	21 Jan 2008 18:34:23 -0000	1.52
@@ -1 +1 @@
-a7ddb02c33be107f6c9c1874b7703e9e  nautilus-cd-burner-2.20.0.tar.bz2
+27372c6d832b4ff94046d809994e8d11  nautilus-cd-burner-2.21.5.tar.bz2