diff --git a/SPECS/GeoIP.spec b/SPECS/GeoIP.spec index caf195f..dab5b3c 100644 --- a/SPECS/GeoIP.spec +++ b/SPECS/GeoIP.spec @@ -3,7 +3,7 @@ Name: GeoIP Version: 1.5.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: LGPLv2+ and GPLv2+ and CC-BY-SA @@ -27,6 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildRequires: zlib-devel Obsoletes: geoip < %{version}-%{release} Provides: geoip = %{version}-%{release} +Requires: geoipupdate %description GeoIP is a C library that enables the user to find the country that any IP @@ -39,18 +40,6 @@ and accurate than using reverse DNS lookups. This package includes GeoLite data created by MaxMind, available from http://www.maxmind.com/ -%package update -Summary: Crontab entry to facilitate automatic updates of databases -Group: Applications/Databases -Requires: crontabs -Requires: %{name} = %{version}-%{release} -%if %{noarch_subpkgs} -BuildArch: noarch -%endif - -%description update -Crontab entry to provide weekly updates of the GeoIP free databases. - %package data Summary: Static snapshot of GeoIP databases Group: Applications/Databases @@ -86,7 +75,6 @@ Development headers and static libraries for building GeoIP-based applications. install -D -m644 %{SOURCE1} LICENSE.txt install -D -m644 %{SOURCE2} fetch-geoipdata-city.pl install -D -m644 %{SOURCE3} fetch-geoipdata.pl -install -D -m644 %{SOURCE5} geoipupdate.cron # Distribute all databases as *-inital.dat files in GeoIP packages. # User then can download real .dat files without replacing the ones from @@ -121,19 +109,9 @@ make %{?_smp_mflags} rm -rf %{buildroot} make DESTDIR=%{buildroot} install -# fetch database updates weekly -install -D -m755 geoipupdate.cron %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate - # nix the stuff we don't need like .la files. rm -f %{buildroot}%{_libdir}/*.la -# fix up the config file to use the free products by default -sed -i \ - -e 's/YOUR_LICENSE_KEY_HERE$/000000000000/' \ - -e 's/YOUR_USER_ID_HERE$/999999/' \ - -e 's/106$/506 533/' \ - %{buildroot}%{_sysconfdir}/GeoIP.conf - # install downloaded GeoLite databases for db in \ GeoIP-initial.dat \ @@ -163,6 +141,13 @@ ln -sf GeoIPCityv6-initial.dat %{buildroot}%{_datadir}/GeoIP/GeoIPCityv6.dat ln -sf GeoIPASNum.dat %{buildroot}%{_datadir}/GeoIP/GeoIPASNum.dat ln -sf GeoIPASNumv6.dat %{buildroot}%{_datadir}/GeoIP/GeoIPASNumv6.dat +#Remove files used by geoipupdate - it has its own package +rm %{buildroot}%{_bindir}/geoipupdate +rm %{buildroot}%{_includedir}/GeoIPUpdate.h +rm %{buildroot}%{_libdir}/libGeoIPUpdate.so* +rm %{buildroot}%{_mandir}/man1/geoipupdate.1* +rm %{buildroot}/etc/GeoIP.conf* + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -192,8 +177,6 @@ fi %files # LGPLv2+ %doc AUTHORS COPYING ChangeLog README TODO LICENSE* fetch-* -%config(noreplace) %{_sysconfdir}/GeoIP.conf -%config(noreplace) %{_sysconfdir}/GeoIP.conf.default %{_bindir}/geoiplookup %{_bindir}/geoiplookup6 %dir %{_datadir}/GeoIP/ @@ -213,14 +196,6 @@ fi %{_libdir}/libGeoIP.so.1.* %{_mandir}/man1/geoiplookup.1* %{_mandir}/man1/geoiplookup6.1* -# GPLv2+ -%{_bindir}/geoipupdate -%{_libdir}/libGeoIPUpdate.so.0 -%{_libdir}/libGeoIPUpdate.so.0.* -%{_mandir}/man1/geoipupdate.1* - -%files update -%{_sysconfdir}/cron.weekly/geoipupdate %files data %{_datadir}/GeoIP/GeoIPCity-initial.dat @@ -232,13 +207,13 @@ fi # LGPLv2+ %{_includedir}/GeoIP.h %{_includedir}/GeoIPCity.h -%{_includedir}/GeoIPUpdate.h %{_libdir}/libGeoIP.so %{_libdir}/pkgconfig/geoip.pc -# GPLv2+ -%{_libdir}/libGeoIPUpdate.so %changelog +* Mon Feb 18 2019 Michal Ruprich - 1.5.0-14 +- Resolves: #1666767 - Remove geoipupdate binary from GeoIP + * Tue Jul 31 2018 Michal Ruprich - 1.5.0-13 - Related: #1409060 - Missing symlink at the GeoIP-update package