rpms/gnomebaker/devel gnomebaker-0.6.1-gthreads.patch, NONE, 1.1 gnomebaker-0.6.1-wodim.patch, NONE, 1.1 gnomebaker.spec, 1.11, 1.12

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16425

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.1-gthreads.patch gnomebaker-0.6.1-wodim.patch 
Log Message:
* 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
- cdrecord -> wodim, cdda2wav -> icedax, mkisofs -> genisoimage


gnomebaker-0.6.1-gthreads.patch:

--- NEW FILE gnomebaker-0.6.1-gthreads.patch ---
diff -up gnomebaker-0.6.1/src/main.c.gthreads gnomebaker-0.6.1/src/main.c
--- gnomebaker-0.6.1/src/main.c.gthreads	2007-08-30 05:51:16.000000000 +0200
+++ gnomebaker-0.6.1/src/main.c	2007-08-30 05:51:54.000000000 +0200
@@ -51,6 +51,10 @@ main(gint argc, gchar *argv[])
 {
 	GError *error = NULL;
 	GOptionContext *context = g_option_context_new(_(" - GNOME CD/DVD burning application"));
+    
+	if (!g_thread_supported ()) g_thread_init(NULL);
+    gdk_threads_init();
+	
 	/* add main entries */
 	g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
 	/* recognise gtk/gdk/gstreamer options */
@@ -74,8 +78,6 @@ main(gint argc, gchar *argv[])
 #ifdef GST_010
     struct poptOption* options = NULL;
 #else
-    if (!g_thread_supported ()) g_thread_init(NULL);
-    gdk_threads_init();
 
 	struct poptOption options[] =
 	{

gnomebaker-0.6.1-wodim.patch:

--- NEW FILE gnomebaker-0.6.1-wodim.patch ---
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
@@ -263,8 +263,8 @@ cdrecord_add_common_args(ExecCmd *cmd)
     cdrecord_total_tracks_to_write = 1;
     cdrecord_first_track = -1;
 
-	exec_cmd_add_arg(cmd, "cdrecord");
-	gchar *writer = devices_get_device_config(GB_WRITER, GB_DEVICE_ID_LABEL);
+	exec_cmd_add_arg(cmd, "wodim");
+	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
 	g_return_if_fail(e != NULL);
-
-	exec_cmd_add_arg(e, "cdda2wav");
+	
+	/* cdda2wav is gone -> welcome icedax */
+	exec_cmd_add_arg(e, "icedax");
 	exec_cmd_add_arg(e, "-x");
 	exec_cmd_add_arg(e, "cddb=1");
     exec_cmd_add_arg(e, "speed=52");
@@ -740,8 +741,9 @@ mkisofs_add_args(ExecCmd *e, StartDlg *s
 	g_return_if_fail(e != NULL);
     g_return_if_fail(start_dlg != NULL);
 	cdrecord_total_disk_bytes = 0;
-
-    exec_cmd_add_arg(e, "mkisofs");
+	
+	/* mkisofs is gone -> welcome genisoimage */
+    exec_cmd_add_arg(e, "genisoimage");
 
 	/* If this is a another session on an existing cd we don't show the
 	   iso details dialog */
@@ -804,7 +806,7 @@ mkisofs_add_calc_iso_size_args(ExecCmd *
     g_return_if_fail(e != NULL);
     g_return_if_fail(iso != NULL);
 
-    exec_cmd_add_arg(e, "mkisofs");
+    exec_cmd_add_arg(e, "genisoimage");
     exec_cmd_add_arg(e, "--print-size");
     exec_cmd_add_arg(e, iso);
     e->pre_proc = mkisofs_calc_size_pre_proc;


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnomebaker.spec	28 Aug 2007 08:12:12 -0000	1.11
+++ gnomebaker.spec	30 Aug 2007 13:27:08 -0000	1.12
@@ -1,17 +1,18 @@
 Name:           gnomebaker
 Version:        0.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:		http://%{name}.sourceforge.net/v2/ 
+URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-#Patch0:		gnomebaker-0.6.0-device.patch
+Patch0:         gnomebaker-0.6.1-gthreads.patch
+Patch1:         gnomebaker-0.6.1-wodim.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
-BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-devel >= 0.10
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
@@ -19,11 +20,11 @@
 BuildRequires:	intltool
 
 Requires:	dvd+rw-tools
-Requires:	cdrecord
-Requires:	mkisofs
-Requires:	cdda2wav
-Requires:	gstreamer-plugins-base
-Requires:	gstreamer-plugins-good
+Requires:	wodim => 1.1.6
+Requires:	genisoimage => 1.1.6
+Requires:	icedax => 1.1.6
+Requires:	gstreamer-plugins-base >= 0.10
+Requires:	gstreamer-plugins-good >= 0.10
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -35,7 +36,8 @@
 
 %prep
 %setup -q
-#%patch0 -p1 -b .device
+%patch0 -p1 -b .gthreads
+%patch1 -p1 -b .wodim
 chmod 644 AUTHORS TODO
 
 
@@ -86,6 +88,11 @@
 
 
 %changelog
+* 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
+- cdrecord -> wodim, cdda2wav -> icedax, mkisofs -> genisoimage
+
 * Tue Aug 28 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-2
 - rebuild with -export-dynamic