Accepting request 180938 from home:jengelh:branches:devel:libraries:c_c++

- Update to new upstream release 5.0.4

OBS-URL: https://build.opensuse.org/request/show/180938
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/giflib?expand=0&rev=27

giflib-5.0.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5642cc7ce79c5c4e4e37441d718f8dd11b7e12dd213ed5e3c872211a1d3f5f81
-size 629169

giflib-5.0.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c78b2834256fcb7ff703d0d2153f965dc296f8e059de1fc635aba1042b00bba
+size 629190

giflib-visibility.patch

@@ -1,24 +1,34 @@
---- lib/gif_lib_private.h.orig
-+++ lib/gif_lib_private.h
-@@ -29,6 +29,8 @@ gif_lib_private.h - internal giflib rout
- #define IS_READABLE(Private)    (Private->FileState & FILE_STATE_READ)
- #define IS_WRITEABLE(Private)   (Private->FileState & FILE_STATE_WRITE)
+---
+ configure.ac          |    7 +++++--
+ lib/gif_hash.h        |    4 ++++
+ lib/gif_lib_private.h |    3 +++
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+Index: giflib-5.0.4/configure.ac
+===================================================================
+--- giflib-5.0.4.orig/configure.ac
++++ giflib-5.0.4/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
+ AM_CONFIG_HEADER(config.h)
++AC_CONFIG_MACRO_DIR([m4])
  
-+#pragma GCC visibility push(hidden)
-+
- 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;
- } GifFilePrivateType;
- 
-+#pragma GCC visibility pop
- #endif /* _GIF_LIB_PRIVATE_H */
- 
- /* end */
---- lib/gif_hash.h.orig
-+++ lib/gif_hash.h
+ dnl Checks for programs.
+-AC_PROG_LIBTOOL
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AC_PROG_CPP
++LT_INIT([pic-only disable-static])
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+Index: giflib-5.0.4/lib/gif_hash.h
+===================================================================
+--- giflib-5.0.4.orig/lib/gif_hash.h
++++ giflib-5.0.4/lib/gif_hash.h
 @@ -25,6 +25,8 @@ gif_hash.h - magfic constants and declar
  #define HT_PUT_KEY(l)	(l << 12)
  #define HT_PUT_CODE(l)	(l & 0x0FFF)
@@ -37,22 +47,24 @@
  #endif /* _GIF_HASH_H_ */
  
  /* end */
---- 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
- AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_MACRO_DIR([m4])
+Index: giflib-5.0.4/lib/gif_lib_private.h
+===================================================================
+--- giflib-5.0.4.orig/lib/gif_lib_private.h
++++ giflib-5.0.4/lib/gif_lib_private.h
+@@ -29,6 +29,8 @@ gif_lib_private.h - internal giflib rout
+ #define IS_READABLE(Private)    (Private->FileState & FILE_STATE_READ)
+ #define IS_WRITEABLE(Private)   (Private->FileState & FILE_STATE_WRITE)
  
- dnl Checks for programs.
--AC_PROG_LIBTOOL
--AC_PROG_CC
-+AC_PROG_CC_STDC
-+AC_USE_SYSTEM_EXTENSIONS
-+AC_SYS_LARGEFILE
- AC_PROG_CPP
-+LT_INIT([pic-only disable-static])
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
++#pragma GCC visibility push(hidden)
++
+ 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;
+ } GifFilePrivateType;
+ 
++#pragma GCC visibility pop
+ #endif /* _GIF_LIB_PRIVATE_H */
+ 
+ /* end */

giflib.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jun 26 00:43:20 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 5.0.4
+* Fix for a rare misrendering bug when a GIF overruns the
+  decompression-code table.
+- Make patches have -p1, as requested by
+  http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+
 -------------------------------------------------------------------
 Wed Mar 27 08:31:44 UTC 2013 - mmeister@suse.com
 

giflib.spec

@@ -18,17 +18,20 @@
 
 Name:           giflib
 %define lname	libgif6
-Url:            http://sourceforge.net/projects/giflib
-Version:        5.0.3
+Version:        5.0.4
 Release:        0
 Summary:        A Library for Working with GIF Images
 License:        MIT
-Group:          System/Libraries
-Source:         http://downloads.sourceforge.net/project/%{name}/%{name}-5.x/%{name}-%{version}.tar.bz2
+Group:          Development/Libraries/C and C++
+Url:            http://giflib.sf.net/
+
+#Git-Clone:	git://git.code.sf.net/p/giflib/code
+#Freecode-URL:	http://freecode.com/projects/giflib
+Source:         http://downloads.sf.net/giflib/%name-%version.tar.bz2
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch:          giflib-visibility.patch
-Patch1:         giflib-automake-1_13.patch
+Patch1:         giflib-visibility.patch
+Patch2:         giflib-automake-1_13.patch
 BuildRequires:  libtool >= 2
 BuildRequires:  xorg-x11-libICE-devel
 BuildRequires:  xorg-x11-libSM-devel
@@ -79,8 +82,7 @@ have expired, giflib can again be used instead of libungif.
 %prep
 %setup -q
 # LT_INIT requires libtool >= 2
-%patch
-%patch1 -p1
+%patch -P 1 -P 2 -p1
 
 %build
 # USE __TIMESTAMP__ instead of __DATE__ , __TIME__
@@ -114,12 +116,12 @@ find doc -name "Makefile*" -print -delete
 
 %files devel
 %defattr(-,root,root)
-/usr/include/gif_lib.h
+%_includedir/gif_lib.h
 %{_libdir}/lib*.so
 
 %files progs
 %defattr(-,root,root)
 %doc COPYING NEWS README doc
-/usr/bin/*
+%_bindir/*
 
 %changelog