From f7b7c89c3d9a47467837250b953607f62413fadd71153d0836c91f3a5ebefc15 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 15 Mar 2011 09:21:35 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/tar revision 33.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=18e8639b6b09823f1327e643550a5885 --- tar.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tar.spec b/tar.spec index 57b77ad..d4978e0 100644 --- a/tar.spec +++ b/tar.spec @@ -1,7 +1,7 @@ # -# spec file for package tar (Version 1.26) +# spec file for package tar # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,7 +19,7 @@ Name: tar Version: 1.26 -Release: 2 +Release: 1 License: GPLv3+ Summary: GNU implementation of tar ((t)ape (ar)chiver) Url: http://www.gnu.org/software/tar/ From fec3f970c16d44f946f33b0fd21f7973a403ef618b6c6ab48d1d19cbed7d0467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Tue, 4 Oct 2011 11:53:30 +0000 Subject: [PATCH 2/3] Accepting request 85438 from home:rudi_m:branches:Base:System This supersedes sr85301, doing a major instead of minor cleanup, see changelog. Further notes on the removed patches: fortifysourcessigabrt, fixed in upstream 065cf095 disable-listed02-test, why ever the test has been disabled in past now it works fine tar-disable_languages, regarding the comments inside the patch it's time to drop it manpage, call help2man from specfile instead of patching tar's build chain to avoid depending on autotools OBS-URL: https://build.opensuse.org/request/show/85438 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=26 --- tar-disable-listed02-test.patch | 12 ----------- tar-disable_languages.patch | 14 ------------ tar-fortifysourcessigabrt.patch | 26 ---------------------- tar-manpage.patch | 38 --------------------------------- tar.changes | 13 ++++++++++- tar.spec | 30 ++++++++------------------ 6 files changed, 21 insertions(+), 112 deletions(-) delete mode 100644 tar-disable-listed02-test.patch delete mode 100644 tar-disable_languages.patch delete mode 100644 tar-fortifysourcessigabrt.patch delete mode 100644 tar-manpage.patch diff --git a/tar-disable-listed02-test.patch b/tar-disable-listed02-test.patch deleted file mode 100644 index adb5d0e..0000000 --- a/tar-disable-listed02-test.patch +++ /dev/null @@ -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]) diff --git a/tar-disable_languages.patch b/tar-disable_languages.patch deleted file mode 100644 index f7fe21c..0000000 --- a/tar-disable_languages.patch +++ /dev/null @@ -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 diff --git a/tar-fortifysourcessigabrt.patch b/tar-fortifysourcessigabrt.patch deleted file mode 100644 index 2ed813f..0000000 --- a/tar-fortifysourcessigabrt.patch +++ /dev/null @@ -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: diff --git a/tar-manpage.patch b/tar-manpage.patch deleted file mode 100644 index 90b75b0..0000000 --- a/tar-manpage.patch +++ /dev/null @@ -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 diff --git a/tar.changes b/tar.changes index 1aee109..58c2a0e 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 +402,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 diff --git a/tar.spec b/tar.spec index d4978e0..f053bc7 100644 --- a/tar.spec +++ b/tar.spec @@ -26,15 +26,11 @@ 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 BuildRequires: help2man -PreReq: %install_info_prereq -Recommends: tar-lang = %version +Requires(pre): info +Recommends: tar-lang = %{version} Recommends: xz Provides: base:/bin/tar BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,26 +48,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 %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,14 +70,13 @@ export RSH="/usr/bin/rsh" make %{?_smp_mflags}; %check -#%ifarch %arm -#make check || true -#%else -#make check -#%endif +make check %install -%make_install +%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}} +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 install -d -m 755 %{buildroot}%{_sysconfdir}/backup install -D -m 644 scripts/backup-specs %{buildroot}%{_sysconfdir}/backup/backup-specs rm -rf %{buildroot}%{_libexecdir}/rmt From 1a0ddee82e065d4e4d8f49f4694c9a59b1e659cd206debc0d9f625d125b161c9 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 10 Oct 2011 18:44:15 +0000 Subject: [PATCH 3/3] Accepting request 86660 from home:rudi_m:branches:Base:System minor portability fixes OBS-URL: https://build.opensuse.org/request/show/86660 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=27 --- tar.changes | 5 +++++ tar.spec | 25 ++++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/tar.changes b/tar.changes index 58c2a0e..55a0e1c 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/tar.spec b/tar.spec index f053bc7..237ba0d 100644 --- a/tar.spec +++ b/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 @@ -28,10 +30,12 @@ Source0: %{name}-%{version}.tar.bz2 # Patch3: tar-wildcards.patch Patch6: tar-backup-spec-fix-paths.patch +%if 0%{?suse_version} >= %min_suse_ver BuildRequires: help2man -Requires(pre): info Recommends: tar-lang = %{version} Recommends: xz +%endif +Requires(pre): info Provides: base:/bin/tar BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _bindir /bin @@ -53,8 +57,8 @@ Requires: %{name} = %{version} %description backup-scripts Shell scripts for system backup/restore +%{?lang_package} -%lang_package %prep %setup -q %patch3 -p1 @@ -74,16 +78,17 @@ make check %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 @@ -93,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