[packages/giflib] - updated to 5.0.5 (note: new soname; most less usefull progs are gone); giflib 4.x available on g

qboosh qboosh at pld-linux.org
Thu Jan 23 21:32:42 CET 2014 

commit 0cc3cc7b7b84360d52f163210cf9b1918cdce194
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jan 23 21:33:57 2014 +0100

    - updated to 5.0.5 (note: new soname; most less usefull progs are gone);
      giflib 4.x available on giflib-4 branch or as giflib4 package
    - removed obsolete link patch
    - removed libungif.so.4 compatibility stuff (only libungif.so and libungif.a symlinks left)

 giflib-link.patch | 11 ---------
 giflib.spec       | 67 +++++++++++++++++++++++++------------------------------
 2 files changed, 30 insertions(+), 48 deletions(-)
---
diff --git a/giflib.spec b/giflib.spec
index c56ecb9..75b64d6 100644
--- a/giflib.spec
+++ b/giflib.spec
@@ -1,7 +1,3 @@
-#
-# Conditional build:
-%bcond_without	x	# without X11
-#
 Summary:	GIF-manipulation library
 Summary(es.UTF-8):	Biblioteca de manipulación de archivos GIF
 Summary(pl.UTF-8):	Biblioteka do obróbki plików GIF
@@ -9,13 +5,12 @@ Summary(pt_BR.UTF-8):	Biblioteca de manipulação de arquivos GIF
 Summary(ru.UTF-8):	Библиотека для работы с GIF-файлами
 Summary(uk.UTF-8):	Бібліотека для роботи з GIF-файлами
 Name:		giflib
-Version:	4.2.3
+Version:	5.0.5
 Release:	1
 License:	MIT-like
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/giflib/%{name}-%{version}.tar.bz2
-# Source0-md5:	be1f5749c24644257a88c9f42429343d
-Patch0:		%{name}-link.patch
+# Source0-md5:	c3262ba0a3dad31ba876fb5ba1d71a02
 URL:		http://sourceforge.net/projects/giflib/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
@@ -24,15 +19,6 @@ BuildRequires:	netpbm-devel
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	sed
 BuildRequires:	xmlto
-%{?with_x:BuildRequires:	xorg-lib-libX11-devel}
-%ifarch %{x8664} ia64 ppc64 s390x sparc64
-Provides:	libungif.so.4()(64bit)
-%else
-Provides:	libungif.so.4
-%endif
-Provides:	libungif
-Obsoletes:	libungif
-Obsoletes:	libungif4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -66,10 +52,9 @@ Summary(ru.UTF-8):	Хедеры, библиотеки и документаци
 Summary(uk.UTF-8):	Хедери, бібліотеки та документація GIF-бібліотеки
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-%{?with_x:Requires:	xorg-lib-libX11-devel}
 Provides:	libungif-devel
+Obsoletes:	giflib4-devel
 Obsoletes:	libungif-devel
-Obsoletes:	libungif4-devel
 
 %description devel
 Libraries and headers needed for developing programs that use libgif
@@ -105,6 +90,7 @@ Summary(uk.UTF-8):	Статичні бібліотеки GIF-бібліотек
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Provides:	libungif-static
+Obsoletes:	giflib4-static
 Obsoletes:	libungif-static
 
 %description static
@@ -133,6 +119,7 @@ Summary(uk.UTF-8):	Програми для конвертування та об
 Group:		Applications/Graphics
 Requires:	%{name} = %{version}-%{release}
 Provides:	libungif-progs
+Obsoletes:	giflib4-progs
 Obsoletes:	libungif-progs
 
 %description progs
@@ -151,7 +138,6 @@ GIF.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -160,7 +146,8 @@ GIF.
 %{__autoconf}
 %{__automake}
 %configure \
-	%{!?with_x:--disable-x11}
+	--disable-silent-rules
+
 %{__make}
 
 %install
@@ -171,13 +158,12 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 cp -p doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+# these are unpackged examples
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{gifbg,gifcolor,gifhisto,gifwedge}.1
 
 cd $RPM_BUILD_ROOT%{_libdir}
-/sbin/ldconfig -n .
 ln -sf libgif.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libungif.so
-ln -sf libgif.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libungif.so.4
 ln -sf libgif.a $RPM_BUILD_ROOT%{_libdir}/libungif.a
-ln -sf libgif.la $RPM_BUILD_ROOT%{_libdir}/libungif.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -189,16 +175,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libgif.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgif.so.4
-%attr(755,root,root) %{_libdir}/libungif.so.4
+%attr(755,root,root) %ghost %{_libdir}/libgif.so.6
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/*.txt doc/{gif_lib,intro,liberror}.html
+%doc doc/*.txt doc/{gif_lib,intro}.html doc/whatsinagif
 %attr(755,root,root) %{_libdir}/libgif.so
 %attr(755,root,root) %{_libdir}/libungif.so
 %{_libdir}/libgif.la
-%{_libdir}/libungif.la
 %{_includedir}/gif_lib.h
 
 %files static
@@ -208,13 +192,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gif*
-%attr(755,root,root) %{_bindir}/icon2gif
-%attr(755,root,root) %{_bindir}/raw2gif
-%attr(755,root,root) %{_bindir}/rgb2gif
-%attr(755,root,root) %{_bindir}/text2gif
-%{_mandir}/man1/gif*.1*
-%{_mandir}/man1/icon2gif.1*
-%{_mandir}/man1/raw2gif.1*
-%{_mandir}/man1/rgb2gif.1*
-%{_mandir}/man1/text2gif.1*
+%attr(755,root,root) %{_bindir}/gif2raw
+%attr(755,root,root) %{_bindir}/gif2rgb
+%attr(755,root,root) %{_bindir}/gifbuild
+%attr(755,root,root) %{_bindir}/gifclrmp
+%attr(755,root,root) %{_bindir}/gifecho
+%attr(755,root,root) %{_bindir}/giffix
+%attr(755,root,root) %{_bindir}/gifinto
+%attr(755,root,root) %{_bindir}/giftext
+%attr(755,root,root) %{_bindir}/giftool
+%{_mandir}/man1/gif2raw.1*
+%{_mandir}/man1/gif2rgb.1*
+%{_mandir}/man1/gifbuild.1*
+%{_mandir}/man1/gifclrmp.1*
+%{_mandir}/man1/gifecho.1*
+%{_mandir}/man1/giffix.1*
+%{_mandir}/man1/gifinto.1*
+%{_mandir}/man1/giflib.1*
+%{_mandir}/man1/giftext.1*
+%{_mandir}/man1/giftool.1*
diff --git a/giflib-link.patch b/giflib-link.patch
deleted file mode 100644
index c31ec8d..0000000
--- a/giflib-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- giflib-4.1.6/configure.ac~	2009-04-08 14:28:01.000000000 +0200
-+++ giflib-4.1.6/configure.ac	2009-04-08 14:29:23.000000000 +0200
-@@ -54,7 +54,7 @@
- if test "x$enable_x11" != "xno" ; then
-   AC_PATH_XTRA
-   AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],
--    AC_CHECK_LIB(X11, main, [X11_LIB="${X11_LIB} ${X_PRE_LIBS} $X_LIBS ${X_EXTRA_LIBS} -lX11"
-+    AC_CHECK_LIB(X11, main, [X11_LIB="${X11_LIB} $X_LIBS ${X_EXTRA_LIBS} -lX11"
-                  AC_DEFINE(HAVE_LIBX11, [1], [Define if the X11 library is installed])
-                  COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2x11${EXEEXT}"],, $X_LIBS))
- fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/giflib.git/commitdiff/0cc3cc7b7b84360d52f163210cf9b1918cdce194

More information about the pld-cvs-commit mailing list