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

- Adjust baselibs.conf for libgif6, remove libungif rpm symbols
  since they are now no longer provided.

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

baselibs.conf

@@ -1,12 +1,6 @@
-libgif4
+libgif6
-# O/P on giflib added in 4.1.6. Once 4.1.7 is used, switch "<=" to "<".
+  obsoletes "giflib-<targettype> < <version>"
-  obsoletes "giflib-<targettype> <= <version>"
   provides "giflib-<targettype> = <version>"
-
-  obsoletes "libungif-<targettype>"
-  provides  "libungif-<targettype>"
-  targettype 32bit provides "libungif.so.4"
-  targettype 64bit provides "libungif.so.4()(64bit)"
 giflib-devel
   requires -giflib-<targettype> = <version>
-  requires "libgif4-<targettype> = <version>"
+  requires "libgif6-<targettype> = <version>"

giflib.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

giflib.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package giflib
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -18,13 +18,6 @@
 
 Name:           giflib
 %define lname	libgif6
-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
 Release:        0
@@ -35,6 +28,13 @@ Source:         giflib-%{version}.tar.bz2
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch:          giflib-visibility.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
@@ -43,16 +43,13 @@ have expired, giflib can again be used instead of libungif.
 %package -n %lname
 Summary:        A Library for Working with GIF Images
 Group:          System/Libraries
+# O/P added for openSUSE_12.1
 Obsoletes:      giflib < %version-%release
 Provides:       giflib = %version-%release
 # bug437293
 %ifarch ppc64
 Obsoletes:      giflib-64bit
-Obsoletes:      libungif-64bit
 %endif
-#
-Provides:       libungif
-Obsoletes:      libungif
 
 %description -n %lname
 This Library allows manipulating GIF Image files. Since the LZW patents
@@ -83,6 +80,7 @@ have expired, giflib can again be used instead of libungif.
 
 %prep
 %setup -q
+# LT_INIT requires libtool >= 2
 %patch
 
 %build