X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GeoIP.spec;h=d83b53edcb117e73f8c673dfd929513b2768f46f;hb=4c9fcd03b0616906362380b307b8ace902064fc2;hp=dfa18e94c36872b00e66335a5756135901b5f8e0;hpb=c19aad1f9c2b6bbae6a36b0ad3272fa7b36742a2;p=packages%2FGeoIP.git

diff --git a/GeoIP.spec b/GeoIP.spec
index dfa18e9..d83b53e 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -1,19 +1,22 @@
 Summary:	Library to find what country an IP address or hostnames originate from
 Summary(pl.UTF-8):	Biblioteka do sprawdzenia z jakiego kraju pochodzi adres IP lub domena
 Name:		GeoIP
-Version:	1.4.3
+Version:	1.5.1
 Release:	1
 License:	GPL v2
 Group:		Libraries
 Source0:	http://www.maxmind.com/download/geoip/api/c/%{name}-%{version}.tar.gz
-# Source0-md5:	d364ec127a1092749d589a79001f2d8c
+# Source0-md5:	36b82f3558e6e2ebdd11a56c5db21dbc
+Patch0:		%{name}-no_tests.patch
+Patch1:		%{name}-pc.patch
 # note: "c" is a filename, do not add '/'
 URL:		http://www.maxmind.com/app/c
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	GeoIP-db-Country >= 2009.05.02
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -82,6 +85,8 @@ Statyczna biblioteka GeoIP.
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -98,7 +103,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/GeoIP.conf.default
+
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/GeoIP.conf.default
+
+# use GeoIP-db-Country package, which is updated more often (at least in PLD Linux)
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/GeoIP/GeoIP.dat
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,21 +118,32 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/geoiplookup
+%attr(755,root,root) %{_bindir}/geoiplookup6
+%attr(755,root,root) %{_bindir}/geoipupdate
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/GeoIP.conf
-%{_mandir}/man1/*
+%{_mandir}/man1/geoiplookup.1*
+%{_mandir}/man1/geoiplookup6.1*
+%{_mandir}/man1/geoipupdate.1*
 
 %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) %ghost %{_libdir}/libGeoIP.so.1
+%attr(755,root,root) %{_libdir}/libGeoIPUpdate.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libGeoIPUpdate.so.0
+%dir %{_datadir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libGeoIP.so
+%attr(755,root,root) %{_libdir}/libGeoIPUpdate.so
+%{_libdir}/libGeoIP.la
+%{_libdir}/libGeoIPUpdate.la
+%{_includedir}/GeoIP*.h
+%{_pkgconfigdir}/geoip.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libGeoIP.a
+%{_libdir}/libGeoIPUpdate.a