rpms/file-roller/devel tar7z.patch, NONE, 1.1 file-roller.spec, 1.178, 1.179

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10280

Modified Files:
	file-roller.spec 
Added Files:
	tar7z.patch 
Log Message:
Don't crash when creating .tar.7z archives


tar7z.patch:
 fr-command-tar.c |    2 +-
 fr-process.h     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tar7z.patch ---
--- file-roller-2.30.1.1/src/fr-process.h	2009-04-30 04:47:42.000000000 -0400
+++ foo/src/fr-process.h	2010-05-05 22:05:23.097517483 -0400
@@ -97,7 +97,7 @@
 					     const char   *arg);
 void        fr_process_add_arg_concat       (FrProcess    *fr_proc,
 					     const char   *arg,
-					     ...);
+					     ...) G_GNUC_NULL_TERMINATED;
 void        fr_process_add_arg_printf       (FrProcess    *fr_proc,
 					     const char   *format,
 					     ...) G_GNUC_PRINTF (2, 3);
--- file-roller-2.30.1.1/src/fr-command-tar.c	2010-04-27 02:42:13.000000000 -0400
+++ foo/src/fr-command-tar.c	2010-05-05 22:06:39.920522861 -0400
@@ -661,7 +661,7 @@
 		fr_process_add_arg (comm->process, "-l");
 
 		new_name = g_strconcat (c_tar->uncomp_filename, ".7z", NULL);
-		fr_process_add_arg_concat (comm->process, new_name);
+		fr_process_add_arg_concat (comm->process, new_name, NULL);
 
 		fr_process_add_arg (comm->process, c_tar->uncomp_filename);
 		fr_process_end_command (comm->process);


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- file-roller.spec	27 Apr 2010 17:17:31 -0000	1.178
+++ file-roller.spec	6 May 2010 02:19:06 -0000	1.179
@@ -11,7 +11,7 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.30.1.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -40,12 +40,16 @@ Requires: GConf2
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=617840
+Patch0: tar7z.patch
+
 %description
 File Roller is an application for creating and viewing archives files,
 such as tar or zip files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .tarz7
 
 %build
 %configure 	--disable-scrollkeeper 		\
@@ -57,8 +61,6 @@ export tagname=CC
 make LIBTOOL=/usr/bin/libtool
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export tagname=CC
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -75,9 +77,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/h
 
 %find_lang %{name} --with-gnome
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 update-desktop-database &> /dev/null || :
 %gconf_schema_upgrade file-roller
@@ -112,6 +111,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Wed May  5 2010 Matthias Clasen <mclasen at redhat.com> 2.30.1.1-2
+- Don't crash when creating .tar.7z archives
+
 * Tue Apr 27 2010 Matthias Clasen <mclasen at redhat.com> 2.30.1.1-1
 - Update to 2.30.1.1
 - Spec file cleanups