SPECS: horde.spec - removed Source2: GeoIP.dat.gz - added R: GeoIP

[paszczus]

Author: paszczus                     Date: Tue Oct 25 08:29:57 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed Source2: GeoIP.dat.gz
- added R: GeoIP

---- Files affected:
SPECS:
   horde.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.113 SPECS/horde.spec:1.114
--- SPECS/horde.spec:1.113	Mon Oct 24 23:40:58 2005
+++ SPECS/horde.spec	Tue Oct 25 10:29:51 2005
@@ -28,8 +28,6 @@
 Source0:	ftp://ftp.horde.org/pub/horde/%{_hordeapp}-%{version}-%{_rc}.tar.gz
 # Source0-md5:	cdf8ee374372a1f1171a673fd582d2a3
 Source1:	%{name}.conf
-Source2:	http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz
-# Source2-md5:	2125f413a975859ab6495fb2cb45f11f
 Patch0:		%{name}-path.patch
 Patch1:		%{name}-shell.disabled.patch
 Patch2:		%{name}-util-h3.patch
@@ -42,6 +40,7 @@
 BuildRequires:	tar >= 1:1.15.1
 Requires(triggerpostun):	grep
 Requires(triggerpostun):	sed >= 4.0
+Requires:	GeoIP
 Requires:	apache >= 1.3.33-3
 Requires:	apache(mod_access)
 Requires:	apache(mod_alias)
@@ -167,9 +166,6 @@
 ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
 install %{SOURCE1} 		$RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf
 
-# MaxMind GeoIP Hostname Country lookup
-install %{SOURCE2}		$RPM_BUILD_ROOT/var/lib/horde/
-
 > $RPM_BUILD_ROOT/var/log/horde/%{_hordeapp}.log
 
 install scripts/ldap/horde.schema $RPM_BUILD_ROOT%{schemadir}
@@ -202,8 +198,8 @@
 
 NOTE: You don't need SQL database for Auhtorization if You use LDAP for authorization.
 
-If you want to use MaxMind GeoIP Hostname Country lookup do 'gunzip /var/lib/horde/GeoIP.dat.gz'
-and enable this function in horde configuration.
+If you want to use MaxMind GeoIP Hostname Country lookup do go to : 
+Configuration -> Horde -> Hostname->Country Lookup and set GeoIP.dat path to: /usr/share/GeoIP/GeoIP.dat
 
 EOF
 # '
@@ -331,7 +327,6 @@
 %dir %attr(770,root,http) /var/log/horde
 %dir %attr(770,root,http) /var/lib/horde
 %ghost %attr(770,root,http) /var/log/horde/%{_hordeapp}.log
-%attr(640,root,http) /var/lib/horde/GeoIP.dat.gz
 
 %files -n openldap-schema-horde
 %defattr(644,root,root,755)
@@ -343,6 +338,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2005/10/25 08:29:51  paszczus
+- removed Source2: GeoIP.dat.gz
+- added R: GeoIP
+
 Revision 1.113  2005/10/24 21:40:58  glen
 - optional sql2xml is still actual. registry paths are once again patched
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.113&r2=1.114&f=u