- updated to 0.4.6

- removed obsolete giflib patch

diff --git a/pslib-giflib.patch b/pslib-giflib.patch
deleted file mode 100644 (file)
index cb1739b..0000000
--- a/pslib-giflib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- pslib-0.4.5/src/pslib.c.orig       2011-03-29 11:12:25.000000000 +0200
-+++ pslib-0.4.5/src/pslib.c    2014-02-01 16:48:19.912189358 +0100
-@@ -4906,13 +4906,13 @@
-               }
-               memset(psimage, 0, sizeof(PSImage));
- 
--              if ((gft = DGifOpenFileName(filename)) == NULL) {
-+              if ((gft = DGifOpenFileName(filename, NULL)) == NULL) {
-                       ps_error(psdoc, PS_RuntimeError, _("%s is not a gif file!"), filename);
-                       fclose(fp);
-                       return(0);
-               }
-               if (DGifSlurp(gft) != GIF_OK) {
--                      ps_error(psdoc, PS_RuntimeError, _("Error %d while reading gif file!"), GifLastError());
-+                      ps_error(psdoc, PS_RuntimeError, _("Error %d while reading gif file!"), gft->Error);
-                       fclose(fp);
-                       return(0);
-     }
-@@ -4939,7 +4939,7 @@
- 
-               if(NULL == (psimage->palette = psdoc->malloc(psdoc, sizeof(PSColor) * numcolors, _("Allocate memory for color palette.")))) {
-                       ps_error(psdoc, PS_MemoryError, _("Could not allocate memory for color palette."));
--                      DGifCloseFile(gft);
-+                      DGifCloseFile(gft, NULL);
-                       psdoc->free(psdoc, psimage);
-                       fclose(fp);
-                       return(0);
-@@ -4964,7 +4964,7 @@
-               psimage->length = psimage->width * psimage->height;
-               if(NULL == (psimage->data = psdoc->malloc(psdoc, psimage->length, _("Allocate memory for image data.")))) {
-                       ps_error(psdoc, PS_MemoryError, _("Could not allocate memory for image data."));
--                      DGifCloseFile(gft);
-+                      DGifCloseFile(gft, NULL);
-                       psdoc->free(psdoc, psimage->palette);
-                       psdoc->free(psdoc, psimage);
-                       fclose(fp);
-@@ -4998,7 +4998,7 @@
-                       memcpy(psimage->data, dataptr, psimage->length);
-               }
- 
--              DGifCloseFile(gft);
-+              DGifCloseFile(gft, NULL);
- 
-       } else
- #endif /* HAVE_LIBGIF */

diff --git a/pslib.spec b/pslib.spec
index a64966b9ba04d521baa774547b7dc21f31e38ea1..474fc279bc6390a66d424825c59c76d717563b20 100644 (file)
--- a/pslib.spec
+++ b/pslib.spec
@@ -1,13 +1,12 @@
 Summary:       The pslib C-library to create PostScript on the fly
 Summary(pl.UTF-8):     Biblioteka do generowania w locie plików PostScript
 Name:          pslib
-Version:       0.4.5
-Release:       8
+Version:       0.4.6
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/pslib/%{name}-%{version}.tar.gz
-# Source0-md5: 03f39393628a6d758799b9f845047e27
-Patch0:                %{name}-giflib.patch
+# Source0-md5: 64ca84f1832f1d01e163c510c28bc6a9
 URL:           http://pslib.sourceforge.net/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
@@ -15,7 +14,7 @@ BuildRequires:        docbook-to-man
 BuildRequires: docbook-utils
 BuildRequires: gettext-tools
 BuildRequires: giflib-devel >= 5
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= 2.0
 BuildRequires: intltool
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -67,7 +66,6 @@ Statyczna biblioteka pslib.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}