Accepting request 546173 from devel:libraries:c_c++

- Keep timestamps before patch updates them to fix build-compare

- Added fix-autoconf11.patch for fixing build with older autoconf,
  requires for SLE11.

OBS-URL: https://build.opensuse.org/request/show/546173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/giflib?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger 2017-12-03 09:07:58 +00:00 committed by Git OBS Bridge
commit 6168a000b1
3 changed files with 31 additions and 2 deletions

12
fix-autoconf11.patch Normal file
View File

@ -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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jul 5 05:38:23 UTC 2017 - bwiedemann@suse.com
- Keep timestamps before patch updates them to fix build-compare
-------------------------------------------------------------------
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

View File

@ -1,7 +1,7 @@
#
# spec file for package giflib
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -29,6 +29,7 @@ Source2: baselibs.conf
Patch1: giflib-visibility.patch
Patch2: giflib-automake-1_13.patch
Patch3: giflib-CVE-2016-3977.patch
Patch4: fix-autoconf11.patch
BuildRequires: libtool >= 2
BuildRequires: xorg-x11-libICE-devel
BuildRequires: xorg-x11-libSM-devel
@ -70,15 +71,20 @@ have expired, giflib can again be used instead of libungif.
%prep
%setup -q
for file in `find util -name "*.c"`; do
touch -r $file $file.stamp
done
%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
# file modification time
for file in `find util -name "*.c"`; do
touch -r $file $file.stamp;
sed -i -e s@'__DATE__ ", " __TIME__'@__TIMESTAMP__@g $file;
touch -r $file.stamp $file;
rm -v $file.stamp