From 2f71d1a1690a551bd86de605952e62e9c9e56ad42b1c4afa10d6f08e815a078b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 5 Dec 2009 06:44:24 +0000 Subject: [PATCH 1/9] Accepting request 25672 from home:msmeissn:branches:Base:System Copy from home:msmeissn:branches:Base:System/tar via accept of submit request 25672 revision 5. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/25672 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=4 --- tar.changes | 5 ----- tar.spec | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tar.changes b/tar.changes index f26d8bf..c8ff4db 100644 --- a/tar.changes +++ b/tar.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Dec 6 17:52:57 CET 2009 - jengelh@medozas.de - -- enable parallel building - ------------------------------------------------------------------- Fri Dec 4 21:46:24 CET 2009 - meissner@suse.de diff --git a/tar.spec b/tar.spec index 7199d1d..2454432 100644 --- a/tar.spec +++ b/tar.spec @@ -1,7 +1,7 @@ # # spec file for package tar (Version 1.21) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,13 @@ Name: tar BuildRequires: help2man Url: http://www.gnu.org/software/tar/ -License: GPLv3+ +License: GPL v3 or later Group: System/Base Provides: base:/bin/tar PreReq: %install_info_prereq AutoReqProv: on Version: 1.21 -Release: 4 +Release: 3 Summary: GNU implementation of tar ((t)ape (ar)chiver) Source0: %name-%version.tar.bz2 # merged @@ -95,7 +95,7 @@ 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 -make %{?jobs:-j%jobs}; +make %check #%ifarch %arm From fb965e88ac3cb3bb8a81e66ab43a8d5bf016454610ce70b214b2fe1358b2ec11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 6 Dec 2009 17:14:13 +0000 Subject: [PATCH 2/9] Accepting request 25732 from home:jengelh:branches:Base:System Copy from home:jengelh:branches:Base:System/tar via accept of submit request 25732 revision 2. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/25732 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=5 --- tar.changes | 5 +++++ tar.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tar.changes b/tar.changes index c8ff4db..3b54b6f 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 6 17:52:57 CET 2009 - jengelh + +- enable parallel building + ------------------------------------------------------------------- Fri Dec 4 21:46:24 CET 2009 - meissner@suse.de diff --git a/tar.spec b/tar.spec index 2454432..8759da7 100644 --- a/tar.spec +++ b/tar.spec @@ -95,7 +95,7 @@ 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 -make +make %{?jobs:-j%jobs}; %check #%ifarch %arm From bc5065c98e466aa2976450b5a340b08bd1d63028a88092564c03b0bd5f1ca6a2 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 6 Dec 2009 17:57:01 +0000 Subject: [PATCH 3/9] fixed email OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=6 --- tar.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tar.changes b/tar.changes index 3b54b6f..f26d8bf 100644 --- a/tar.changes +++ b/tar.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Sun Dec 6 17:52:57 CET 2009 - jengelh +Sun Dec 6 17:52:57 CET 2009 - jengelh@medozas.de - enable parallel building From aee19c68c31f5a3ef8ba3a414fab0132e62fec8fd41fd326411329b4579f6a06 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 11 Jan 2010 15:52:19 +0000 Subject: [PATCH 4/9] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=7 --- tar-1.22-fortifysourcessigabrt.patch | 52 ---------------------------- tar.changes | 10 ------ tar.spec | 6 +--- 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 tar-1.22-fortifysourcessigabrt.patch diff --git a/tar-1.22-fortifysourcessigabrt.patch b/tar-1.22-fortifysourcessigabrt.patch deleted file mode 100644 index 92ac632..0000000 --- a/tar-1.22-fortifysourcessigabrt.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: tar-1.21/src/create.c -=================================================================== ---- tar-1.21.orig/src/create.c -+++ tar-1.21/src/create.c -@@ -532,8 +532,8 @@ start_private_header (const char *name, - GID_TO_CHARS (getgid (), header->header.gid); - MAJOR_TO_CHARS (0, header->header.devmajor); - MINOR_TO_CHARS (0, header->header.devminor); -- strncpy (header->header.magic, TMAGIC, TMAGLEN); -- strncpy (header->header.version, TVERSION, TVERSLEN); -+ memcpy (header->header.magic, TMAGIC, TMAGLEN); -+ memcpy (header->header.version, TVERSION, TVERSLEN); - return header; - } - -@@ -577,7 +577,10 @@ write_gnu_long_link (struct tar_stat_inf - GNAME_TO_CHARS (tmpname, header->header.gname); - free (tmpname); - -- strcpy (header->header.magic, OLDGNU_MAGIC); -+ /* OLDGNU_MAGIC is string with 7 chars + NULL */ -+ memcpy (header->header.magic, OLDGNU_MAGIC, sizeof(header->header.magic)); -+ memcpy (header->header.version, OLDGNU_MAGIC+sizeof(header->header.magic), -+ sizeof(header->header.version)); - header->header.typeflag = type; - finish_header (st, header, -1); - -@@ -907,15 +910,19 @@ start_header (struct tar_stat_info *st) - break; - - case OLDGNU_FORMAT: -- case GNU_FORMAT: /*FIXME?*/ -- /* Overwrite header->header.magic and header.version in one blow. */ -- strcpy (header->header.magic, OLDGNU_MAGIC); -+ case GNU_FORMAT: -+ /* OLDGNU_MAGIC is string with 7 chars + NULL */ -+ memcpy (header->header.magic, OLDGNU_MAGIC, -+ sizeof(header->header.magic)); -+ memcpy (header->header.version, -+ OLDGNU_MAGIC+sizeof(header->header.magic), -+ sizeof(header->header.version)); - break; - - case POSIX_FORMAT: - case USTAR_FORMAT: -- strncpy (header->header.magic, TMAGIC, TMAGLEN); -- strncpy (header->header.version, TVERSION, TVERSLEN); -+ memcpy (header->header.magic, TMAGIC, TMAGLEN); -+ memcpy (header->header.version, TVERSION, TVERSLEN); - break; - - default: diff --git a/tar.changes b/tar.changes index f26d8bf..1cdc66f 100644 --- a/tar.changes +++ b/tar.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Sun Dec 6 17:52:57 CET 2009 - jengelh@medozas.de - -- enable parallel building - -------------------------------------------------------------------- -Fri Dec 4 21:46:24 CET 2009 - meissner@suse.de - -- fixed FORTIFY_SOURCE=2 issue with gcc 4.5. - ------------------------------------------------------------------- Sun Aug 30 18:36:08 UTC 2009 - aj@suse.de diff --git a/tar.spec b/tar.spec index 8759da7..ad4008b 100644 --- a/tar.spec +++ b/tar.spec @@ -39,7 +39,6 @@ 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 Recommends: tar-lang = %version @@ -83,7 +82,6 @@ Authors: %patch2 -p1 %patch3 -p1 %patch4 -%patch5 -p1 %build rm -f po/no.* po/ky.* @@ -95,9 +93,7 @@ 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 -make %{?jobs:-j%jobs}; - -%check +make #%ifarch %arm #make check || true #%else From d81ef996dc351d081eb5ad73fdfaa9832a151ba628a372d242bf669602894bc1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 12 Feb 2010 07:01:31 +0000 Subject: [PATCH 5/9] converted link to branch OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=8 --- tar-1.22-fortifysourcessigabrt.patch | 52 ++++++++++++++++++++++++++++ tar.changes | 10 ++++++ tar.spec | 12 ++++--- 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 tar-1.22-fortifysourcessigabrt.patch diff --git a/tar-1.22-fortifysourcessigabrt.patch b/tar-1.22-fortifysourcessigabrt.patch new file mode 100644 index 0000000..92ac632 --- /dev/null +++ b/tar-1.22-fortifysourcessigabrt.patch @@ -0,0 +1,52 @@ +Index: tar-1.21/src/create.c +=================================================================== +--- tar-1.21.orig/src/create.c ++++ tar-1.21/src/create.c +@@ -532,8 +532,8 @@ start_private_header (const char *name, + GID_TO_CHARS (getgid (), header->header.gid); + MAJOR_TO_CHARS (0, header->header.devmajor); + MINOR_TO_CHARS (0, header->header.devminor); +- strncpy (header->header.magic, TMAGIC, TMAGLEN); +- strncpy (header->header.version, TVERSION, TVERSLEN); ++ memcpy (header->header.magic, TMAGIC, TMAGLEN); ++ memcpy (header->header.version, TVERSION, TVERSLEN); + return header; + } + +@@ -577,7 +577,10 @@ write_gnu_long_link (struct tar_stat_inf + GNAME_TO_CHARS (tmpname, header->header.gname); + free (tmpname); + +- strcpy (header->header.magic, OLDGNU_MAGIC); ++ /* OLDGNU_MAGIC is string with 7 chars + NULL */ ++ memcpy (header->header.magic, OLDGNU_MAGIC, sizeof(header->header.magic)); ++ memcpy (header->header.version, OLDGNU_MAGIC+sizeof(header->header.magic), ++ sizeof(header->header.version)); + header->header.typeflag = type; + finish_header (st, header, -1); + +@@ -907,15 +910,19 @@ start_header (struct tar_stat_info *st) + break; + + case OLDGNU_FORMAT: +- case GNU_FORMAT: /*FIXME?*/ +- /* Overwrite header->header.magic and header.version in one blow. */ +- strcpy (header->header.magic, OLDGNU_MAGIC); ++ case GNU_FORMAT: ++ /* OLDGNU_MAGIC is string with 7 chars + NULL */ ++ memcpy (header->header.magic, OLDGNU_MAGIC, ++ sizeof(header->header.magic)); ++ memcpy (header->header.version, ++ OLDGNU_MAGIC+sizeof(header->header.magic), ++ sizeof(header->header.version)); + break; + + case POSIX_FORMAT: + case USTAR_FORMAT: +- strncpy (header->header.magic, TMAGIC, TMAGLEN); +- strncpy (header->header.version, TVERSION, TVERSLEN); ++ memcpy (header->header.magic, TMAGIC, TMAGLEN); ++ memcpy (header->header.version, TVERSION, TVERSLEN); + break; + + default: diff --git a/tar.changes b/tar.changes index 1cdc66f..f26d8bf 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Dec 6 17:52:57 CET 2009 - jengelh@medozas.de + +- enable parallel building + +------------------------------------------------------------------- +Fri Dec 4 21:46:24 CET 2009 - meissner@suse.de + +- fixed FORTIFY_SOURCE=2 issue with gcc 4.5. + ------------------------------------------------------------------- Sun Aug 30 18:36:08 UTC 2009 - aj@suse.de diff --git a/tar.spec b/tar.spec index ad4008b..7199d1d 100644 --- a/tar.spec +++ b/tar.spec @@ -1,7 +1,7 @@ # # spec file for package tar (Version 1.21) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,13 @@ Name: tar BuildRequires: help2man Url: http://www.gnu.org/software/tar/ -License: GPL v3 or later +License: GPLv3+ Group: System/Base Provides: base:/bin/tar PreReq: %install_info_prereq AutoReqProv: on Version: 1.21 -Release: 3 +Release: 4 Summary: GNU implementation of tar ((t)ape (ar)chiver) Source0: %name-%version.tar.bz2 # merged @@ -39,6 +39,7 @@ 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 Recommends: tar-lang = %version @@ -82,6 +83,7 @@ Authors: %patch2 -p1 %patch3 -p1 %patch4 +%patch5 -p1 %build rm -f po/no.* po/ky.* @@ -93,7 +95,9 @@ 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 -make +make %{?jobs:-j%jobs}; + +%check #%ifarch %arm #make check || true #%else From 8074c8eea5a72d3b627761ddafdd5e8621ad972439f7193a57958ab879d9366d Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Mon, 15 Feb 2010 08:56:06 +0000 Subject: [PATCH 6/9] Accepting request 32571 from home:mseben:branches:Base:System Copy from home:mseben:branches:Base:System/tar via accept of submit request 32571 revision 8. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/32571 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=9 --- 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, 34 insertions(+), 20 deletions(-) delete mode 100644 tar-1.21.tar.bz2 create mode 100644 tar-1.22.tar.bz2 delete mode 100644 tar-recognize_xz.patch diff --git a/tar-1.21.tar.bz2 b/tar-1.21.tar.bz2 deleted file mode 100644 index 05c34f2..0000000 --- a/tar-1.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..650bd58 --- /dev/null +++ b/tar-1.22.tar.bz2 @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index 43cedbe..0000000 --- a/tar-recognize_xz.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 f26d8bf..9ba0e4c 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 7199d1d..da31b0a 100644 --- a/tar.spec +++ b/tar.spec @@ -26,19 +26,15 @@ Group: System/Base Provides: base:/bin/tar PreReq: %install_info_prereq AutoReqProv: on -Version: 1.21 +Version: 1.22 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 @@ -75,6 +71,16 @@ Authors: The King Tom Tromey + +%package backup-scripts +License: GPLv3+ +Summary: Backup scirpts +Group: System/Base + +%description backup-scripts +description +Tar backup scripts + %lang_package %prep %setup -q @@ -82,7 +88,6 @@ Authors: %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 %patch5 -p1 %build @@ -94,7 +99,8 @@ 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 + --infodir=%_infodir --build=%{_target_cpu}-suse-linux \ + --enable-backup-scripts make %{?jobs:-j%jobs}; %check @@ -106,11 +112,18 @@ 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 From a8e9559c44bf867f68f4b8f5e64faf8355532fbcd01083eed2c7512585abfd2d Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Mon, 15 Feb 2010 09:19:56 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=10 --- tar.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tar.spec b/tar.spec index da31b0a..14387d9 100644 --- a/tar.spec +++ b/tar.spec @@ -75,11 +75,11 @@ Authors: %package backup-scripts License: GPLv3+ Summary: Backup scirpts -Group: System/Base +Group: Productivity/Archiving/Backup +Requires: %{name} = %{version}-%{release} %description backup-scripts -description -Tar backup scripts +Shell scripts for system backup/restore %lang_package %prep From 4a0dc642b8afa3874d328154ee0cc8a9c1b5dc1935bab5cde80ed299e0573175 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 18 Feb 2010 15:59:23 +0000 Subject: [PATCH 8/9] 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 From 644e5ee229c1459efcfb02270129627033ddbf6db50321c95f0079bf29247b62 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Feb 2010 15:59:24 +0000 Subject: [PATCH 9/9] Updating link to change in openSUSE:Factory/tar revision 20.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=d5e406f77153ebb7724038a47d3cd489 --- tar-1.21.tar.bz2 | 3 --- tar-1.22.tar.bz2 | 3 +++ tar-recognize_xz.patch | 10 ---------- tar.changes | 11 +++++++++++ tar.spec | 31 ++++++++++++++++++++++--------- 5 files changed, 36 insertions(+), 22 deletions(-) delete mode 100644 tar-1.21.tar.bz2 create mode 100644 tar-1.22.tar.bz2 delete mode 100644 tar-recognize_xz.patch diff --git a/tar-1.21.tar.bz2 b/tar-1.21.tar.bz2 deleted file mode 100644 index 05c34f2..0000000 --- a/tar-1.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..650bd58 --- /dev/null +++ b/tar-1.22.tar.bz2 @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index 43cedbe..0000000 --- a/tar-recognize_xz.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 f26d8bf..9ba0e4c 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 7199d1d..1b165aa 100644 --- a/tar.spec +++ b/tar.spec @@ -1,5 +1,5 @@ # -# spec file for package tar (Version 1.21) +# spec file for package tar (Version 1.22) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,19 +26,15 @@ Group: System/Base Provides: base:/bin/tar PreReq: %install_info_prereq AutoReqProv: on -Version: 1.21 -Release: 4 +Version: 1.22 +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-wildcards.patch -Patch4: tar-recognize_xz.patch Patch5: tar-1.22-fortifysourcessigabrt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: xz @@ -75,6 +71,16 @@ 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 @@ -82,7 +88,6 @@ Authors: %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 %patch5 -p1 %build @@ -94,7 +99,8 @@ 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 + --infodir=%_infodir --build=%{_target_cpu}-suse-linux \ + --enable-backup-scripts make %{?jobs:-j%jobs}; %check @@ -106,11 +112,18 @@ 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