summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-07-22 08:00:04 +0200
committerRemi Collet <fedora@famillecollet.com>2016-07-22 08:00:04 +0200
commit74d763a15b99c9ee055e7e9cc0fe391a43b6bbac (patch)
tree0ac88732c2e8abd66b2bd823ba857c74c0380d21
parentc613f7b5211f8bf3e45dd4eba3d5aa41e08ec6c9 (diff)
gd(-last) 2.2.3
-rw-r--r--gd-2.2.1-initialize-full_filename.patch22
-rw-r--r--gd.spec11
2 files changed, 7 insertions, 26 deletions
diff --git a/gd-2.2.1-initialize-full_filename.patch b/gd-2.2.1-initialize-full_filename.patch
deleted file mode 100644
index 93dfab5..0000000
--- a/gd-2.2.1-initialize-full_filename.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a184630682c25e314979b459950ec6c81fa82a5f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
-Date: Fri, 20 May 2016 10:15:57 +0200
-Subject: [PATCH] Initialize full_filename in tests/gdimagefile/gdnametest.c
-
----
- tests/gdimagefile/gdnametest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/gdimagefile/gdnametest.c b/tests/gdimagefile/gdnametest.c
-index 2be648e..a339e69 100644
---- a/tests/gdimagefile/gdnametest.c
-+++ b/tests/gdimagefile/gdnametest.c
-@@ -84,7 +84,7 @@ do_test() {
- for (n = 0; names[n].nm; n++) {
- gdImagePtr orig, copy;
- int status;
-- char *full_filename;
-+ char *full_filename = NULL;
-
- /* Some image readers are buggy and crash the program so we
- * skip them. Bug fixers should remove these from the list of
diff --git a/gd.spec b/gd.spec
index 5b98bbe..1146198 100644
--- a/gd.spec
+++ b/gd.spec
@@ -24,8 +24,8 @@ Name: gd
%else
Name: gd-last
%endif
-Version: 2.2.2
-Release: 1%{?prever}%{?short}%{?dist}.1
+Version: 2.2.3
+Release: 1%{?prever}%{?short}%{?dist}
Group: System Environment/Libraries
License: MIT
URL: http://libgd.github.io/
@@ -38,7 +38,6 @@ Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/li
%endif
Patch1: gd-2.1.0-multilib.patch
-Patch2: gd-2.2.1-initialize-full_filename.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: freetype-devel
@@ -56,6 +55,7 @@ BuildRequires: zlib-devel
BuildRequires: pkgconfig
BuildRequires: libtool
BuildRequires: perl
+BuildRequires: perl-generators
%if "%{name}" != "gd-last"
Obsoletes: gd-last <= %{version}
@@ -119,12 +119,12 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
%prep
%setup -q -n libgd-%{version}%{?prever:-%{prever}}
%patch1 -p1 -b .mlib
-%patch2 -p1 -b .full_filename
: $(perl config/getver.pl)
# RHEL-5 auto* are too old
%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+sed -e 's/-Werror//' -i configure
%else
: regenerate autotool stuff
if [ -f configure ]; then
@@ -206,6 +206,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
%changelog
+* Fri Jul 22 2016 Remi Collet <remi@fedoraproject.org> - 2.2.3-1
+- Update to 2.2.3
+
* Tue Jun 28 2016 Remi Collet <remi@fedoraproject.org> - 2.2.2-1.1
- use -msse -mfpmath=sse build options (x86-32)