From 48dcef1b259f560158429499c0bb9581469298059308df92892df5f5b52378ee Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 17 May 2016 13:45:03 +0000 Subject: [PATCH] Accepting request 395209 from home:susnux:branches:devel:libraries:c_c++ This will fix the SLE_11_SP? build, as long as SLE11 is added as build repository this will reduce build failures. No need to forward to factory. OBS-URL: https://build.opensuse.org/request/show/395209 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/giflib?expand=0&rev=44 --- fix-autoconf11.patch | 12 ++++++++++++ giflib.changes | 6 ++++++ giflib.spec | 7 +++++++ 3 files changed, 25 insertions(+) create mode 100644 fix-autoconf11.patch diff --git a/fix-autoconf11.patch b/fix-autoconf11.patch new file mode 100644 index 0000000..cb8f3d5 --- /dev/null +++ b/fix-autoconf11.patch @@ -0,0 +1,12 @@ +diff -Nur giflib-5.1.4/configure.ac new/configure.ac +--- giflib-5.1.4/configure.ac 2016-05-13 17:43:01.232661891 +0200 ++++ new/configure.ac 2016-05-13 17:42:47.136471014 +0200 +@@ -12,7 +12,7 @@ + AC_CONFIG_MACRO_DIR([m4]) + + dnl Checks for programs. +-AM_PROG_AR ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AC_PROG_CC_STDC + AC_USE_SYSTEM_EXTENSIONS + AC_SYS_LARGEFILE diff --git a/giflib.changes b/giflib.changes index 9695fbe..a7d237f 100644 --- a/giflib.changes +++ b/giflib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 13 15:50:28 UTC 2016 - rpm@fthiessen.de + +- Added fix-autoconf11.patch for fixing build with older autoconf, + requires for SLE11. + ------------------------------------------------------------------- Tue Apr 12 08:34:44 UTC 2016 - fstrba@suse.com diff --git a/giflib.spec b/giflib.spec index dce38aa..562ae3c 100644 --- a/giflib.spec +++ b/giflib.spec @@ -29,6 +29,10 @@ Source2: baselibs.conf Patch1: giflib-visibility.patch Patch2: giflib-automake-1_13.patch Patch3: giflib-CVE-2016-3977.patch +%if 0%{?suse_version} <= 1110 +#SLE11 +Patch4: fix-autoconf11.patch +%endif BuildRequires: libtool >= 2 BuildRequires: xorg-x11-libICE-devel BuildRequires: xorg-x11-libSM-devel @@ -73,6 +77,9 @@ have expired, giflib can again be used instead of libungif. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%if 0%{?suse_version} <= 1110 +%patch4 -p1 +%endif # USE __TIMESTAMP__ instead of __DATE__ , __TIME__ # this change is pointless unless we preserve the original