From 4a0dc642b8afa3874d328154ee0cc8a9c1b5dc1935bab5cde80ed299e0573175 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 18 Feb 2010 15:59:23 +0000 Subject: [PATCH] checked in (request 32575) OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=11 --- tar-1.21.tar.bz2 | 3 +++ tar-1.22.tar.bz2 | 3 --- tar-recognize_xz.patch | 10 ++++++++++ tar.changes | 11 ----------- tar.spec | 27 +++++++-------------------- 5 files changed, 20 insertions(+), 34 deletions(-) create mode 100644 tar-1.21.tar.bz2 delete mode 100644 tar-1.22.tar.bz2 create mode 100644 tar-recognize_xz.patch diff --git a/tar-1.21.tar.bz2 b/tar-1.21.tar.bz2 new file mode 100644 index 0000000..05c34f2 --- /dev/null +++ b/tar-1.21.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc6c70d2071ca4a928460b6d68ab500a32e67d50255261a0d17765a307aeb350 +size 2071237 diff --git a/tar-1.22.tar.bz2 b/tar-1.22.tar.bz2 deleted file mode 100644 index 650bd58..0000000 --- a/tar-1.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cefb67f197a3f8f5235999fe749ced0889466a71ddcbc96fddca84e5d53aa4d -size 2094575 diff --git a/tar-recognize_xz.patch b/tar-recognize_xz.patch new file mode 100644 index 0000000..43cedbe --- /dev/null +++ b/tar-recognize_xz.patch @@ -0,0 +1,10 @@ +--- src/suffix.c ++++ src/suffix.c +@@ -40,6 +40,7 @@ + { S(lzma, lzma) }, + { S(tlz, lzma) }, + { S(lzo, lzop) }, ++ { S(xz, lzma) }, + #undef S + }; + diff --git a/tar.changes b/tar.changes index 9ba0e4c..f26d8bf 100644 --- a/tar.changes +++ b/tar.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Tue Feb 2 20:35:03 UTC 2010 - mseben@novell.com - -- updated to version 1.22 - * Support for xz compression (--xz option) - * Short option -J is reassigned as a shortcut for --xz - * The option -I is a shortcut for --use-compress-program - * The --no-recursive option works with --incremental -- deprecated recognize_xz.patch -- created tar-backup-scripts subpackage (bnc#574688) - ------------------------------------------------------------------- Sun Dec 6 17:52:57 CET 2009 - jengelh@medozas.de diff --git a/tar.spec b/tar.spec index 14387d9..7199d1d 100644 --- a/tar.spec +++ b/tar.spec @@ -26,15 +26,19 @@ Group: System/Base Provides: base:/bin/tar PreReq: %install_info_prereq AutoReqProv: on -Version: 1.22 +Version: 1.21 Release: 4 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-wildcards.patch +Patch4: tar-recognize_xz.patch Patch5: tar-1.22-fortifysourcessigabrt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: xz @@ -71,16 +75,6 @@ Authors: The King Tom Tromey - -%package backup-scripts -License: GPLv3+ -Summary: Backup scirpts -Group: Productivity/Archiving/Backup -Requires: %{name} = %{version}-%{release} - -%description backup-scripts -Shell scripts for system backup/restore - %lang_package %prep %setup -q @@ -88,6 +82,7 @@ Shell scripts for system backup/restore %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 %patch5 -p1 %build @@ -99,8 +94,7 @@ automake --force --add-missing export CFLAGS="$RPM_OPT_FLAGS %my_cflags" export RSH="/usr/bin/rsh" ./configure --prefix=%_prefix --bindir=%_bindir --mandir=%_mandir \ - --infodir=%_infodir --build=%{_target_cpu}-suse-linux \ - --enable-backup-scripts + --infodir=%_infodir --build=%{_target_cpu}-suse-linux make %{?jobs:-j%jobs}; %check @@ -112,18 +106,11 @@ make %{?jobs:-j%jobs}; %install make install DESTDIR=$RPM_BUILD_ROOT -install -D -m 644 scripts/backup-specs $RPM_BUILD_ROOT%{_sysconfdir}/backup-specs rm -r %buildroot/usr/libexec %find_lang %name %files lang -f %name.lang -%files backup-scripts -%defattr(-,root, root) -%_sbindir/backup -%_sbindir/restore -%config(noreplace) %{_sysconfdir}/backup-specs - %files %defattr(-, root, root) %_bindir/tar