- updated to 4.2.3 (latest 4.x release)

- removed obsolete segfault, format-security patches
- urt/rle and few other rare formats conversion support is gone

diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644 (file)
index a604a64..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,336 +0,0 @@
-diff -ur giflib-4.1.6.orig/util/gif2epsn.c giflib-4.1.6/util/gif2epsn.c
---- giflib-4.1.6.orig/util/gif2epsn.c  2007-11-10 19:46:31.000000000 +0100
-+++ giflib-4.1.6/util/gif2epsn.c       2012-12-12 13:25:38.930805507 +0100
-@@ -146,7 +146,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gif2ps.c giflib-4.1.6/util/gif2ps.c
---- giflib-4.1.6.orig/util/gif2ps.c    2007-11-10 19:46:31.000000000 +0100
-+++ giflib-4.1.6/util/gif2ps.c 2012-12-12 13:25:50.657471760 +0100
-@@ -129,7 +129,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gif2rgb.c giflib-4.1.6/util/gif2rgb.c
---- giflib-4.1.6.orig/util/gif2rgb.c   2007-11-10 19:46:31.000000000 +0100
-+++ giflib-4.1.6/util/gif2rgb.c        2012-12-12 13:26:03.160804652 +0100
-@@ -108,7 +108,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gif2rle.c giflib-4.1.6/util/gif2rle.c
---- giflib-4.1.6.orig/util/gif2rle.c   2012-12-12 13:24:53.480807110 +0100
-+++ giflib-4.1.6/util/gif2rle.c        2012-12-12 13:28:54.604131937 +0100
-@@ -103,7 +103,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gif2x11.c giflib-4.1.6/util/gif2x11.c
---- giflib-4.1.6.orig/util/gif2x11.c   2007-11-10 19:46:31.000000000 +0100
-+++ giflib-4.1.6/util/gif2x11.c        2012-12-12 13:29:00.424131733 +0100
-@@ -143,7 +143,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifasm.c giflib-4.1.6/util/gifasm.c
---- giflib-4.1.6.orig/util/gifasm.c    2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifasm.c 2012-12-12 13:26:18.684137438 +0100
-@@ -98,7 +98,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifbg.c giflib-4.1.6/util/gifbg.c
---- giflib-4.1.6.orig/util/gifbg.c     2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifbg.c  2012-12-12 13:26:29.064137071 +0100
-@@ -130,7 +130,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifclip.c giflib-4.1.6/util/gifclip.c
---- giflib-4.1.6.orig/util/gifclip.c   2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifclip.c        2012-12-12 13:26:47.164136433 +0100
-@@ -92,7 +92,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifclrmp.c giflib-4.1.6/util/gifclrmp.c
---- giflib-4.1.6.orig/util/gifclrmp.c  2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifclrmp.c       2012-12-12 13:28:42.594132361 +0100
-@@ -111,7 +111,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifcolor.c giflib-4.1.6/util/gifcolor.c
---- giflib-4.1.6.orig/util/gifcolor.c  2005-10-10 08:22:22.000000000 +0200
-+++ giflib-4.1.6/util/gifcolor.c       2012-12-12 13:28:35.667465940 +0100
-@@ -89,7 +89,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifcomb.c giflib-4.1.6/util/gifcomb.c
---- giflib-4.1.6.orig/util/gifcomb.c   2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifcomb.c        2012-12-12 13:26:55.544136137 +0100
-@@ -93,7 +93,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/giffix.c giflib-4.1.6/util/giffix.c
---- giflib-4.1.6.orig/util/giffix.c    2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/giffix.c 2012-12-12 13:27:03.770802514 +0100
-@@ -90,7 +90,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifflip.c giflib-4.1.6/util/gifflip.c
---- giflib-4.1.6.orig/util/gifflip.c   2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifflip.c        2012-12-12 13:27:30.344134910 +0100
-@@ -104,7 +104,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifhisto.c giflib-4.1.6/util/gifhisto.c
---- giflib-4.1.6.orig/util/gifhisto.c  2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifhisto.c       2012-12-12 13:27:34.234134772 +0100
-@@ -112,7 +112,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifinfo.c giflib-4.1.6/util/gifinfo.c
---- giflib-4.1.6.orig/util/gifinfo.c   2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifinfo.c        2012-12-12 13:27:38.400801292 +0100
-@@ -104,7 +104,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       printf("Format: quoted text string used for formating of information\n");
-       printf("  Special characters for various information can be used\n");
-diff -ur giflib-4.1.6.orig/util/gifinter.c giflib-4.1.6/util/gifinter.c
---- giflib-4.1.6.orig/util/gifinter.c  2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifinter.c       2012-12-12 13:27:41.084134531 +0100
-@@ -98,7 +98,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifinto.c giflib-4.1.6/util/gifinto.c
---- giflib-4.1.6.orig/util/gifinto.c   2005-10-10 08:22:22.000000000 +0200
-+++ giflib-4.1.6/util/gifinto.c        2012-12-12 13:27:43.884134432 +0100
-@@ -96,7 +96,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifovly.c giflib-4.1.6/util/gifovly.c
---- giflib-4.1.6.orig/util/gifovly.c   2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifovly.c        2012-12-12 13:27:46.730800998 +0100
-@@ -73,7 +73,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifpos.c giflib-4.1.6/util/gifpos.c
---- giflib-4.1.6.orig/util/gifpos.c    2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifpos.c 2012-12-12 13:27:49.477467568 +0100
-@@ -90,7 +90,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifrotat.c giflib-4.1.6/util/gifrotat.c
---- giflib-4.1.6.orig/util/gifrotat.c  2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifrotat.c       2012-12-12 13:27:51.697467490 +0100
-@@ -117,7 +117,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifrsize.c giflib-4.1.6/util/gifrsize.c
---- giflib-4.1.6.orig/util/gifrsize.c  2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifrsize.c       2012-12-12 13:27:54.127467404 +0100
-@@ -113,7 +113,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/giftext.c giflib-4.1.6/util/giftext.c
---- giflib-4.1.6.orig/util/giftext.c   2007-11-10 05:28:56.000000000 +0100
-+++ giflib-4.1.6/util/giftext.c        2012-12-12 13:28:03.927467058 +0100
-@@ -102,7 +102,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/gifwedge.c giflib-4.1.6/util/gifwedge.c
---- giflib-4.1.6.orig/util/gifwedge.c  2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/gifwedge.c       2012-12-12 13:28:06.577466965 +0100
-@@ -94,7 +94,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/icon2gif.c giflib-4.1.6/util/icon2gif.c
---- giflib-4.1.6.orig/util/icon2gif.c  2005-10-10 08:22:22.000000000 +0200
-+++ giflib-4.1.6/util/icon2gif.c       2012-12-12 13:28:09.410800198 +0100
-@@ -94,7 +94,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/raw2gif.c giflib-4.1.6/util/raw2gif.c
---- giflib-4.1.6.orig/util/raw2gif.c   2005-10-10 08:22:22.000000000 +0200
-+++ giflib-4.1.6/util/raw2gif.c        2012-12-12 13:28:12.040800106 +0100
-@@ -118,7 +118,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/rgb2gif.c giflib-4.1.6/util/rgb2gif.c
---- giflib-4.1.6.orig/util/rgb2gif.c   2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/rgb2gif.c        2012-12-12 13:28:14.757466676 +0100
-@@ -111,7 +111,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/rle2gif.c giflib-4.1.6/util/rle2gif.c
---- giflib-4.1.6.orig/util/rle2gif.c   2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/rle2gif.c        2012-12-12 13:28:18.377466549 +0100
-@@ -105,7 +105,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }
-diff -ur giflib-4.1.6.orig/util/text2gif.c giflib-4.1.6/util/text2gif.c
---- giflib-4.1.6.orig/util/text2gif.c  2005-10-10 08:22:23.000000000 +0200
-+++ giflib-4.1.6/util/text2gif.c       2012-12-12 13:28:24.270799674 +0100
-@@ -107,7 +107,7 @@
-     }
- 
-     if (HelpFlag) {
--      fprintf(stderr, VersionStr);
-+      fprintf(stderr, "%s", VersionStr);
-       GAPrintHowTo(CtrlStr);
-       exit(EXIT_SUCCESS);
-     }

diff --git a/giflib-segfault.patch b/giflib-segfault.patch
deleted file mode 100644 (file)
index 7b4da35..0000000
--- a/giflib-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- giflib-4.1.6/util/gif2rle.c~       2007-11-10 19:46:31.000000000 +0100
-+++ giflib-4.1.6/util/gif2rle.c        2009-04-08 16:26:05.000000000 +0200
-@@ -73,7 +73,7 @@
-     ColorMapSize = 0,
-     InterlacedOffset[] = { 0, 4, 2, 1 }, /* The way Interlaced image should. */
-     InterlacedJumps[] = { 8, 8, 4, 2 };    /* be read - offsets and jumps... */
--static GifColorType
-+static ColorMapObject
-     *ColorMap;
- 
- static void DumpScreen2Rle(GifRowType *ScreenBuffer,

diff --git a/giflib.spec b/giflib.spec
index aa153e494e3f4c876848e4fa2f419c65622b20d4..c56ecb978b4f9785581c0ad6b0df1a222086befe 100644 (file)
--- a/giflib.spec
+++ b/giflib.spec
@@ -9,17 +9,13 @@ 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.1.6
-Release:       5
+Version:       4.2.3
+Release:       1
 License:       MIT-like
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/giflib/%{name}-%{version}.tar.bz2
-# Source0-md5: 7125644155ae6ad33dbc9fc15a14735f
-Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/libungif-man-pages.tar.bz2
-# Source1-md5: 580c50403ed8f7e678ed04b3e0d712f3
+# Source0-md5: be1f5749c24644257a88c9f42429343d
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-segfault.patch
-Patch2:                format-security.patch
 URL:           http://sourceforge.net/projects/giflib/
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
@@ -27,7 +23,7 @@ BuildRequires:        libtool
 BuildRequires: netpbm-devel
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed
-BuildRequires: urt-devel
+BuildRequires: xmlto
 %{?with_x:BuildRequires:       xorg-lib-libX11-devel}
 %ifarch %{x8664} ia64 ppc64 s390x sparc64
 Provides:      libungif.so.4()(64bit)
@@ -70,7 +66,7 @@ Summary(ru.UTF-8):    Хедеры, библиотеки и документаци
 Summary(uk.UTF-8):     Хедери, бібліотеки та документація GIF-бібліотеки
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      xorg-lib-libX11-devel
+%{?with_x:Requires:    xorg-lib-libX11-devel}
 Provides:      libungif-devel
 Obsoletes:     libungif-devel
 Obsoletes:     libungif4-devel
@@ -156,8 +152,6 @@ GIF.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -175,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
 cd $RPM_BUILD_ROOT%{_libdir}
 /sbin/ldconfig -n .
 ln -sf libgif.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libungif.so
@@ -182,10 +179,6 @@ 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
 
-install -d $RPM_BUILD_ROOT%{_mandir}
-bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/{README.libungif-man-pages,patch}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -201,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/*.{txt,png} doc/{gif_lib,index,liberror}.html
+%doc doc/*.txt doc/{gif_lib,intro,liberror}.html
 %attr(755,root,root) %{_libdir}/libgif.so
 %attr(755,root,root) %{_libdir}/libungif.so
 %{_libdir}/libgif.la
@@ -215,16 +208,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files progs
 %defattr(644,root,root,755)
-%doc doc/gif2* doc/gif[a-z]* doc/*2gif*
 %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}/rle2gif
 %attr(755,root,root) %{_bindir}/text2gif
 %{_mandir}/man1/gif*.1*
 %{_mandir}/man1/icon2gif.1*
 %{_mandir}/man1/raw2gif.1*
 %{_mandir}/man1/rgb2gif.1*
-%{_mandir}/man1/rle2gif.1*
 %{_mandir}/man1/text2gif.1*