packages: php-pecl-geoip/php-pecl-geoip.spec, php-pecl-geoip/find_libgeoip....

[glen]

Author: glen                         Date: Mon Nov 14 08:27:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not find(1) /usr when searching for lib

---- Files affected:
packages/php-pecl-geoip:
   php-pecl-geoip.spec (1.20 -> 1.21) , find_libgeoip.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-pecl-geoip/php-pecl-geoip.spec
diff -u packages/php-pecl-geoip/php-pecl-geoip.spec:1.20 packages/php-pecl-geoip/php-pecl-geoip.spec:1.21
--- packages/php-pecl-geoip/php-pecl-geoip.spec:1.20	Mon Nov 14 09:25:12 2011
+++ packages/php-pecl-geoip/php-pecl-geoip.spec	Mon Nov 14 09:27:31 2011
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - this does find(1) for whole /usr: checking for LGPL compatible GeoIP libs... found 1004008
 %define		modname	geoip
 %define		status		status
 Summary:	%{modname} - Map IP address to geographic places
@@ -12,6 +10,7 @@
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{modname}-%{version}.tgz
 # Source0-md5:	65263ac6d1c335f22ce818b3253912a5
+Patch0:		find_libgeoip.patch
 URL:		http://pecl.php.net/package/geoip/
 BuildRequires:	GeoIP-devel
 BuildRequires:	php-devel >= 3:5.0.0
@@ -37,6 +36,7 @@
 %prep
 %setup -qc
 mv %{modname}-%{version}/* .
+%patch0 -p1
 
 sed -i -e 's,GEOIP_DIR/lib,GEOIP_DIR/%{_lib},g' config.m4
 
@@ -80,6 +80,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2011/11/14 08:27:31  glen
+- do not find(1) /usr when searching for lib
+
 Revision 1.20  2011/11/14 08:25:12  glen
 - up to 1.0.8
 

================================================================
Index: packages/php-pecl-geoip/find_libgeoip.patch
diff -u /dev/null packages/php-pecl-geoip/find_libgeoip.patch:1.1
--- /dev/null	Mon Nov 14 09:27:36 2011
+++ packages/php-pecl-geoip/find_libgeoip.patch	Mon Nov 14 09:27:31 2011
@@ -0,0 +1,18 @@
+fix lookup of "for LGPL compatible GeoIP libs
+
+the find is pretty heavy on builders:
+find /usr/lib/ -name libGeoIP.*.*.*.*
+
+just issue echo, as we know the library is not in subdir
+
+--- php-pecl-geoip-1.0.8/config.m4~	2011-11-14 09:52:06.000000000 +0200
++++ php-pecl-geoip-1.0.8/config.m4	2011-11-14 09:54:12.605545198 +0200
+@@ -83,7 +83,7 @@
+ 
+   # Check to see if we are using the LGPL library (version 1.4.0 and newer)
+   AC_MSG_CHECKING([for LGPL compatible GeoIP libs])
+-  libgeoip_full_version=`find $GEOIP_DIR/$PHP_LIBDIR/ -name libGeoIP.\*.\*.\*.\* | cut -d . -f 2-5 | sort`
++  libgeoip_full_version=`echo $GEOIP_DIR/$PHP_LIBDIR/libGeoIP.*.*.*.* | cut -d . -f 2-5 | sort`
+   for lines in $libgeoip_full_version; do
+     ac_IFS=$IFS
+     IFS="."
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pecl-geoip/php-pecl-geoip.spec?r1=1.20&r2=1.21&f=u