[packages/libgphoto2] - ac fix for gd 2.1 - rel 3

baggins baggins at pld-linux.org
Thu Feb 26 20:03:53 CET 2015


commit 4036b373c65f05f143f9c6be4b7b4ac06ed86119
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Feb 26 20:03:33 2015 +0100

    - ac fix for gd 2.1
    - rel 3

 gd-2.1.patch    | 11 +++++++++++
 libgphoto2.spec |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/libgphoto2.spec b/libgphoto2.spec
index 189de8c..24aad09 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -12,13 +12,14 @@ Summary(pl.UTF-8):	Biblioteki obsługi kamer cyfrowych
 Summary(pt_BR.UTF-8):	GNU Photo - programa GNU para câmeras digitais
 Name:		libgphoto2
 Version:	2.5.4
-Release:	2
+Release:	3
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
 # Source0-md5:	4f549a8600228a27f547d47ca1a97f09
 Patch0:		%{name}-mode-owner-group.patch
 Patch1:		%{name}-pl.po-update.patch
+Patch2:		gd-2.1.patch
 URL:		http://www.gphoto.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -26,7 +27,7 @@ BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	bison
 BuildRequires:	dbus-devel >= 0.31
 BuildRequires:	flex
-BuildRequires:	gd-devel >= 2.0
+BuildRequires:	gd-devel >= 2.1
 BuildRequires:	gettext-tools >= 0.14.1
 %{?with_apidocs:BuildRequires:	gtk-doc >= 0.10}
 BuildRequires:	libexif-devel >= 1:0.6.13
@@ -169,6 +170,7 @@ w przestrzeni użytkownika.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__rm} po/stamp-po libgphoto2_port/po/stamp-po
 
diff --git a/gd-2.1.patch b/gd-2.1.patch
new file mode 100644
index 0000000..eb0200c
--- /dev/null
+++ b/gd-2.1.patch
@@ -0,0 +1,11 @@
+--- /home/users/baggins/devel/PLD/rpm/BUILD/libgphoto2-2.5.4/configure.ac~	2014-03-23 18:38:18.000000000 +0100
++++ /home/users/baggins/devel/PLD/rpm/BUILD/libgphoto2-2.5.4/configure.ac	2015-02-26 20:01:07.265114858 +0100
+@@ -285,7 +285,7 @@
+ dnl ---------------------------------------------------------------------------
+ dnl check for libgd
+ dnl ---------------------------------------------------------------------------
+-GP_CHECK_LIBRARY([LIBGD],[libgd],[>= 2.0],[gd.h],[gdImageCreateTrueColor],[],[],[default-on],[http://www.libgd.org/])
++GP_CHECK_LIBRARY([LIBGD],[gdlib],[>= 2.0],[gd.h],[gdImageCreateTrueColor],[],[],[default-on],[http://www.libgd.org/])
+ GP_CONFIG_MSG([libGD conversion support],[${have_LIBGD}])
+ 
+ dnl ---------------------------------------------------------------------------
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgphoto2.git/commitdiff/4036b373c65f05f143f9c6be4b7b4ac06ed86119



More information about the pld-cvs-commit mailing list