pghmcfc pushed to GeoIP (el5). "Merge remote-tracking branch 'origin/master' into el6"

[notifications at fedoraproject.org]

>From aa9907d0869fbf2e7b3cfd1987405cf537b04f99 Mon Sep 17 00:00:00 2001
From: "Philip A. Prindeville" <philipp at redfish-solutions.com>
Date: Fri, 7 Jun 2013 23:26:21 -0600
Subject: Apparently even %ghost's require attributes.


diff --git a/GeoIP.spec b/GeoIP.spec
index 94c28b9..c39a42d 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -110,10 +110,10 @@ geoipupdate && \
 %{_bindir}/geoiplookup
 %{_datadir}/GeoIP/
 %{_datadir}/GeoIP/GeoIP-initial.dat
-%ghost %{_datadir}/GeoIP/GeoIP.dat
-%ghost %{_datadir}/GeoIP/GeoLiteCountry.dat
-%ghost %{_datadir}/GeoIP/GeoLiteCity.dat
-%ghost %{_datadir}/GeoIP/GeoLiteASNum.dat
+%ghost %attr(0644,root,root) %{_datadir}/GeoIP/GeoIP.dat
+%ghost %attr(0644,root,root) %{_datadir}/GeoIP/GeoLiteCountry.dat
+%ghost %attr(0644,root,root) %{_datadir}/GeoIP/GeoLiteCity.dat
+%ghost %attr(0644,root,root) %{_datadir}/GeoIP/GeoLiteASNum.dat
 %{_libdir}/libGeoIP.so.1
 %{_libdir}/libGeoIP.so.1.*
 %{_mandir}/man1/geoiplookup.1*
-- 
cgit v0.10.2


>From 13e54c843113273b6eb1a1cfa88ee6cffa0f99f7 Mon Sep 17 00:00:00 2001
From: "Philip A. Prindeville" <philipp at redfish-solutions.com>
Date: Fri, 7 Jun 2013 23:29:16 -0600
Subject: And another version bump.


diff --git a/GeoIP.spec b/GeoIP.spec
index c39a42d..d582665 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -1,6 +1,6 @@
 Name:		GeoIP
 Version:	1.5.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Library for country/city/organization to IP address or hostname mapping
 Group:		Development/Libraries
 License:	LGPLv2+ and GPLv2+
-- 
cgit v0.10.2


>From 65ad6a1e48bc66417c1ab6ecc2329e6d7eb35370 Mon Sep 17 00:00:00 2001
From: "Philip A. Prindeville" <philipp at redfish-solutions.com>
Date: Sat, 8 Jun 2013 08:38:22 -0600
Subject: As per Paul, replace previous interchangeability with 3rd-party
 package.


diff --git a/GeoIP.spec b/GeoIP.spec
index d582665..7f3ff1c 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -1,6 +1,6 @@
 Name:		GeoIP
 Version:	1.5.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Library for country/city/organization to IP address or hostname mapping
 Group:		Development/Libraries
 License:	LGPLv2+ and GPLv2+
@@ -28,8 +28,6 @@ than using reverse DNS lookups.
 Summary:	Crontab entry to facilitate automatic updates of databases
 Group:		Applications/Databases
 Requires:	crontabs
-Provides:	GeoIP-update = %{version}-%{release}
-Obsoletes:	GeoIP-update < %{version}-%{release}
 BuildArch:	noarch
 
 %description update
@@ -39,8 +37,8 @@ Crontab entry to provide weekly updates of the GeoIP free databases.
 Summary:	Development headers and libraries for GeoIP
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Provides:	GeoIP-devel = %{version}-%{release}
-Obsoletes:	GeoIP-devel < %{version}-%{release}
+Provides:	geoip-devel = %{version}-%{release}
+Obsoletes:	geoip-devel < %{version}-%{release}
 
 %description devel
 Development headers and static libraries for building GeoIP-based applications.
@@ -138,6 +136,9 @@ geoipupdate && \
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Sat Jun 08 2013 Philip Prindeville <philipp at fedoraproject.org> - 1.5.0-4
+- Revert ability to replace 3rd-party package.
+
 * Fri Jun 07 2013 Philip Prindeville <philipp at fedoraproject.org> - 1.5.0-2
 - Make update subpackage be noarch.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/GeoIP.git/commit/?h=el5&id=e96c0722fa3c2f53ba13e3446be40dfaa57c1cfc