Author: goetz
Date: Tue Feb 6 17:02:46 2007
New Revision: 116845
Added:
packages/cooker/nautilus-cd-burner/current/SOURCES/nautilus-cd-burner-2.17.6-cdrkit.patch
- copied, changed from r105246,
/packages/cooker/nautilus-cd-burner/current/SOURCES/nautilus-cd-burner-2.17.4-cdrkit.patch
Removed:
packages/cooker/nautilus-cd-burner/current/SOURCES/nautilus-cd-burner-2.15.2-burnproof.patch
packages/cooker/nautilus-cd-burner/current/SOURCES/nautilus-cd-burner-2.17.4-cdrkit.patch
Modified:
packages/cooker/nautilus-cd-burner/current/SPECS/nautilus-cd-burner.spec
Log:
- update patch 0, replacing calls to readcd by readom
- drop useless patch 1
Copied:
packages/cooker/nautilus-cd-burner/current/SOURCES/nautilus-cd-burner-2.17.6-cdrkit.patch
(from r105246,
/packages/cooker/nautilus-cd-burner/current/SOURCES/nautilus-cd-burner-2.17.4-cdrkit.patch)
==============================================================================
---
/packages/cooker/nautilus-cd-burner/current/SOURCES/nautilus-cd-burner-2.17.4-cdrkit.patch
(original)
+++
packages/cooker/nautilus-cd-burner/current/SOURCES/nautilus-cd-burner-2.17.6-cdrkit.patch
Tue Feb 6 17:02:46 2007
@@ -1,5 +1,14 @@
---- nautilus-cd-burner-2.17.4/src/make-iso.c~ 2006-12-07 21:20:37.000000000
+0100
-+++ nautilus-cd-burner-2.17.4/src/make-iso.c 2007-01-07 17:22:44.000000000
+0100
+--- nautilus-cd-burner-2.17.6/src/make-iso.c.cdrkit 2007-01-10
20:58:33.000000000 +0100
++++ nautilus-cd-burner-2.17.6/src/make-iso.c 2007-02-06 16:48:32.000000000
+0100
+@@ -737,7 +737,7 @@
+ char *pos;
+
+ if (line && iso->priv->debug) {
+- g_print ("readcd stderr: %s", line);
++ g_print ("readom stderr: %s", line);
+ }
+
+ pos = strstr (line, "addr:");
@@ -851,7 +851,7 @@
return TRUE;
}
@@ -54,8 +63,8 @@
}
process_error (iso, msg);
-@@ -1267,7 +1267,7 @@
- g_free (dirname);
+@@ -1264,7 +1264,7 @@
+ }
argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "mkisofs");
@@ -63,8 +72,26 @@
g_ptr_array_add (argv, "-r");
if (use_joliet) {
g_ptr_array_add (argv, "-J");
---- nautilus-cd-burner-2.17.4/src/nautilus-burn-recorder.c~ 2006-11-20
18:39:18.000000000 +0100
-+++ nautilus-cd-burner-2.17.4/src/nautilus-burn-recorder.c 2007-01-07
17:24:42.000000000 +0100
+@@ -1387,7 +1387,7 @@
+ device_arg = g_strdup_printf ("-dev=%s",
nautilus_burn_drive_get_device (drive));
+
+ argv = g_ptr_array_new ();
+- g_ptr_array_add (argv, "readcd");
++ g_ptr_array_add (argv, "readom");
+ g_ptr_array_add (argv, "-sectors=0-0");
+ g_ptr_array_add (argv, device_arg);
+ g_ptr_array_add (argv, "-f=/dev/null");
+@@ -1569,7 +1569,7 @@
+ dev_arg = g_strdup_printf ("dev=%s",
nautilus_burn_drive_get_device (drive));
+
+ argv = g_ptr_array_new ();
+- g_ptr_array_add (argv, "readcd");
++ g_ptr_array_add (argv, "readom");
+ g_ptr_array_add (argv, (char *)dev_arg);
+ g_ptr_array_add (argv, (char *)filename_arg);
+ g_ptr_array_add (argv, NULL);
+--- nautilus-cd-burner-2.17.6/src/nautilus-burn-recorder.c.cdrkit
2007-01-07 18:34:30.000000000 +0100
++++ nautilus-cd-burner-2.17.6/src/nautilus-burn-recorder.c 2007-02-06
16:45:29.000000000 +0100
@@ -179,7 +179,7 @@
return TRUE;
}
Modified:
packages/cooker/nautilus-cd-burner/current/SPECS/nautilus-cd-burner.spec
==============================================================================
--- packages/cooker/nautilus-cd-burner/current/SPECS/nautilus-cd-burner.spec
(original)
+++ packages/cooker/nautilus-cd-burner/current/SPECS/nautilus-cd-burner.spec
Tue Feb 6 17:02:46 2007
@@ -5,15 +5,13 @@
Summary: CD Burner extension for Nautilus
Name: nautilus-cd-burner
Version: 2.17.6
-Release: %mkrel 1
+Release: %mkrel 2
License: GPL/LGPL
Group: Graphical desktop/GNOME
URL: http://www.gnome.org/
Source0:
ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
# gw use cdrkit instead of cdrecord/mkisofs
-Patch: nautilus-cd-burner-2.17.4-cdrkit.patch
-# (fc) 2.10.2-3mdk enable burnproof by default
-Patch3: nautilus-cd-burner-2.15.2-burnproof.patch
+Patch: nautilus-cd-burner-2.17.6-cdrkit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
BuildRequires: nautilus-devel >= 2.15.4
@@ -65,8 +63,7 @@
%prep
%setup -q
-%patch -p1
-%patch3 -p1 -b .burnproof
+%patch -p1 -b .cdrkit
%build
