Changes - j0ke.net Open Build Service

[-] [+]	Changed	GeoIP.spec
@@ -10,6 +10,9 @@ # norootforbuild %define pkgname GeoIP +%define updatepkgname geoipupdate +%define updatepkgver 2.2.1 + Name: GeoIP Version: 1.6.5 Release: 10 @@ -25,6 +28,7 @@ Source: http://www.maxmind.com/download/geoip/api/c/%{pkgname}-%{version}.tar.bz2 Source1: LICENSE.txt Source2: GeoIP.dat.gz +Source3: %{updatepkgname}-%{updatepkgver}.tar.bz2 # Summary: Library to find the country that any IP address originates from @@ -97,8 +101,8 @@ %debug_package %endif -%prep -%setup -n %{pkgname}-%{version} +%prep - +%setup -n %{pkgname}-%{version} -b 3 zcat %{S:2} > data/GeoIP.dat %build @@ -109,6 +113,14 @@ fi %configure --disable-static --with-pic %{__make} %{?jobs:-j%jobs} +cd ../%{updatepkgname}-%{updatepkgver} +if [ ! -f configure ] ; then + if [ -x bootstrap ] ; then + ./bootstrap + fi +fi +%configure --disable-static --with-pic +%{__make} %{?jobs:-j%jobs} %install %makeinstall @@ -117,6 +129,8 @@ %{__cp} %{SOURCE1} . # no need for that %{__rm} -f %{buildroot}%{_libdir}/*.la +cd ../%{updatepkgname}-%{updatepkgver} +%makeinstall %clean %{__rm} -rf %{buildroot} @@ -127,7 +141,7 @@ %files %defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING README TODO LICENSE.txt +%doc AUTHORS ChangeLog COPYING LICENSE.txt %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_bindir}/geoiplookup %{_bindir}/geoiplookup6
	Added	geoipupdate-2.2.1.tar.bz2 ^