Accepting request 606438 from home:kstreitova:branches:Base:System

- add tar-1.30-tests_dirrem_race.patch to fix race in dirrem01 and
  dirrem02 tests that were passing/failing randomly because of that
- run spec-cleaner
- renumber patches

OBS-URL: https://build.opensuse.org/request/show/606438
OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=86

tar.spec

@@ -29,19 +29,21 @@ Source0:        https://ftp.gnu.org/gnu/tar/%{name}-%{version}.tar.bz2
 Source1:        https://ftp.gnu.org/gnu/tar/%{name}-%{version}.tar.bz2.sig
 # http://wwwkeys.pgp.net:11371/pks/lookup?op=get&search=0x3602B07F55D0C732
 Source2:        %{name}.keyring
-Patch3:         %{name}-wildcards.patch
-Patch6:         %{name}-backup-spec-fix-paths.patch
-Patch10:        paxutils-rtapelib_mtget.patch
+Patch0:         %{name}-wildcards.patch
+Patch1:         %{name}-backup-spec-fix-paths.patch
+Patch2:         paxutils-rtapelib_mtget.patch
 # don't print warning about zero blocks
 # the patch is used in Fedora and Debian
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=235820
-Patch11:        %{name}-ignore_lone_zero_blocks.patch
+Patch3:         %{name}-ignore_lone_zero_blocks.patch
 # The next patch is disabled because it causes a regression:
 #https://bugzilla.opensuse.org/show_bug.cgi?id=918487
-Patch12:        %{name}-recursive--files-from.patch
-Patch20:        add_readme-tests.patch
+Patch4:         %{name}-recursive--files-from.patch
+Patch5:         add_readme-tests.patch
 # PATCH-FIX-UPSTREAM kstreitova@suse.com -- fix difflink.at test
-Patch21:        tar-1.30-tests-difflink.patch
+Patch6:         tar-1.30-tests-difflink.patch
+# PATCH-FIX-UPSTREAM kstreitova@suse.com -- fix race in dirrem01 and dirrem02 tests
+Patch7:         tar-1.30-tests_dirrem_race.patch
 BuildRequires:  automake
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
@@ -109,13 +111,14 @@ it may as well access remote devices or files.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
+#%patch4 -p1
+%patch5 -p1
 %patch6 -p1
-%patch10 -p1
-%patch11 -p1
-#%patch12 -p1
-%patch20 -p1
-%patch21 -p1
+%patch7 -p1
 
 %build
 %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter -fPIE
@@ -202,7 +205,7 @@ fi
 %ghost %{_bindir}/rmt
 %{_bindir}/gnurmt
 %ghost %{_mandir}/man1/rmt.1%{ext_man}
-%{_mandir}/man1/gnurmt.1%{ext_man}
+%{_mandir}/man1/gnurmt.1%{?ext_man}
 %ghost %{_sysconfdir}/alternatives/rmt
 %ghost %{_sysconfdir}/alternatives/rmt.1%{ext_man}
 
@@ -223,6 +226,6 @@ fi
 /bin/%{name}
 #EndUsrMerge
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/%{name}.1%{?ext_man}
 
 %changelog