Accepting request 87300 from Base:System

minor portability fixes (forwarded request 86660 from rudi_m)

OBS-URL: https://build.opensuse.org/request/show/87300
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tar?expand=0&rev=34

tar-disable-listed02-test.patch

@@ -1,12 +0,0 @@
-Index: tar-1.26/tests/testsuite.at
-===================================================================
---- tar-1.26.orig/tests/testsuite.at
-+++ tar-1.26/tests/testsuite.at
-@@ -180,7 +180,6 @@ m4_include([incremental.at])
- m4_include([incr01.at])
- m4_include([incr02.at])
- m4_include([listed01.at])
--m4_include([listed02.at])
- m4_include([listed03.at])
- m4_include([listed04.at])
- m4_include([incr03.at])

tar-disable_languages.patch

@@ -1,14 +0,0 @@
-Disable the languages, which don't have yet a path in /usr/share/locale/
-
-Index: tar-1.23/po/LINGUAS
-===================================================================
---- tar-1.23.orig/po/LINGUAS
-+++ tar-1.23/po/LINGUAS
-@@ -16,7 +16,6 @@ id
- it
- ja
- ko
--ky
- ms
- nb
- nl

tar-fortifysourcessigabrt.patch

@@ -1,26 +0,0 @@
-Index: tar-1.25/src/create.c
-===================================================================
---- tar-1.25.orig/src/create.c
-+++ tar-1.25/src/create.c
-@@ -517,8 +517,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;
- }
- 
-@@ -906,8 +906,8 @@ start_header (struct tar_stat_info *st)
- 
-     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:

tar-manpage.patch

@@ -1,38 +0,0 @@
-Index: tar-1.25/doc/Makefile.am
-===================================================================
---- tar-1.25.orig/doc/Makefile.am
-+++ tar-1.25/doc/Makefile.am
-@@ -32,6 +32,9 @@ tar_TEXINFOS = \
-  sparse.texi\
-  value.texi
- EXTRA_DIST = gendocs_template mastermenu.el texify.sed untabify.el
-+dist_man_MANS = tar.1
-+TAR = $(top_builddir)/src/tar
-+HELP2MAN = /usr/bin/help2man
- 
- # The rendering level is anyone of PUBLISH, DISTRIB or PROOF.
- # Just call `make RENDITION=PROOF [target]' if you want PROOF rendition.
-@@ -39,6 +42,10 @@ RENDITION = DISTRIB
- 
- MAKEINFOFLAGS=-D$(RENDITION)
- 
-+tar.1: $(top_srcdir)/src/tar.c $(top_srcdir)/configure.ac
-+	$(HELP2MAN) --name "The GNU version of the tar archiving utility" \
-+	  -p tar $(TAR) > $(srcdir)/tar.1
-+
- header.texi: $(top_srcdir)/src/tar.h
- 	sed -f $(srcdir)/texify.sed $(top_srcdir)/src/tar.h \
- 	  | expand >$@
-Index: tar-1.25/Makefile.am
-===================================================================
---- tar-1.25.orig/Makefile.am
-+++ tar-1.25/Makefile.am
-@@ -20,7 +20,7 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = ChangeLog.1 Make.rules
--SUBDIRS = doc gnu lib rmt src scripts po tests
-+SUBDIRS = gnu lib rmt src doc scripts po tests
- 
- dist-hook:
- 	$(MAKE) changelog_dir=$(distdir) ChangeLog

tar.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Oct  5 11:38:57 UTC 2011 - sweet_f_a@gmx.de
+
+- minor portability fixes
+
+-------------------------------------------------------------------
+Thu Sep 29 11:32:04 UTC 2011 - sweet_f_a@gmx.de
+
+- spec cleaner, avoid some deprecated macros
+- fix non-utf8-spec-file
+- fix macro-in-comment
+- enable make check
+- remove upstream-fixed/obsolete patches (fortifysourcessigabrt,
+  disable-listed02-test, disable_languages)
+- call help2man inside specfile instead of paching tar's build chain
+
 -------------------------------------------------------------------
 Tue Mar 15 08:18:08 UTC 2011 - puzel@novell.com
 
@@ -391,7 +407,7 @@ Sun May 30 10:37:44 CEST 2004 - mmj@suse.de
 -------------------------------------------------------------------
 Thu Apr 15 20:45:11 CEST 2004 - mmj@suse.de
 
-- Fix detection of remote paths [#38709]. Thanks Jürgen!
+- Fix detection of remote paths [#38709]. Thanks Jürgen!
 
 -------------------------------------------------------------------
 Tue Apr 13 10:47:51 CEST 2004 - mmj@suse.de

tar.spec

@@ -16,6 +16,8 @@
 #
 
 
+# minimum suse version where the full featured package builds
+%define min_suse_ver 1010
 
 Name:           tar
 Version:        1.26
@@ -26,16 +28,14 @@ Url:            http://www.gnu.org/software/tar/
 Group:          System/Base
 Source0:        %{name}-%{version}.tar.bz2
 #
-Patch0:         tar-disable_languages.patch
-Patch1:         tar-disable-listed02-test.patch
-Patch2:         tar-manpage.patch
 Patch3:         tar-wildcards.patch
-Patch5:         tar-fortifysourcessigabrt.patch
 Patch6:         tar-backup-spec-fix-paths.patch
+%if 0%{?suse_version} >= %min_suse_ver
 BuildRequires:  help2man
-PreReq:         %install_info_prereq
+Recommends:     tar-lang = %{version}
-Recommends:     tar-lang = %version
 Recommends:     xz
+%endif
+Requires(pre):  info
 Provides:       base:/bin/tar
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _bindir  /bin
@@ -52,26 +52,19 @@ package.
 License:        GPLv3+
 Summary:        Backup scripts
 Group:          Productivity/Archiving/Backup
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}
 
 %description backup-scripts
 Shell scripts for system backup/restore
 
-%lang_package
+%{?lang_package}
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p1
-%patch5 -p1
 %patch6 -p1
 
 %build
-rm -f po/no.* po/ky.*
-#autoreconf -fi
-aclocal -I m4
-automake --force --add-missing
 %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter
 export CFLAGS="%{optflags} %my_cflags"
 export RSH="/usr/bin/rsh"
@@ -81,21 +74,21 @@ export RSH="/usr/bin/rsh"
 make %{?_smp_mflags};
 
 %check
-#%ifarch %arm
+make check
-#make check || true
-#%else
-#make check
-#%endif
 
 %install
-%make_install
+%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}}
+%if 0%{?suse_version} >= %min_suse_ver
+install -d -m 755 %{buildroot}/%{_mandir}/man1
+help2man ./src/tar --name "The GNU version of the tar archiving utility" -p tar \
+        | gzip -c > %{buildroot}/%{_mandir}/man1/tar.1.gz
+%endif
 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
 %find_lang %{name}
 
-%files lang -f %{name}.lang
-
 %files backup-scripts
 %defattr(-,root, root)
 %{_sbindir}/backup
@@ -105,12 +98,22 @@ rm -rf %{buildroot}%{_libexecdir}/rmt
 %dir %{_sysconfdir}/backup
 %config(noreplace) %{_sysconfdir}/backup/backup-specs
 
+%if 0%{?lang_package:1}
+
+%files lang -f %{name}.lang
+
 %files
+%else
+
+%files -f %{name}.lang
+%endif
 %defattr(-, root, root)
 %{_bindir}/tar
 %doc README* ABOUT-NLS AUTHORS COPYING NEWS THANKS ChangeLog TODO
-%{_infodir}/tar.info*.gz
+%{_infodir}/tar.info*
+%if 0%{?suse_version} >= %min_suse_ver
 %{_mandir}/man1/tar.1.gz
+%endif
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz