- do not find(1) /usr when searching for lib

Changed files:
    find_libgeoip.patch -> 1.1
    php-pecl-geoip.spec -> 1.21

diff --git a/find_libgeoip.patch b/find_libgeoip.patch
new file mode 100644 (file)
index 0000000..54bc25c
--- /dev/null
+++ b/find_libgeoip.patch
@@ -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="."

diff --git a/php-pecl-geoip.spec b/php-pecl-geoip.spec
index 504ba1d5a51a5696ce1082a1b11f06ae0c9d9e01..9b8792f10821acb17fbe4724e37aa0ee9115f79f 100644 (file)
--- a/php-pecl-geoip.spec
+++ b/php-pecl-geoip.spec
@@ -1,5 +1,3 @@
-# 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
@@ -11,6 +9,7 @@ License:       PHP 3.01
 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
@@ -36,6 +35,7 @@ To rozszerzenie ma w PECL status: %{status}.
 %prep
 %setup -qc
 mv %{modname}-%{version}/* .
+%patch0 -p1
 
 sed -i -e 's,GEOIP_DIR/lib,GEOIP_DIR/%{_lib},g' config.m4