tar-1.32-1

t/tar/tar-vl.spec

@@ -1,31 +1,18 @@
 Summary: A GNU file archiving program.
 Summary(ja): GNU ファイルアーカイブプログラム
 Name: tar
-Version: 1.28
-Release: 2%{?_dist_release}
+Version: 1.32
+Release: 1%{?_dist_release}
 License: GPLv3+
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.xz
-Patch0: tar-1.13.18-manpage.patch
-Patch8: tar-1.20-loneZeroWarning.patch
-Patch10: tar-1.15.1-gcc4.patch
-
-#Fix extracting sparse files to a filesystem like vfat,
-#when ftruncate may fail to grow the size of a file.(#179507)
-Patch11: tar-1.15.1-vfatTruncate.patch
-#change inclusion defaults of tar to "--wildcards --anchored
-#--wildcards-match-slash" for compatibility reasons (#206841)
-Patch12: tar-1.17-wildcards.patch
-
-# Fix for bad cooperation of -C and -u options.
-# ~> #688567
-# ~> http://lists.gnu.org/archive/html/bug-tar/2012-02/msg00007.html
-# ~> still downstream
-Patch15: tar-1.26-update-with-change-directory.patch
-
-# adhoc but useful patch for z option accepts bzip2ed tarball.
-Patch100: tar-1.13.6-barterly.patch
-Patch110: tar-1.22-rtapelib-overflow.patch
+
+# Note that all patches are documented in patch files (git format-patch format)
+Patch1:  tar-1.28-loneZeroWarning.patch
+Patch2:  tar-1.28-vfatTruncate.patch
+Patch3:  tar-1.29-wildcards.patch
+Patch4:  tar-1.28-atime-rofs.patch
+Patch9:  tar-1.28-document-exclude-mistakes.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf texinfo gettext
@@ -64,48 +51,37 @@ tar はマルチボリュームサポート、自動アーカイブ圧縮/伸長
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .manpage
-%patch8 -p1 -b .loneZeroWarning
-%patch11 -p1 -b .vfatTruncate
-%patch12 -p1 -b .wildcards
-%patch15 -p1 -b .update_and_changedir
+%autosetup -p1
+autoreconf -v
 
-%patch100 -p1 -b .accept-bz2
-%patch110 -p1 -b .CVE-2010-0624
+# Keep only entries related to the latest release.
+mv ChangeLog{,~}
+awk 'stop = false; /^2014-07-27/ { stop = true; exit }; { print }' \
+	< ChangeLog~ > ChangeLog
 
 %build
-autoreconf
-%configure --bindir=/bin --libexecdir=/sbin
-make LIBS="-lbsd -lacl" %{?_smp_mflags}
+%configure \
+	--bindir=/bin --libexecdir=/sbin \
+	--with-lzma="xz --format=lzma" \
+	DEFAULT_RMT_DIR=%{_sysconfdir} \
+	RSH=/usr/bin/ssh
+
+make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make prefix=${RPM_BUILD_ROOT}%{_prefix} \
-    localedir=${RPM_BUILD_ROOT}%{_prefix}/share/locale \
-    bindir=${RPM_BUILD_ROOT}/bin \
-    libexecdir=${RPM_BUILD_ROOT}/sbin \
-    mandir=${RPM_BUILD_ROOT}%{_mandir} \
-    infodir=${RPM_BUILD_ROOT}%{_infodir} \
-	install
-ln -s tar ${RPM_BUILD_ROOT}/bin/gtar
-
-( cd $RPM_BUILD_ROOT
-  for dir in ./bin ./sbin .%{_prefix}/bin .%{_prefix}/libexec
-  do
-    [ -d $dir ] || continue
-    strip $dir/* || :
-  done
-  gzip -9nf .%{_infodir}/tar.info*
-  rm -f .%{_infodir}/dir
-)
-
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-install -c -m644 tar.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
-
-rm -f ${RPM_BUILD_ROOT}/sbin/rmt
+rm -rf %{buildroot}
+
+make DESTDIR=%{buildroot} install
+
+ln -s tar %{buildroot}/bin/gtar
+rm -f %{buildroot}/%{_infodir}/dir
+mkdir -p %{buildroot}%{_mandir}/man1
+ln -s tar.1.gz %{buildroot}%{_mandir}/man1/gtar.1
+
+# XXX Nuke unpackaged files.
+rm -f %{buildroot}%{_sysconfdir}/rmt
+rm -f %{buildroot}%{_mandir}/man8/rmt.8*
 
 %find_lang %name
 
@@ -121,20 +97,27 @@ fi
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${buildroot}
 
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog* NEWS README THANKS TODO
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS README THANKS NEWS ChangeLog
 /bin/tar
 /bin/gtar
 %{_mandir}/man1/tar.1*
-%{_mandir}/man8/rmt.8*
+%{_mandir}/man1/gtar.1*
 %{_infodir}/tar.info*
 
 
 %changelog
+* Thu Mar 28 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.32-1
+- new upstream release.
+- dropped all patches.
+- imported patches from rawhide.
+
 * Tue Jan 20 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.28-2
 - added LIBS="-lacl" to build on x86_64 (ad-hoc fix, maybe)
 - added BR: libacl-devel