From d7a604e87021ad0ee9b7c5e09d9877b776b49762a6e19fc77a87b87b8ae21ef8 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 30 May 2012 14:18:12 +0000 Subject: [PATCH 1/2] Accepting request 122909 from home:rudi_m:branches:Base:System - avoid automake dependency OBS-URL: https://build.opensuse.org/request/show/122909 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=37 --- tar.changes | 5 +++++ tar.spec | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tar.changes b/tar.changes index 6d8c4c2..8ba7ce4 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 30 13:08:28 UTC 2012 - sweet_f_a@gmx.de + +- avoid automake dependency + ------------------------------------------------------------------- Fri Apr 20 19:55:01 UTC 2012 - crrodriguez@opensuse.org diff --git a/tar.spec b/tar.spec index e0440d1..f69fda9 100644 --- a/tar.spec +++ b/tar.spec @@ -32,7 +32,6 @@ Patch3: tar-wildcards.patch Patch6: tar-backup-spec-fix-paths.patch Patch7: tar-1.26-remove_O_NONBLOCK.patch %if 0%{?suse_version} >= %min_suse_ver -BuildRequires: automake BuildRequires: help2man Recommends: tar-lang = %{version} Recommends: xz @@ -71,9 +70,8 @@ Shell scripts for system backup/restore export CFLAGS="%{optflags} %my_cflags" export RSH="/usr/bin/rsh" export DEFAULT_ARCHIVE_FORMAT="POSIX" -sed -i -e 's@need runtime check@yes@g' m4/*.m4 -autoreconf -fiv %configure \ + gl_cv_func_linkat_follow="yes" \ --enable-backup-scripts \ --disable-silent-rules make %{?_smp_mflags}; From 17f4d259c8b0869887e970ddde50739da1a8b92ac7a64a97847b5bc22d40aa8c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 17 Jul 2012 09:35:28 +0000 Subject: [PATCH 2/2] Accepting request 128098 from home:a_jaeger:FactoryFix Fix build failure with glibc 2.16 OBS-URL: https://build.opensuse.org/request/show/128098 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=38 --- tar-1.26-stdio.in.patch | 13 +++++++++++++ tar.changes | 5 +++++ tar.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 tar-1.26-stdio.in.patch diff --git a/tar-1.26-stdio.in.patch b/tar-1.26-stdio.in.patch new file mode 100644 index 0000000..c7a9ca1 --- /dev/null +++ b/tar-1.26-stdio.in.patch @@ -0,0 +1,13 @@ +diff -urNp tar-1.26-orig/gnu/stdio.in.h tar-1.26/gnu/stdio.in.h +--- tar-1.26-orig/gnu/stdio.in.h ++++ tar-1.26/gnu/stdio.in.h +@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/tar.changes b/tar.changes index 8ba7ce4..effc324 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 17 08:05:33 UTC 2012 - aj@suse.de + +- Fix build failure with undefined gets (glibc 2.16). + ------------------------------------------------------------------- Wed May 30 13:08:28 UTC 2012 - sweet_f_a@gmx.de diff --git a/tar.spec b/tar.spec index f69fda9..125a5ab 100644 --- a/tar.spec +++ b/tar.spec @@ -31,6 +31,7 @@ Source0: %{name}-%{version}.tar.bz2 Patch3: tar-wildcards.patch Patch6: tar-backup-spec-fix-paths.patch Patch7: tar-1.26-remove_O_NONBLOCK.patch +Patch8: tar-1.26-stdio.in.patch %if 0%{?suse_version} >= %min_suse_ver BuildRequires: help2man Recommends: tar-lang = %{version} @@ -64,6 +65,7 @@ Shell scripts for system backup/restore %patch3 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter