rpms/tar/F-9 tar-1.16-multiVolLabels.patch, NONE, 1.1 tar.spec, 1.70, 1.71

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/tar/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23199

Modified Files:
	tar.spec 
Added Files:
	tar-1.16-multiVolLabels.patch 
Log Message:
fixed bug #465803: labels with --multi-volume (upstream patch)

tar-1.16-multiVolLabels.patch:

--- NEW FILE tar-1.16-multiVolLabels.patch ---
diff -ruNp tar-1.19.orig/src/buffer.c tar-1.19/src/buffer.c
--- tar-1.19.orig/src/buffer.c	2008-11-10 13:41:00.025944095 +0100
+++ tar-1.19/src/buffer.c	2008-11-10 13:42:17.047901565 +0100
@@ -1321,7 +1321,7 @@ _write_volume_label (const char *str)
 
       memset (label, 0, BLOCKSIZE);
 
-      strcpy (label->header.name, volume_label_option);
+      strcpy (label->header.name, str);
       assign_string (&current_stat_info.file_name,
 		     label->header.name);
       current_stat_info.had_trailing_slash =


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/F-9/tar.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- tar.spec	16 Jun 2008 10:58:24 -0000	1.70
+++ tar.spec	10 Nov 2008 13:25:18 -0000	1.71
@@ -2,7 +2,7 @@
 Name: tar
 Epoch: 2
 Version: 1.19
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -16,6 +16,7 @@
 Patch5: tar-1.17-wildcards.patch
 Patch6: tar-1.19-gcc43.patch
 Patch7: tar-1.19-newfilearchiveerror.patch
+Patch8: tar-1.16-multiVolLabels.patch
 Prereq: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +44,7 @@
 %patch5 -p1 -b .wildcards
 %patch6 -p1 -b .gcc43
 %patch7 -p1 -b .emptyarch
+%patch8 -p1 -b .multiVolLabels
 
 %build
 %configure --bindir=/bin --libexecdir=/sbin
@@ -93,6 +95,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Nov 10 2008 Kamil Dudka <kdudka at redhat.com> 2:1.19-5
+- fixed bug #465803: labels with --multi-volume (upstream patch)
+
 * Mon Jun 16 2008 Ondrej Vasik <ovasik at redhat.com> 2:1.19-4
 - do not print invalid tar archive error when creating archives
   (#451288)