|
@@ -4,13 +4,10 @@
|
|
|
Summary: A graphics library for drawing .png files.
|
|
|
Summary(ja): PNGイメージファイルを描写するためのグラフィックライブラリ
|
|
|
Name: gd
|
|
|
-Version: 2.1.1
|
|
|
-Release: 2%{_dist_release}
|
|
|
+Version: 2.2.1
|
|
|
+Release: 1%{_dist_release}
|
|
|
Source0: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}.tar.xz
|
|
|
Patch0: gd-2.1.0-multilib.patch
|
|
|
-#Patch1: gd-fixautoconf.patch
|
|
|
-Patch100: gd-2.1.0-fonts-vine.patch
|
|
|
-Patch1000: 2bb97f407c1145c850416a3bfbcc8cf124e68a19.patch
|
|
|
License: BSD-style
|
|
|
URL: http://www.libgd.org/
|
|
|
Group: System Environment/Libraries
|
|
@@ -146,16 +143,6 @@ If you're installing the gd graphics library, you must install gd-devel.
|
|
|
%prep
|
|
|
%setup -q -n libgd-%{version}
|
|
|
%patch0 -p1 -b .mlib
|
|
|
-#%patch1 -p1 -b .automake
|
|
|
-%patch100 -p1 -b .fonts-vine
|
|
|
-
|
|
|
-%patch1000 -p1 -b .CVE-2016-3074
|
|
|
-
|
|
|
-# 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
|
|
@@ -169,14 +156,19 @@ fi
|
|
|
%build
|
|
|
# Provide a correct default font search path
|
|
|
CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
|
|
|
-/usr/share/fonts/TrueType-vlgothic:\
|
|
|
-/usr/share/fonts/bitstream-vera:\
|
|
|
-/usr/share/fonts/dejavu:\
|
|
|
-/usr/share/fonts/default/Type1:\
|
|
|
-/usr/share/X11/fonts/Type1:\
|
|
|
-/usr/share/fonts/liberation\"'"
|
|
|
+/usr/share/fonts/alias/TrueType/:\
|
|
|
+/usr/share/fonts/TrueType-vlgothic/:\
|
|
|
+/usr/share/fonts/bitstream-vera/:\
|
|
|
+/usr/share/fonts/TrueType-dejavu/:\
|
|
|
+/usr/share/fonts/TrueType-ipafont/:\
|
|
|
+/usr/share/fonts/TrueType-ipaexfont/:\
|
|
|
+/usr/share/fonts/default/Type1/:\
|
|
|
+/usr/share/X11/fonts/Type1/:\
|
|
|
+/usr/share/fonts/TrueType-linux-liberation/\
|
|
|
+\"'"
|
|
|
|
|
|
%configure CPPFLAGS="-DHAVE_ICONV -DHAVE_STDARG_H -DHAVE_ERRNO_H" \
|
|
|
+ --with-freetype \
|
|
|
--with-tiff=%{_prefix} \
|
|
|
%if %{with libvpx}
|
|
|
--with-vpx=%{_prefix} \
|
|
@@ -190,6 +182,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
|
|
|
## remove unuse files
|
|
|
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
|
|
|
|
|
+%check
|
|
|
+
|
|
|
+make %{?_smp_mflags} check
|
|
|
+
|
|
|
%clean
|
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
|
|
|
|
|
@@ -228,6 +224,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Wed May 25 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.1-1
|
|
|
+- new upstream release.
|
|
|
+- removed Patch1000 (fixed in upstream).
|
|
|
+
|
|
|
* Wed May 4 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.1-2
|
|
|
- added Patch1000 to fix CVE-2016-3074.
|
|
|
|