--- a/ChangeLog Sun Aug 10 07:33:16 2008 +0000
+++ b/ChangeLog Mon Aug 11 06:00:59 2008 +0000
@@ -1,3 +1,9 @@
+2008-08-11 Jerry Tan <[email protected]>
+
+ * base-specs/nautilus-cd-burner.spec
+ * patches/nautilus-cd-burner-04-remove-temp-file.diff
+ remove upstream patch since not needed
+
2008-08-08 Matt Keenan <[email protected]>
* patches/gnome-menus-03-preferences.diff : Add back creation of
--- a/base-specs/nautilus-cd-burner.spec Sun Aug 10 07:33:16 2008 +0000
+++ b/base-specs/nautilus-cd-burner.spec Mon Aug 11 06:00:59 2008 +0000
@@ -25,8 +25,6 @@
Patch2: nautilus-cd-burner-02-non-raw-device.diff
#owner:jerrytan date:2008-05-16 type:bug bugzilla:524071 bugster:6671875
Patch3: nautilus-cd-burner-03-eject.diff
-#owner:jerrytan date:2008-03-18 type:bug bugzilla:504392 bugster:6571738
-Patch4: nautilus-cd-burner-04-remove-temp-file.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -59,7 +57,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
for po in po/*.po; do
dos2unix -ascii $po $po
--- a/patches/nautilus-cd-burner-04-remove-temp-file.diff Sun Aug 10 07:33:16 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- nautilus-cd-burner-2.22.0/src/ncb-operation.c.bak 2008-03-14 13:58:15.299722000 +0800
-+++ nautilus-cd-burner-2.22.0/src/ncb-operation.c 2008-03-14 13:53:52.019203000 +0800
-@@ -1245,6 +1245,11 @@
- operation->priv->iso = NULL;
- }
-
-+ /* remove temporary file */
-+ if (iso_filename == NULL) {
-+ remove_file (filename);
-+ }
-+
- g_strfreev (temp_paths);
- g_free (toc_filename);
- g_free (filename);
-@@ -1498,6 +1503,11 @@
- operation->priv->iso = NULL;
- }
-
-+ /* remove temporary file */
-+ if (iso_filename == NULL) {
-+ remove_file (filename);
-+ }
-+
- g_free (filename);
- g_free (iso_filename);
-