upgrading package: geoip 1.1.3 -> 1.1.4

geoip/geoip.patch

@@ -1,57 +0,0 @@
---- libGeoIP/GeoIPBitReader.c.orig	2002-12-17 22:32:37.000000000 +0100
-+++ libGeoIP/GeoIPBitReader.c	2002-12-24 08:46:11.000000000 +0100
-@@ -32,7 +32,7 @@
- }
- 
- unsigned long GeoIPBitReader_read(GeoIPBitReader * gibr, short int numBits) {
--	ulong num = 0;
-+	unsigned long num = 0;
- 	int i, bit;
- 	int bytes_read;
- 
---- apps/Makefile.in.orig	2002-12-30 09:08:32.000000000 +0100
-+++ apps/Makefile.in	2002-12-30 09:08:54.000000000 +0100
-@@ -105,12 +105,12 @@
- geoipupdate_SOURCES = geoipupdate.c
- geoipupdate_LDFLAGS = 
- geoipupdate_DEPENDENCIES = $(top_builddir)/libGeoIP/libGeoIP.la $(top_builddir)/libGeoIP/libGeoIPUpdate.la
--geoipupdate_LDADD = $(top_builddir)/libGeoIP/libGeoIP.la $(top_builddir)/libGeoIP/libGeoIPUpdate.la
-+geoipupdate_LDADD = $(top_builddir)/libGeoIP/libGeoIPUpdate.la $(top_builddir)/libGeoIP/libGeoIP.la
- 
- geoipexport_SOURCES = geoipexport.c
- geoipexport_LDFLAGS = 
- geoipexport_DEPENDENCIES = $(top_builddir)/libGeoIP/libGeoIP.la $(top_builddir)/libGeoIP/libGeoIPBitReader.la
--geoipexport_LDADD = $(top_builddir)/libGeoIP/libGeoIP.la $(top_builddir)/libGeoIP/libGeoIPBitReader.la -lm
-+geoipexport_LDADD = $(top_builddir)/libGeoIP/libGeoIPBitReader.la -lm $(top_builddir)/libGeoIP/libGeoIP.la
- subdir = apps
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
---- apps/geoipexport.c.orig	2002-12-17 22:35:21.000000000 +0100
-+++ apps/geoipexport.c	2002-12-30 09:14:29.000000000 +0100
-@@ -41,7 +41,7 @@
- 					 (int)floor(num/16777216),
- 					 ((int)floor(num/65536)) % 256,
- 					 ((int)floor(num/256)) % 256,
--					 num % 256);
-+					 (int)(num % 256));
- 	return addr;
- }
- 
-@@ -78,7 +78,7 @@
-   GeoIPBitReader *gibr;
- 	int databaseType, record, val;
- 	int exportType;
--	ulong beginIp = 0, endIp = 0;
-+	unsigned long beginIp = 0, endIp = 0;
- 
-   if (argc < 4) {
-     usage();
-@@ -127,7 +127,7 @@
- 				full_csv_export(databaseType, beginIp, endIp - 1, val, f);
- 			}
- 			beginIp = endIp;
--			printf("setting beginIp to %d\n",beginIp);
-+			printf("setting beginIp to %ld\n",beginIp);
- 		} else {
- 			/* record = netmask - 1 */
- 			endIp += (1 << (31 - record));

geoip/geoip.spec

@@ -26,24 +26,23 @@
 #   package information
 Name:         geoip
 Summary:      Geographic IP Resolution
-URL:          http://maxmind.com/geoip/
+URL:          http://www.maxmind.com/geoip/
 Vendor:       MaxMind
 Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Network
 License:      GPL
-Version:      1.1.3
+Version:      1.1.4
 Release:      20021230
 
 #   list of sources
 Source0:      http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz
-Patch0:       geoip.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, zlib
-PreReq:       OpenPKG, openpkg >= 20020206, zlib
+BuildPreReq:  OpenPKG, openpkg >= 20021230, zlib
+PreReq:       OpenPKG, openpkg >= 20021230, zlib
 AutoReq:      no
 AutoReqProv:  no
 
@@ -53,11 +52,10 @@ AutoReqProv:  no
     IP Network Blocks as keys and countries as values, covering every
     public IP address.
 
-    Options: none
+    %options
 
 %prep
     %setup -q -n GeoIP-%{version}
-    %patch -p0
 
 %build
     CC="%{l_cc}" \