Author: glen Date: Mon Nov 15 15:50:22 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use system geoip database
---- Files affected:
packages/php-pear-Net_GeoIP:
php-pear-Net_GeoIP.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/php-pear-Net_GeoIP/php-pear-Net_GeoIP.spec
diff -u packages/php-pear-Net_GeoIP/php-pear-Net_GeoIP.spec:1.6
packages/php-pear-Net_GeoIP/php-pear-Net_GeoIP.spec:1.7
--- packages/php-pear-Net_GeoIP/php-pear-Net_GeoIP.spec:1.6 Sun Aug 22
10:51:17 2010
+++ packages/php-pear-Net_GeoIP/php-pear-Net_GeoIP.spec Mon Nov 15 16:50:17 2010
@@ -1,7 +1,5 @@
# $Revision$, $Date$
%include /usr/lib/rpm/macros.php
-%define _class Net
-%define _subclass GeoIP
%define _status beta
%define _pearname Net_GeoIP
%define subver RC3
@@ -21,6 +19,7 @@
BuildRequires: rpmbuild(macros) >= 1.300
Requires: php-common >= 3:5.0.0
Requires: php-pear
+Suggests: GeoIP-db-Country
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,13 +38,16 @@
%prep
%pear_package_setup
+# use system db
+rm .%{php_pear_dir}/data/Net_GeoIP/data/GeoIP.dat
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{php_pear_dir}
%pear_package_install
-# don't care for tests
-rm -rf $RPM_BUILD_ROOT%{php_pear_dir}/tests/%{_pearname}
+# tests should not be packaged
+%{__rm} -r $RPM_BUILD_ROOT%{php_pear_dir}/tests/%{_pearname}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -57,14 +59,15 @@
%{php_pear_dir}/Net/GeoIP.php
%{php_pear_dir}/Net/GeoIP
-%{php_pear_dir}/data/%{_pearname}
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2010/11/15 15:50:17 glen
+- use system geoip database
+
Revision 1.6 2010/08/22 08:51:17 glen
- ensure rpmbuild macros present
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-Net_GeoIP/php-pear-Net_GeoIP.spec?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
