Hello community, here is the log from the commit of package GeoIP for openSUSE:Factory checked in at 2015-03-30 19:32:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/GeoIP (Old) and /work/SRC/openSUSE:Factory/.GeoIP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "GeoIP" Changes: -------- --- /work/SRC/openSUSE:Factory/GeoIP/GeoIP.changes 2015-03-09 10:10:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.GeoIP.new/GeoIP.changes 2015-03-30 19:32:29.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Mar 12 20:34:17 UTC 2015 - astie...@suse.com + +- Remove unused zlib build requirement +- fix pubpackage arch build error, for SLE 11 SP3 + +------------------------------------------------------------------- +Tue Mar 10 16:17:50 UTC 2015 - jweberho...@weberhofer.at + +* Updated LICENSE, using the upstream version. + +* The GPL license has been removed:test-driver is licensed under the GPL but + is not packaged, libGeoIPUpdate is no longer part of the package. + +* Changed handling of ghost files. + +* Moved data into a seperate package. + +------------------------------------------------------------------- Old: ---- GPL-2.0.txt LICENSE.txt New: ---- LICENSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ GeoIP.spec ++++++ --- /var/tmp/diff_new_pack.wPwxYd/_old 2015-03-30 19:32:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wPwxYd/_new 2015-03-30 19:32:30.000000000 +0200 @@ -20,17 +20,15 @@ Version: 1.6.5 Release: 0 Summary: Library to find the country that any IP address originates from -License: GPL-2.0+ and LGPL-2.1+ and CC-BY-SA-3.0 +License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://www.maxmind.com/ Source0: https://github.com/maxmind/geoip-api-c/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: LICENSE.txt -Source2: GPL-2.0.txt -Source3: README.SUSE -Source4: geoip-fetch -Source5: baselibs.conf +Source1: LICENSE +Source2: README.SUSE +Source3: geoip-fetch +Source4: baselibs.conf BuildRequires: pkg-config -BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Recommends: curl @@ -39,17 +37,30 @@ %description GeoIP is a C library that enables the user to find the country that any IP address or hostname originates from. It uses a file based database. - This database simply contains IP blocks as keys, and countries as +This database simply contains IP blocks as keys, and countries as values. This database should be more complete and accurate than using reverse DNS lookups. MaxMind offers a service where you can have your database updated automically each month. +%package data +Summary: Free GeoLite country-data for GeoIP +License: CC-BY-SA-3.0 +Group: Development/Libraries/C and C++ +%if 0%{?suse_version} >= 1310 +BuildArch: noarch +%endif + +%description data +This package includes GeoLite data created by MaxMind, available from +http://www.maxmind.com/ + %package -n lib%{name}1 Summary: Shared libraries of the GeoIP C API License: LGPL-2.1+ Group: Development/Libraries/C and C++ +Requires: %{name}-data # for the data file %if 0%{?suse_version} Recommends: GeoIP @@ -91,7 +102,6 @@ %setup -q cp %{SOURCE1} . cp %{SOURCE2} . -cp %{SOURCE3} . %build %configure --disable-static \ @@ -110,7 +120,21 @@ # do not ship these rm %{buildroot}%{_libdir}/libGeoIP.la # install fetcher -install -D -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}/geoip-fetch +install -D -m 0755 %{SOURCE3} %{buildroot}%{_sbindir}/geoip-fetch + +%if 0%{?suse_version} < 1300 +# Reset files that will be packaged as %%ghost (needed for old rpm) +echo -n '' >%{buildroot}/%{_localstatedir}/lib/%{name}/GeoIPASNum.dat +echo -n '' >%{buildroot}/%{_localstatedir}/lib/%{name}/GeoIPCity.dat +echo -n '' >%{buildroot}/%{_localstatedir}/lib/%{name}/GeoIPv6.dat +%endif + +%check +# as tests require a running network OBS can not run it +%if 0%{?with_tests} +LD_LIBRARY_PATH=%{buildroot}%{_libdir} +make %{?_smp_mflags} check +%endif %post -n lib%{name}1 -p /sbin/ldconfig @@ -118,27 +142,31 @@ %files %defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING README.md LICENSE.txt GPL-2.0.txt README.SUSE +%doc AUTHORS ChangeLog COPYING README.md LICENSE README.SUSE %{_bindir}/geoiplookup %{_bindir}/geoiplookup6 %{_mandir}/man1/geoiplookup6.1* %{_mandir}/man1/geoiplookup.1* %{_sbindir}/geoip-fetch -%dir %{_localstatedir}/lib/GeoIP -%verify(not md5 size mtime) %{_localstatedir}/lib/GeoIP/GeoIP.dat -%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/GeoIP/GeoIPASNum.dat -%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/GeoIP/GeoIPCity.dat -%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/GeoIP/GeoIPv6.dat + +%files data +%defattr(-, root, root, -) +%doc AUTHORS LICENSE +%dir %{_localstatedir}/lib/%{name} +%verify(not md5 size mtime) %{_localstatedir}/lib/%{name}/GeoIP.dat +%ghost %{_localstatedir}/lib/%{name}/GeoIPASNum.dat +%ghost %{_localstatedir}/lib/%{name}/GeoIPCity.dat +%ghost %{_localstatedir}/lib/%{name}/GeoIPv6.dat %files -n lib%{name}1 %defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING README.md LICENSE.txt GPL-2.0.txt README.SUSE +%doc AUTHORS ChangeLog COPYING README.md LICENSE README.SUSE %{_libdir}/libGeoIP.so.1 %{_libdir}/libGeoIP.so.%{version} %files -n lib%{name}-devel %defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING README.md LICENSE.txt GPL-2.0.txt README.SUSE +%doc AUTHORS ChangeLog COPYING README.md LICENSE README.SUSE %{_includedir}/GeoIP.h %{_includedir}/GeoIPCity.h %{_libdir}/libGeoIP.so ++++++ LICENSE ++++++ There are two licenses, one for the C library software, and one for the GeoLite Country database. SOFTWARE LICENSE Copyright (C) 2015 MaxMind, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. For a copy of the LGPL License, see the COPYING file. DATA LICENSE (GeoLite Country and City Databases) The GeoLite databases are distributed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. The attribution requirement may be met by including the following in all advertising and documentation mentioning features of or use of this database: This product includes GeoLite data created by MaxMind, available from <a href="http://www.maxmind.com";>http://www.maxmind.com</a>.
