rpms/tar/devel tar-1.19-xattrs-conf.patch, 1.2, 1.3 tar-1.19-xattrs.patch, 1.4, 1.5 tar.spec, 1.70, 1.71

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3038

Modified Files:
	tar-1.19-xattrs-conf.patch tar-1.19-xattrs.patch tar.spec 
Log Message:
patch fuzz clean up

tar-1.19-xattrs-conf.patch:

Index: tar-1.19-xattrs-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tar-1.19-xattrs-conf.patch	26 May 2008 17:02:24 -0000	1.2
+++ tar-1.19-xattrs-conf.patch	29 Aug 2008 16:02:24 -0000	1.3
@@ -74,7 +74,7 @@
 --- tar-1.19/config.hin.xattrs-conf	2007-10-10 13:01:17.000000000 +0200
 +++ tar-1.19/config.hin	2007-12-17 11:47:38.000000000 +0100
 @@ -121,6 +121,9 @@
-    includes <alloca.h> only if HAVE_ALLOCA_H is defined. */
+    */
  #undef HAVE_ALLOCA_H
  
 +/* Define to 1 if you have the <attr/xattr.h> header file. */
@@ -112,8 +112,8 @@
 +/* Define to 1 if you have the `getxattr' function. */
 +#undef HAVE_GETXATTR
 +
- /* Define if you have the iconv() function and it works. */
- #undef HAVE_ICONV
+ /* Define to 1 if you have the <grp.h> header file. */
+ #undef HAVE_GRP_H
  
 @@ -444,12 +459,27 @@
  /* Define to 1 if you have the `lchown' function. */

tar-1.19-xattrs.patch:

Index: tar-1.19-xattrs.patch
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tar-1.19-xattrs.patch	26 May 2008 17:02:24 -0000	1.4
+++ tar-1.19-xattrs.patch	29 Aug 2008 16:02:24 -0000	1.5
@@ -647,15 +647,15 @@
 +  ANCHORED_OPTION,
    ATIME_PRESERVE_OPTION,
    BACKUP_OPTION,
-   CHECKPOINT_OPTION,
+   CHECK_DEVICE_OPTION,
 @@ -271,6 +272,7 @@ enum
    MODE_OPTION,
    MTIME_OPTION,
    NEWER_MTIME_OPTION,
 +  NO_ACLS_OPTION,
    NO_ANCHORED_OPTION,
+   NO_CHECK_DEVICE_OPTION,
    NO_DELAY_DIRECTORY_RESTORE_OPTION,
-   NO_IGNORE_CASE_OPTION,
 @@ -280,9 +282,11 @@ enum
    NO_RECURSION_OPTION,
    NO_SAME_OWNER_OPTION,
@@ -1126,7 +1126,7 @@
 +noinst_HEADERS = arith.h common.h tar.h xattrs.h
  tar_SOURCES = \
   buffer.c\
-  compare.c\
+  checkpoint.c\
 @@ -37,10 +37,11 @@ tar_SOURCES = \
   tar.c\
   transform.c\


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- tar.spec	26 May 2008 17:02:24 -0000	1.70
+++ tar.spec	29 Aug 2008 16:02:24 -0000	1.71
@@ -2,7 +2,7 @@
 Name: tar
 Epoch: 2
 Version: 1.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -89,6 +89,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Fri Aug 29 2008 Ondrej Vasik <ovasik at redhat.com> 2:1.20-2
+- patch fuzz clean up
+
 * Mon May 26 2008 Ondrej Vasik <ovasik at redhat.com> 2:1.20-1
 - new upstream release 1.20 (lzma support, few new options
   and bugfixes)