From d8246ea50ca4c6d541dfa03e3579cd06012f999a51775d1f0f1817f350e47653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 21 Sep 2011 17:03:25 +0000 Subject: [PATCH] Accepting request 84155 from home:jengelh:bl-new Implement shlib naming (libgif4), and a little grammar update in %descr. OBS-URL: https://build.opensuse.org/request/show/84155 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/giflib?expand=0&rev=9 --- baselibs.conf | 8 ++++++- giflib.changes | 8 +++++++ giflib.spec | 65 ++++++++++++++++++++------------------------------ 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 0a9edf4..4afe63c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,12 @@ -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 "libgif4- = " diff --git a/giflib.changes b/giflib.changes index 41564ce..01f1d9f 100644 --- a/giflib.changes +++ b/giflib.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 21 10:59:15 UTC 2011 - jengelh@medozas.de + +- Correct project URL +- Implement shlib naming (libgif4) +- Apply packaging guidelines (remove redundant/obsolete + tags/sections from specfile, etc.) + ------------------------------------------------------------------- Sun Aug 29 23:15:24 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/giflib.spec b/giflib.spec index a0c917b..37661a2 100644 --- a/giflib.spec +++ b/giflib.spec @@ -15,24 +15,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: giflib +%define lname libgif4 BuildRequires: xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXt-devel License: MIT Group: System/Libraries -Url: http://sourceforge.net/projects/libungif -AutoReqProv: on +URL: http://sourceforge.net/projects/libungif +Version: 4.1.6 +Release: 23 +Summary: A Library for Working with GIF Images +Source: giflib-%{version}.tar.bz2 +Source2: baselibs.conf +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +This Library allows manipulating GIF Image files. Since the LZW patents +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 # -Version: 4.1.6 -Release: 23 -Summary: A Library for Working with GIF Images Provides: libungif %ifarch ia64 x86_64 s390x ppc64 Provides: libungif.so.4()(64bit) @@ -40,44 +52,26 @@ Provides: libungif.so.4()(64bit) Provides: libungif.so.4 %endif Obsoletes: libungif -Source: giflib-%{version}.tar.bz2 -Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%description +%description -n %lname This Library allows manipulating GIF Image files. Since the LZW patents -have expired, giflib can be used instead of libungif again. - - - -Authors: --------- - Toshio Kuratomi - Eric S. Raymond +have expired, giflib can again be used instead of libungif. %package progs License: MIT Summary: Tools for Working with the GIF Library Group: Productivity/Graphics/Convertors -AutoReqProv: on Provides: ungif Obsoletes: ungif %description progs A tool for converting GIFs to various formats. - - -Authors: --------- - Toshio Kuratomi - Eric S. Raymond - %package devel License: MIT Summary: Library for Working with GIF Images - Files Mandatory for Development Group: Development/Libraries/C and C++ -Requires: %name = %version +Requires: %lname = %version # bug437293 %ifarch ppc64 Obsoletes: giflib-devel-64bit @@ -86,14 +80,7 @@ Obsoletes: giflib-devel-64bit %description devel This Library allows manipulating GIF Image files. Since the LZW patents -have expired, giflib can be used instead of libungif again. - - - -Authors: --------- - Toshio Kuratomi - Eric S. Raymond +have expired, giflib can again be used instead of libungif. %prep %setup -q @@ -111,7 +98,7 @@ done autoreconf -fiv %configure --disable-static --with-pic --x-libraries=%{_libdir} -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT @@ -123,11 +110,11 @@ ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so rm -f %{buildroot}%{_libdir}/*.la find doc -name "Makefile*" -print -delete -%post -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files +%files -n %lname %defattr(-,root,root) %doc COPYING %{_libdir}/lib*.so.*