SPECS: GeoIP.spec - allow installation of GeoIP-db-Country

glen glen at pld-linux.org
Fri Jan 23 10:14:39 CET 2009


Author: glen                         Date: Fri Jan 23 09:14:39 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- allow installation of GeoIP-db-Country

---- Files affected:
SPECS:
   GeoIP.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/GeoIP.spec
diff -u SPECS/GeoIP.spec:1.40 SPECS/GeoIP.spec:1.41
--- SPECS/GeoIP.spec:1.40	Fri Jan 23 09:42:40 2009
+++ SPECS/GeoIP.spec	Fri Jan 23 10:14:34 2009
@@ -15,6 +15,7 @@
 BuildRequires:	libtool
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	GeoIP-db-Country >= 2008.12.02
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -101,6 +102,9 @@
 	DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/GeoIP.conf.default
 
+# use GeoIP-db-Country package, which is updated more often (at least in PLD Linux)
+rm -f $RPM_BUILD_ROOT%{_datadir}/GeoIP/GeoIP.dat
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -116,8 +120,11 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/libGeoIP.so.*.*.*
+%attr(755,root,root) %{_libdir}/libGeoIPUpdate.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libGeoIP.so.1
+%attr(755,root,root) %ghost %{_libdir}/libGeoIPUpdate.so.0
+%dir %{_datadir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
@@ -135,6 +142,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2009/01/23 09:14:34  glen
+- allow installation of GeoIP-db-Country
+
 Revision 1.40  2009/01/23 08:42:40  glen
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/GeoIP.spec?r1=1.40&r2=1.41&f=u



More information about the pld-cvs-commit mailing list