From cc675868f5540443153f811672aace56de61e3923ebd843516cbceac078ec7fc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 25 Jun 2008 21:57:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tar?expand=0&rev=13 --- tar-1.19-update_flag.patch | 95 ------------------------------------- tar-1.19.tar.bz2 | 3 -- tar-1.20.tar.bz2 | 3 ++ tar-disable_languages.patch | 12 ++--- tar-gcc43.patch | 31 ------------ tar-manpage.patch | 14 +++--- tar.changes | 11 +++++ tar.spec | 23 ++++++--- 8 files changed, 41 insertions(+), 151 deletions(-) delete mode 100644 tar-1.19-update_flag.patch delete mode 100644 tar-1.19.tar.bz2 create mode 100644 tar-1.20.tar.bz2 delete mode 100644 tar-gcc43.patch diff --git a/tar-1.19-update_flag.patch b/tar-1.19-update_flag.patch deleted file mode 100644 index 92beeef..0000000 --- a/tar-1.19-update_flag.patch +++ /dev/null @@ -1,95 +0,0 @@ -Index: src/buffer.c -=================================================================== -RCS file: /cvsroot/tar/tar/src/buffer.c,v -retrieving revision 1.115 -diff -p -u -r1.115 buffer.c ---- src/buffer.c 31 Oct 2007 13:10:55 -0000 1.115 -+++ src/buffer.c 5 Dec 2007 09:43:00 -0000 -@@ -229,19 +229,21 @@ static struct zip_magic const magic[] = - - /* Check if the file ARCHIVE is a compressed archive. */ - enum compress_type --check_compressed_archive () -+check_compressed_archive (bool *pshort) - { - struct zip_magic const *p; - bool sfr; -- bool short_file = false; -+ bool temp; -+ -+ if (!pshort) -+ pshort = &temp; - - /* Prepare global data needed for find_next_block: */ - record_end = record_start; /* set up for 1st record = # 0 */ - sfr = read_full_records; - read_full_records = true; /* Suppress fatal error on reading a partial - record */ -- if (find_next_block () == 0) -- short_file = true; -+ *pshort = find_next_block () == 0; - - /* Restore global values */ - read_full_records = sfr; -@@ -254,9 +256,6 @@ check_compressed_archive () - if (memcmp (record_start->buffer, p->magic, p->length) == 0) - return p->type; - -- if (short_file) -- ERROR ((0, 0, _("This does not look like a tar archive"))); -- - return ct_none; - } - -@@ -273,11 +272,16 @@ open_compressed_archive () - - if (!multi_volume_option) - { -- enum compress_type type = check_compressed_archive (); -+ bool shortfile; -+ enum compress_type type = check_compressed_archive (&shortfile); - - if (type == ct_none) -- return archive; -- -+ { -+ if (shortfile) -+ ERROR ((0, 0, _("This does not look like a tar archive"))); -+ return archive; -+ } -+ - /* FD is not needed any more */ - rmtclose (archive); - -@@ -502,15 +506,18 @@ _open_archive (enum access_mode wanted_a - { - case ACCESS_READ: - { -+ bool shortfile; - enum compress_type type; - - archive = STDIN_FILENO; - -- type = check_compressed_archive (); -+ type = check_compressed_archive (&shortfile); - if (type != ct_none) - FATAL_ERROR ((0, 0, - _("Archive is compressed. Use %s option"), - compress_option (type))); -+ if (shortfile) -+ ERROR ((0, 0, _("This does not look like a tar archive"))); - } - break; - -@@ -554,7 +561,7 @@ _open_archive (enum access_mode wanted_a - O_RDWR | O_CREAT | O_BINARY, - MODE_RW, rsh_command_option); - -- if (check_compressed_archive () != ct_none) -+ if (check_compressed_archive (NULL) != ct_none) - FATAL_ERROR ((0, 0, - _("Cannot update compressed archives"))); - break; - - - diff --git a/tar-1.19.tar.bz2 b/tar-1.19.tar.bz2 deleted file mode 100644 index 942a5d5..0000000 --- a/tar-1.19.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c690d46da77b1ee07b7c758de46d6d07da698a75e63ed3e8f83e3fca8f809cb4 -size 1882486 diff --git a/tar-1.20.tar.bz2 b/tar-1.20.tar.bz2 new file mode 100644 index 0000000..5e96059 --- /dev/null +++ b/tar-1.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be8bf33afb5adc2377e45d94693ffd46b75f267f9b808df0c7006e51211f9deb +size 1912591 diff --git a/tar-disable_languages.patch b/tar-disable_languages.patch index 26bcec8..6229edf 100644 --- a/tar-disable_languages.patch +++ b/tar-disable_languages.patch @@ -1,10 +1,10 @@ Disable the languages, which don't have yet a path in /usr/share/locale/ -Index: tar-1.16/po/LINGUAS +Index: tar-1.20/po/LINGUAS =================================================================== ---- tar-1.16.orig/po/LINGUAS -+++ tar-1.16/po/LINGUAS -@@ -14,11 +14,9 @@ id +--- tar-1.20.orig/po/LINGUAS ++++ tar-1.20/po/LINGUAS +@@ -16,7 +16,6 @@ id it ja ko @@ -12,7 +12,3 @@ Index: tar-1.16/po/LINGUAS ms nb nl --no - pl - pt - pt_BR diff --git a/tar-gcc43.patch b/tar-gcc43.patch deleted file mode 100644 index 7d3f1cc..0000000 --- a/tar-gcc43.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- lib/argp.h.orig 2007-09-25 11:04:18.000000000 +0200 -+++ lib/argp.h 2007-09-25 11:06:24.000000000 +0200 -@@ -580,7 +580,11 @@ - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# if defined __GNUC_STDC_INLINE__ -+# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) -+# else -+# define ARGP_EI extern __inline__ -+# endif - # endif - - ARGP_EI void ---- lib/argp-fmtstream.h.orig 2007-09-25 11:06:49.000000000 +0200 -+++ lib/argp-fmtstream.h 2007-09-25 11:07:35.000000000 +0200 -@@ -198,8 +198,12 @@ - #endif - - #ifndef ARGP_FS_EI -+#ifdef __GNUC_STDC_INLINE__ -+#define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) -+#else - #define ARGP_FS_EI extern inline - #endif -+#endif - - ARGP_FS_EI size_t - __argp_fmtstream_write (argp_fmtstream_t __fs, - diff --git a/tar-manpage.patch b/tar-manpage.patch index 847d794..eaefb65 100644 --- a/tar-manpage.patch +++ b/tar-manpage.patch @@ -1,11 +1,11 @@ -Index: tar-1.18/doc/Makefile.am +Index: tar-1.20/doc/Makefile.am =================================================================== ---- tar-1.18.orig/doc/Makefile.am -+++ tar-1.18/doc/Makefile.am +--- tar-1.20.orig/doc/Makefile.am ++++ tar-1.20/doc/Makefile.am @@ -32,6 +32,9 @@ tar_TEXINFOS = \ sparse.texi\ value.texi - EXTRA_DIST = gendocs_template mastermenu.el texify.sed + EXTRA_DIST = gendocs_template mastermenu.el texify.sed untabify.el +dist_man_MANS = tar.1 +TAR = $(top_builddir)/src/tar +HELP2MAN = /usr/bin/help2man @@ -23,10 +23,10 @@ Index: tar-1.18/doc/Makefile.am header.texi: $(top_srcdir)/src/tar.h sed -f $(srcdir)/texify.sed $(top_srcdir)/src/tar.h \ | expand >$@ -Index: tar-1.18/Makefile.am +Index: tar-1.20/Makefile.am =================================================================== ---- tar-1.18.orig/Makefile.am -+++ tar-1.18/Makefile.am +--- tar-1.20.orig/Makefile.am ++++ tar-1.20/Makefile.am @@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4 diff --git a/tar.changes b/tar.changes index 938cf68..99cfa96 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 23 17:16:19 CEST 2008 - mkoenig@suse.de + +- update to version 1.20: + * new options: --auto-compress, --lzma, --hard-dereference, + --checkpoint-action, --(no-)check-device, --transform + * Add recommends tag for lzma +- removed patches: + tar-gcc43.patch + tar-1.19-update_flag.patch + ------------------------------------------------------------------- Fri Mar 28 17:00:19 CET 2008 - mkoenig@suse.de diff --git a/tar.spec b/tar.spec index 08d1037..a4ffd5e 100644 --- a/tar.spec +++ b/tar.spec @@ -1,5 +1,5 @@ # -# spec file for package tar (Version 1.19) +# spec file for package tar (Version 1.20) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,16 +19,19 @@ Group: System/Base Provides: base:/bin/tar PreReq: %install_info_prereq AutoReqProv: on -Version: 1.19 -Release: 24 +Version: 1.20 +Release: 1 Summary: GNU implementation of tar ((t)ape (ar)chiver) Source0: %name-%version.tar.bz2 +# merged +#Patch3: tar-gcc43.patch +#Patch4: tar-1.19-update_flag.patch +# Patch0: tar-disable_languages.patch Patch1: tar-disable-listed02-test.diff Patch2: tar-manpage.patch -Patch3: tar-gcc43.patch -Patch4: tar-1.19-update_flag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: lzma %define _bindir /bin %description @@ -66,8 +69,6 @@ Authors: %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -%patch4 %build rm -f po/no.* po/ky.* @@ -108,6 +109,14 @@ rm -r %buildroot/usr/libexec rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 23 2008 mkoenig@suse.de +- update to version 1.20: + * new options: --auto-compress, --lzma, --hard-dereference, + --checkpoint-action, --(no-)check-device, --transform + * Add recommends tag for lzma +- removed patches: + tar-gcc43.patch + tar-1.19-update_flag.patch * Fri Mar 28 2008 mkoenig@suse.de - apply upstream patch to avoid error message when updating an archive that does not exist [bnc#347525]