From 987553b38ad42260ed716212cd9e48ae58dbe668 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jun 26 2013 14:20:16 +0000 Subject: update to 2.1.0 final --- diff --git a/.gitignore b/.gitignore index 48c0e65..1150b94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +gd.spec~ +clog gd-2.0.35.tar.bz2 /libgd-2.1.0-725ba9de4005144d137d2a7a70f760068fc3d306.tgz +/libgd-2.1.0.tar.xz diff --git a/gd.spec b/gd.spec index 4583ed2..e1c0b70 100644 --- a/gd.spec +++ b/gd.spec @@ -1,11 +1,11 @@ #global prever rc2 -%global commit 725ba9de4005144d137d2a7a70f760068fc3d306 -%global short %(c=%{commit}; echo ${c:0:7}) +#global commit 725ba9de4005144d137d2a7a70f760068fc3d306 +#global short %(c=%{commit}; echo ${c:0:7}) Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.1.0 -Release: 0.2.%{?prever}%{?short}%{?dist} +Release: 1%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.bitbucket.org/ @@ -74,7 +74,13 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %setup -q -n libgd-%{version}%{?prever:-%{prever}} %patch1 -p1 -b .mlib -# (re)generate autotool stuff +# https://bitbucket.org/libgd/gd-libgd/issue/77 +sed -e '/GD_VERSION_STRING/s/-alpha//' \ + -e '/GD_EXTRA_VERSION/s/alpha//' \ + -i src/gd.h +grep VERSION src/gd.h + +: regenerate autotool stuff if [ -f configure ]; then autoreconf -fi else @@ -92,6 +98,7 @@ CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\ /usr/share/fonts/liberation\"'" %configure \ + --with-vpx=%{_prefix} \ --with-tiff=%{_prefix} \ --disable-rpath make %{?_smp_mflags} @@ -129,6 +136,9 @@ make check %changelog +* Tue Jun 25 2013 Remi Collet - 2.1.0-1 +- update to 2.1.0 final + * Tue Jun 25 2013 Remi Collet - 2.1.0-0.2.725ba9d - rebuild for linpng 1.6 diff --git a/sources b/sources index d14fc85..9b5e5cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15e0f2eeb0fd2bc98d6794dc0ffe2d9a libgd-2.1.0-725ba9de4005144d137d2a7a70f760068fc3d306.tgz +03588159bf4faab9079849c8d709acc6 libgd-2.1.0.tar.xz