diff --git a/baselibs.conf b/baselibs.conf index 64ae206..4afe63c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,12 @@ -libgif6 - obsoletes "giflib- < " +libgif4 +# O/P on giflib added in 4.1.6. Once 4.1.7 is used, switch "<=" to "<". + obsoletes "giflib- <= " provides "giflib- = " + + obsoletes "libungif-" + provides "libungif-" + targettype 32bit provides "libungif.so.4" + targettype 64bit provides "libungif.so.4()(64bit)" giflib-devel requires -giflib- = - requires "libgif6- = " + requires "libgif4- = " diff --git a/giflib-4.1.6.tar.bz2 b/giflib-4.1.6.tar.bz2 new file mode 100644 index 0000000..4851a3a --- /dev/null +++ b/giflib-4.1.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed +size 506050 diff --git a/giflib-5.0.3.tar.bz2 b/giflib-5.0.3.tar.bz2 deleted file mode 100644 index 23cd327..0000000 --- a/giflib-5.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5642cc7ce79c5c4e4e37441d718f8dd11b7e12dd213ed5e3c872211a1d3f5f81 -size 629169 diff --git a/giflib-automake-1_13.patch b/giflib-automake-1_13.patch deleted file mode 100644 index 1bc8253..0000000 --- a/giflib-automake-1_13.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -5,11 +5,11 @@ AM_INIT_AUTOMAKE([gnu dist-bzip2 -Wall]) - dnl Make builds less verbose. Shuts off Makefile portability checks. - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - dnl Note: config.h is not used in the current build - dnl We leave this in place only to suppress an error message at autogen time --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([m4]) - - dnl Checks for programs. - AC_PROG_CC_STDC - AC_USE_SYSTEM_EXTENSIONS diff --git a/giflib-visibility.patch b/giflib-visibility.patch index d3f3b85..6bdd494 100644 --- a/giflib-visibility.patch +++ b/giflib-visibility.patch @@ -1,6 +1,6 @@ --- lib/gif_lib_private.h.orig +++ lib/gif_lib_private.h -@@ -29,6 +29,8 @@ gif_lib_private.h - internal giflib rout +@@ -30,6 +30,8 @@ #define IS_READABLE(Private) (Private->FileState & FILE_STATE_READ) #define IS_WRITEABLE(Private) (Private->FileState & FILE_STATE_WRITE) @@ -9,39 +9,60 @@ typedef struct GifFilePrivateType { GifWord FileState, FileHandle, /* Where all this data goes to! */ BitsPerPixel, /* Bits per pixel (Codes uses at least this + 1). */ -@@ -54,6 +56,7 @@ typedef struct GifFilePrivateType { - bool gif89; +@@ -55,5 +57,5 @@ typedef struct GifFilePrivateType { } GifFilePrivateType; + extern int _GifError; +- +#pragma GCC visibility pop #endif /* _GIF_LIB_PRIVATE_H */ +--- lib/getarg.h.orig ++++ lib/getarg.h +@@ -16,6 +16,8 @@ + #define CMD_ERR_NumRead 4 /* Failed on reading number. */ + #define CMD_ERR_AllSatis 5 /* Fail to satisfy (must-'!') option. */ - /* end */ ++#pragma GCC visibility push(hidden) ++ + #ifdef HAVE_STDARG_H + int GAGetArgs(int argc, char **argv, char *CtrlStr, ...); + #elif defined (HAVE_VARARGS_H) +@@ -25,4 +27,5 @@ int GAGetArgs(int va_alist, ...); + void GAPrintErrMsg(int Error); + void GAPrintHowTo(char *CtrlStr); + ++#pragma GCC visibility pop + #endif /* _GETARG_H */ --- lib/gif_hash.h.orig +++ lib/gif_hash.h -@@ -25,6 +25,8 @@ gif_hash.h - magfic constants and declar +@@ -47,6 +47,8 @@ #define HT_PUT_KEY(l) (l << 12) #define HT_PUT_CODE(l) (l & 0x0FFF) +#pragma GCC visibility push(hidden) + typedef struct GifHashTableType { - uint32_t HTable[HT_SIZE]; + UINT32 HTable[HT_SIZE]; } GifHashTableType; -@@ -34,6 +36,8 @@ void _ClearHashTable(GifHashTableType *H - void _InsertHashTable(GifHashTableType *HashTable, uint32_t Key, int Code); - int _ExistsHashTable(GifHashTableType *HashTable, uint32_t Key); +@@ -56,4 +58,6 @@ void _ClearHashTable(GifHashTableType *H + void _InsertHashTable(GifHashTableType *HashTable, UINT32 Key, int Code); + int _ExistsHashTable(GifHashTableType *HashTable, UINT32 Key); +#pragma GCC visibility pop + #endif /* _GIF_HASH_H_ */ - - /* end */ +--- Makefile.am.orig ++++ Makefile.am +@@ -1,3 +1,4 @@ ++ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = lib util doc pic + WINDOWS = $(top_srcdir)/windows/GifWin.cpp \ + $(top_srcdir)/windows/GifWin.h \ --- configure.ac.orig +++ configure.ac -@@ -8,11 +8,14 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R - dnl Note: config.h is not used in the current build - dnl We leave this in place only to suppress an error message at autogen time +@@ -3,11 +3,14 @@ AC_INIT(giflib, [4.1.6], [abadger1999@so + AC_CONFIG_SRCDIR([lib/dgif_lib.c]) + AM_INIT_AUTOMAKE([gnu check-news dist-bzip2 -Wall]) AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR([m4]) @@ -56,3 +77,13 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +--- lib/Makefile.am.orig ++++ lib/Makefile.am +@@ -21,6 +21,6 @@ libgif_la_SOURCES = dev2gif.c \ + quantize.c \ + gif_lib_private.h + +-libgif_la_LDFLAGS = -version-info 5:6:1 ++libgif_la_LDFLAGS = -no-undefined -version-info 5:6:1 + libgif_la_LIBADD = @DEVS@ + libgif_CFLAGS = $(X_CFLAGS) $(AM_CFLAGS) diff --git a/giflib.changes b/giflib.changes index 2c3da1f..8d9df5b 100644 --- a/giflib.changes +++ b/giflib.changes @@ -1,34 +1,3 @@ -------------------------------------------------------------------- -Sat Mar 2 10:13:17 UTC 2013 - seife+obs@b1-systems.com - -- add giflib-automake-1_13.patch, fix build with automake-1.13.1 - -------------------------------------------------------------------- -Fri Jan 11 22:13:53 UTC 2013 - jengelh@inai.de - -- Remove "Obsoletes: giflib", because libgif6 must not obsolete - libgif4 (it would do that by way of libgif4's "Provides: giflib"). - -------------------------------------------------------------------- -Fri Jan 4 15:02:09 UTC 2013 - jengelh@inai.de - -- Adjust baselibs.conf for libgif6, remove libungif rpm symbols - since they are now no longer provided. - -------------------------------------------------------------------- -Sun Dec 30 22:31:28 UTC 2012 - crrodriguez@opensuse.org - -- Version 5.0.3 -* The library is now purely reentrant and thread-safe -* Adds an EGifSetGifVersion() entry point -* All names of exported functions now have a Gif, DGif, or EGif prefix. - -- packaging changes: -* soname is now libgif6 -* Compatibility with ancient "libungif" via rpm spec file hacks - is no longer included, if there is any application around - that still requires this it has to be fixed. - ------------------------------------------------------------------- Sun Feb 5 16:23:36 UTC 2012 - jengelh@medozas.de diff --git a/giflib.spec b/giflib.spec index 4a67f1f..5bd2a0a 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ # # spec file for package giflib # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -17,9 +17,16 @@ Name: giflib -%define lname libgif6 +%define lname libgif4 +BuildRequires: libtool +BuildRequires: xorg-x11-libICE-devel +BuildRequires: xorg-x11-libSM-devel +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXau-devel +BuildRequires: xorg-x11-libXdmcp-devel +BuildRequires: xorg-x11-libXt-devel Url: http://sourceforge.net/projects/giflib -Version: 5.0.3 +Version: 4.1.6 Release: 0 Summary: A Library for Working with GIF Images License: MIT @@ -28,14 +35,6 @@ Source: giflib-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch: giflib-visibility.patch -Patch1: giflib-automake-1_13.patch -BuildRequires: libtool >= 2 -BuildRequires: xorg-x11-libICE-devel -BuildRequires: xorg-x11-libSM-devel -BuildRequires: xorg-x11-libX11-devel -BuildRequires: xorg-x11-libXau-devel -BuildRequires: xorg-x11-libXdmcp-devel -BuildRequires: xorg-x11-libXt-devel %description This Library allows manipulating GIF Image files. Since the LZW patents @@ -44,10 +43,21 @@ have expired, giflib can again be used instead of libungif. %package -n %lname Summary: A Library for Working with GIF Images Group: System/Libraries +Obsoletes: giflib < %version-%release +Provides: giflib = %version-%release # bug437293 %ifarch ppc64 Obsoletes: giflib-64bit +Obsoletes: libungif-64bit %endif +# +Provides: libungif +%ifarch ia64 x86_64 s390x ppc64 +Provides: libungif.so.4()(64bit) +%else +Provides: libungif.so.4 +%endif +Obsoletes: libungif %description -n %lname This Library allows manipulating GIF Image files. Since the LZW patents @@ -78,9 +88,7 @@ have expired, giflib can again be used instead of libungif. %prep %setup -q -# LT_INIT requires libtool >= 2 %patch -%patch1 -p1 %build # USE __TIMESTAMP__ instead of __DATE__ , __TIME__ @@ -95,13 +103,18 @@ done mkdir m4;autoreconf -fiv %configure --disable-static --with-pic --x-libraries=%{_libdir} -make %{?_smp_mflags} V=1 +make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT +chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so.* +ln -sf libgif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so.%{version} +ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so.4 +ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so #ln -sf libgif.a $RPM_BUILD_ROOT%{_libdir}/libungif.a rm -f %{buildroot}%{_libdir}/*.la find doc -name "Makefile*" -print -delete +nm -C -D %{buildroot}%{_libdir}/lib*.so %post -n %lname -p /sbin/ldconfig