rpms/nautilus-cd-burner/FC-6 nautilus-cd-burner-2.16-growiso-joliet.patch, NONE, 1.1 nautilus-cd-burner.spec, 1.77, 1.78

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/nautilus-cd-burner/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv5217

Modified Files:
	nautilus-cd-burner.spec 
Added Files:
	nautilus-cd-burner-2.16-growiso-joliet.patch 
Log Message:
+* Thu Nov  9 2006 Alexander Larsson <alexl at redhat.com> - 2.16.0-5.fc6
+- Pass joliet flag when using growisofs



nautilus-cd-burner-2.16-growiso-joliet.patch:
 make-iso.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE nautilus-cd-burner-2.16-growiso-joliet.patch ---
? nautilus-cd-burner-2.17.1.tar.gz
Index: src/make-iso.c
===================================================================
RCS file: /cvs/gnome/nautilus-cd-burner/src/make-iso.c,v
retrieving revision 1.13
diff -p -u -r1.13 make-iso.c
--- src/make-iso.c	29 Sep 2006 18:23:54 -0000	1.13
+++ src/make-iso.c	25 Oct 2006 17:01:50 -0000
@@ -965,11 +965,11 @@ nautilus_burn_iso_run_process (NautilusB
 gboolean
 nautilus_burn_iso_graft_get_info (NautilusBurnIsoGraft *graft,
 				  guint64              *size,
-				  gboolean             *use_joliet,
+				  gboolean             *use_joliet_out,
 				  GError              **error)
 {
 	GPtrArray            *argv;
-	gboolean              _use_joliet;
+	gboolean              use_joliet;
 	char                 *stdout_data;
 	char                 *stderr_data;
 	int                   exit_status;
@@ -978,7 +978,7 @@ nautilus_burn_iso_graft_get_info (Nautil
 	char                 *filelist;
 	gboolean              result;
 
-	_use_joliet = TRUE;
+	use_joliet = TRUE;
 	argv = NULL;
 	filelist = create_temp_graft_file (graft);
 	iso_size = 0;
@@ -991,7 +991,7 @@ nautilus_burn_iso_graft_get_info (Nautil
 
 	g_ptr_array_add (argv, "mkisofs");
 	g_ptr_array_add (argv, "-r");
-	if (_use_joliet) {
+	if (use_joliet) {
 		g_ptr_array_add (argv, "-J");
 	}
 	if (ncb_mkisofs_supports_utf8 ()) {
@@ -1061,6 +1061,9 @@ nautilus_burn_iso_graft_get_info (Nautil
 
 	if (size != NULL) {
 		*size = iso_size;
+	}
+	if (use_joliet_out != NULL) {
+		*use_joliet_out = use_joliet;
 	}
 
 	return result;


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-6/nautilus-cd-burner.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- nautilus-cd-burner.spec	18 Oct 2006 14:53:33 -0000	1.77
+++ nautilus-cd-burner.spec	9 Nov 2006 10:10:36 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.16.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -32,6 +32,9 @@
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
 
+# From upstream cvs (gnome bugzilla 359997)
+Patch1:        nautilus-cd-burner-2.16-growiso-joliet.patch
+
 %description
 An easy to use CD burning package, well integrated with
 Nautilus and the Gnome desktop.
@@ -52,6 +55,8 @@
 %prep
 %setup -q
 
+%patch1 -p0 -b .growiso-joliet
+
 %build
 %configure --enable-hal --enable-gnome-mount
 make
@@ -124,6 +129,9 @@
 
 
 %changelog
+* Thu Nov  9 2006 Alexander Larsson <alexl at redhat.com> - 2.16.0-5.fc6
+- Pass joliet flag when using growisofs
+
 * Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-4
 - Fix scripts according to the packaging guidelines