Accepting request 213376 from Base:System

Add patch name into changes file to comply with the requirements (forwarded request 213373 from llipavsky) OBS-URL: https://build.opensuse.org/request/show/213376 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tar?expand=0&rev=48
2014-01-11 10:12:32 +00:00 · 2014-01-11 10:12:32 +00:00 · 80dbcb8e06
commit 80dbcb8e06
parent e99fd70b32 d0a5ea9bd1
6 changed files with 89 additions and 8 deletions
--- a/add_readme-tests.patch
+++ b/add_readme-tests.patch
@ -0,0 +1,40 @@
+Index: tar-1.27.1/README-tests
+===================================================================
+--- /dev/null
+++ tar-1.27.1/README-tests
+@@ -0,0 +1,22 @@
+Subpackage tar-tests
+====================
+
+The tar-tests package contains the testsuite which is included in tar sources.
+The testsuite is normally run during make phase (make check) and is also
+automatically run when the tar rpm is being build (in %check section of spec
+file).
+
+Normally, there is no reason to need the tar-tests package. It can however be
+used to verify, that tar functions properly in an installed system (e.g. to
+find issues in tar's dependencies, problems with incompatible libraries, etc.).
+
+Testsuite is installed into /var/lib/tests/tar
+
+To run the testsuite:
+
+cd /var/lib/tests/tar
+./testsuite --help # show options
+
+# needed for genfile binary used in tests
+./testsuite AUTOTEST_PATH=/var/lib/tests/tar/bin [other options]
+
+Index: tar-1.27.1/Makefile.in
+===================================================================
+--- tar-1.27.1.orig/Makefile.in
+++ tar-1.27.1/Makefile.in
+@@ -141,7 +141,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Make.rules INSTALL NEWS README AUTHORS \
+DIST_COMMON = $(srcdir)/Make.rules INSTALL NEWS README README-tests AUTHORS \
+ 	ChangeLog THANKS $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(top_srcdir)/configure $(am__configure_deps) \
+ 	$(srcdir)/config.h.in ABOUT-NLS README-alpha COPYING TODO \
--- a/tar-1.27.1.tar.bz2
+++ b/tar-1.27.1.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b0fb3ce8512059337add0da5f8f0f7d7647f2201f5ece24581d620ea60337c6
+size 2573070
--- a/tar-1.27.1.tar.bz2.sig
+++ b/tar-1.27.1.tar.bz2.sig
@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)

-iD8DBQBSUI79NgKwf1XQxzIRAu+fAKCVHrxH0VS70ayy1hk8yclb9rwSbQCZASD0
-/ZXIBL9EDZ0WD7aI0PpV8i8=
-=uacI
+iD8DBQBSiPUMNgKwf1XQxzIRAvgkAJ9j8NjtX5l8nY09uzT5azrkM0t7UwCgk9wK
+9KD1C1iRhk9ur7/7FVNXE4M=
+=Mfmh
 -----END PGP SIGNATURE-----
--- a/tar-1.27.tar.bz2
+++ b/tar-1.27.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2238c5c63c7ecaccc962f10482d76875b45cedfed69138ed852a88e344af3c7b
-size 2530071
--- a/tar.changes
+++ b/tar.changes
@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Jan  7 11:09:24 CET 2014 - llipavsky@suse.com
+
+- add tests subpackage.
+  * It is the same testsuite that is run during make check.
+  * It is now possible to run it in real system to verify that
+    nothing is broken by incompatible libraries, etc.
+- add add_readme-tests.patch: README for testsuite
+
+-------------------------------------------------------------------
+Tue Nov 19 22:16:18 UTC 2013 - andreas.stieger@gmx.de
+
+- update to 1.27.1
+  * Fix unquoting of file names obtained via the -T option.
+  * Fix GNU long link header timestamp (backward compatibility).
+  * Fix extracting sparse members from star archives.
+
 -------------------------------------------------------------------
 Thu Oct 24 21:57:57 UTC 2013 - andreas.stieger@gmx.de

--- a/tar.spec
+++ b/tar.spec
@ -1,7 +1,7 @@
 #
 # spec file for package tar
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@ -20,7 +20,7 @@
 %define min_suse_ver 1010

 Name:           tar
-Version:        1.27
+Version:        1.27.1
 Release:        0
 Summary:        GNU implementation of tar ((t)ape (ar)chiver)
 License:        GPL-3.0+
@ -35,6 +35,7 @@ Patch3:         tar-wildcards.patch
 Patch6:         tar-backup-spec-fix-paths.patch
 Patch7:         tar-1.26-remove_O_NONBLOCK.patch
 Patch10:        paxutils-rtapelib_mtget.patch
+Patch20:        add_readme-tests.patch
 %if 0%{?suse_version} >= %min_suse_ver
 BuildRequires:  help2man
 Recommends:     tar-lang = %{version}
@ -61,6 +62,14 @@ Requires:       %{name} = %{version}
 %description backup-scripts
 Shell scripts for system backup/restore

+%package tests
+Summary:        Tests for the package
+Group:          Development/Tests
+Requires:       %{name} = %{version}
+
+%description tests
+Upstream testsuite for the package
+
 %{?lang_package}

 %prep
@ -69,6 +78,7 @@ Shell scripts for system backup/restore
 %patch6 -p1
 %patch7 -p1
 %patch10 -p1
+%patch20 -p1

 %build
 %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter
@ -80,6 +90,11 @@ export DEFAULT_ARCHIVE_FORMAT="POSIX"
 	--enable-backup-scripts \
 	--disable-silent-rules
 make %{?_smp_mflags};
+cd tests
+make genfile
+mkdir bin
+mv genfile bin
+cd -

 %check
 %if !0%{?qemu_user_space_build:1}
@ -99,6 +114,11 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/backup
 install -D -m 644 scripts/backup-specs %{buildroot}%{_sysconfdir}/backup/backup-specs
 rm -rf %{buildroot}%{_libexecdir}/rmt
 rm -f %{buildroot}%{_infodir}/dir
+install -d -m 755 %{buildroot}/var/lib/tests
+cp -r tests %{buildroot}/var/lib/tests/tar
+rm %{buildroot}/var/lib/tests/tar/*.{c,h,o}
+rm %{buildroot}/var/lib/tests/tar/package.m4
+rm %{buildroot}/var/lib/tests/tar/{atconfig,atlocal,Makefile}*
 %find_lang %{name}

 %files backup-scripts
@ -114,6 +134,10 @@ rm -f %{buildroot}%{_infodir}/dir

 %files lang -f %{name}.lang

+%files tests
+%defattr(-,root, root)
+/var/lib/tests
+
 %files
 %else