rpms/gnomebaker/F-7 gnomebaker-0.6.1-wodim.patch, 1.1, 1.2 gnomebaker.spec, 1.10, 1.11

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24624

Modified Files:
	gnomebaker-0.6.1-wodim.patch gnomebaker.spec 
Log Message:
* Fri Aug 31 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-4
- fix CDRW blanking


gnomebaker-0.6.1-wodim.patch:

Index: gnomebaker-0.6.1-wodim.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/gnomebaker-0.6.1-wodim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnomebaker-0.6.1-wodim.patch	30 Aug 2007 13:34:15 -0000	1.1
+++ gnomebaker-0.6.1-wodim.patch	31 Aug 2007 13:15:43 -0000	1.2
@@ -1,18 +1,6 @@
-diff -up gnomebaker-0.6.1/src/devices.c.wodim gnomebaker-0.6.1/src/devices.c
---- gnomebaker-0.6.1/src/devices.c.wodim	2007-08-30 13:41:41.000000000 +0200
-+++ gnomebaker-0.6.1/src/devices.c	2007-08-30 13:42:07.000000000 +0200
-@@ -398,7 +398,7 @@ devices_probe_bus(const gchar *bus)
- 	gboolean ok = FALSE;
- 	g_return_val_if_fail(bus != NULL, FALSE);
- 
--	gchar command[32] = "cdrecord -scanbus";
-+	gchar command[32] = "wodim -scanbus";
- 	if(g_ascii_strncasecmp(bus, "SCSI", 4) != 0)
- 	{
- 		strcat(command, " dev=");
 diff -up gnomebaker-0.6.1/src/execfunctions.c.wodim gnomebaker-0.6.1/src/execfunctions.c
 --- gnomebaker-0.6.1/src/execfunctions.c.wodim	2006-06-08 23:38:26.000000000 +0200
-+++ gnomebaker-0.6.1/src/execfunctions.c	2007-08-30 13:20:13.000000000 +0200
++++ gnomebaker-0.6.1/src/execfunctions.c	2007-08-31 08:40:58.000000000 +0200
 @@ -263,8 +263,8 @@ cdrecord_add_common_args(ExecCmd *cmd)
      cdrecord_total_tracks_to_write = 1;
      cdrecord_first_track = -1;
@@ -24,6 +12,18 @@
  	exec_cmd_add_arg(cmd, "dev=%s", writer);
  	g_free(writer);
  
+@@ -372,9 +372,9 @@ cdrecord_add_blank_args(ExecCmd *cmd)
+ 	cmd->pre_proc = cdrecord_blank_pre_proc;
+ 	cmd->post_proc = cdrecord_blank_post_proc;
+ 
+-	exec_cmd_add_arg(cmd, "cdrecord");
++	exec_cmd_add_arg(cmd, "wodim");
+ 
+-	gchar *writer = devices_get_device_config(GB_WRITER, GB_DEVICE_ID_LABEL);
++	gchar *writer = devices_get_device_config(GB_WRITER, GB_DEVICE_NODE_LABEL);
+ 	exec_cmd_add_arg(cmd, "dev=%s", writer);
+ 	g_free(writer);
+ 
 @@ -495,8 +495,9 @@ cdda2wav_add_copy_args(ExecCmd *e)
  {
  	GB_LOG_FUNC
@@ -36,6 +36,15 @@
  	exec_cmd_add_arg(e, "-x");
  	exec_cmd_add_arg(e, "cddb=1");
      exec_cmd_add_arg(e, "speed=52");
+@@ -505,7 +506,7 @@ cdda2wav_add_copy_args(ExecCmd *e)
+ 	exec_cmd_add_arg(e, "-Q");
+ 	exec_cmd_add_arg(e, "-paranoia");
+ 
+-	gchar *reader = devices_get_device_config(GB_READER, GB_DEVICE_ID_LABEL);
++	gchar *reader = devices_get_device_config(GB_READER, GB_DEVICE_NODE_LABEL);
+ 	exec_cmd_add_arg(e, "-D%s", reader);
+ 	g_free(reader);
+ 
 @@ -740,8 +741,9 @@ mkisofs_add_args(ExecCmd *e, StartDlg *s
  	g_return_if_fail(e != NULL);
      g_return_if_fail(start_dlg != NULL);
@@ -48,6 +57,15 @@
  
  	/* If this is a another session on an existing cd we don't show the
  	   iso details dialog */
+@@ -750,7 +752,7 @@ mkisofs_add_args(ExecCmd *e, StartDlg *s
+ 		exec_cmd_add_arg(e, "-C");
+ 		exec_cmd_add_arg(e, msinfo);
+ 
+-		gchar *writer = devices_get_device_config(GB_WRITER, GB_DEVICE_ID_LABEL);
++		gchar *writer = devices_get_device_config(GB_WRITER, GB_DEVICE_NODE_LABEL);
+ 		exec_cmd_add_arg(e, "-M");
+ 		exec_cmd_add_arg(e, writer);
+ 		g_free(writer);
 @@ -804,7 +806,7 @@ mkisofs_add_calc_iso_size_args(ExecCmd *
      g_return_if_fail(e != NULL);
      g_return_if_fail(iso != NULL);
@@ -57,3 +75,12 @@
      exec_cmd_add_arg(e, "--print-size");
      exec_cmd_add_arg(e, iso);
      e->pre_proc = mkisofs_calc_size_pre_proc;
+@@ -1148,7 +1150,7 @@ readcd_add_copy_args(ExecCmd *e, const g
+ 	g_return_if_fail(e != NULL);
+ 	g_return_if_fail(iso != NULL);
+ 
+-	exec_cmd_add_arg(e, "readcd");
++	exec_cmd_add_arg(e, "readom");
+ 
+ 	gchar *reader = devices_get_device_config(GB_READER, GB_DEVICE_ID_LABEL);
+ 	exec_cmd_add_arg(e, "dev=%s", reader);


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/gnomebaker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnomebaker.spec	30 Aug 2007 13:34:15 -0000	1.10
+++ gnomebaker.spec	31 Aug 2007 13:15:43 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Fri Aug 31 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-4
+- fix CDRW blanking
+
 * Thu Aug 30 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-3
 - fix problems with wodim and old scsi b,t,l syntax
 - fix uninitialised g_threads warning on startup