--- rpms/smeserver-geoip/contribs8/smeserver-geoip.spec	2013/05/25 05:26:28	1.1
+++ rpms/smeserver-geoip/contribs8/smeserver-geoip.spec	2015/09/22 22:08:43	1.6
@@ -1,22 +1,21 @@
-# $Id: smeserver-geoip.spec,v 1.4 2010/03/04 16:11:51 slords Exp $
-# Authority: nocvs
-# Name: Thouvenin Romain
-
 %define name smeserver-geoip
-%define version 1.0.0
-%define release b2
+%define version 1.1.2
+%define release 3
 
 Summary: SME Server geoip plugin
 Name: %{name}
 Version: %{version}
-Release: %{release}
+Release: %{release}%{?dist}
 License: GPL
 Group: Email
 Source: %{name}-%{version}.tar.gz
+Packager: Doug Kruhm <dakruhm@daknetworks.net>
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-BuildRequires: e-smith-devtools
-
+Requires: perl-Geo-IP
+BuildRequires: e-smith-devtools >= 1.13.1-03
+Patch0 : smeserver-geoip-remove-createlink-add-geoip-download-actions.patch
+Patch1: smeserver-geoip-1.1.1.geoip-update-event.patch
 %description
 The GEOIP plugin lets us know which country our mail server is receiving mail from. If we're receiving too much spam from a particular country, this will help track it down and then use that info to reject connections from that country. This ends up taking the load off our servers.
 
@@ -24,24 +23,44 @@ CHANGE THE CONFIG DB: config setprop qps
 SIGNAL EVENT: signal-event email-update
 
 %changelog
-* Fri Apr 24 2009 Jonathan Martens <smeserver-bugzilla@contribs.org> 1.0.0-b2
-- Add e-smith-devtools as a requirement [SME: 1866]
+* Tue Sep 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1.1-3
+- the event geoip-update download the geoip database
+- added smeserver-geoip-1.1.1.geoip-update-event.patch
+
+* Sun Jun 14 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1.2-2
+- added createlinks
+- added actions and crontab to download geoip database
+ 
+* Mon Sep 03 2012 Doug Kruhm <dakruhm@daknetworks.net> 1.0.5
+- defining $country to reduce noise if not found [SME: 5011]
+- fixed misspelling in response if country is blocked [SME: 7058]
+- cleaning up versioning to MAJOR-MINOR-PATCH
+
+* Fri May 01 2009 Doug Kruhm <dakruhm@daknetworks.net> 1.0.0-04
+- added response to connecting server if blocked [SME: 5011]
+
+* Fri May 01 2009 Doug Kruhm <dakruhm@daknetworks.net> 1.0.0-03
+- added line to reduce log noise [SME: 5011]
+
+* Fri May 01 2009 Doug Kruhm <dakruhm@daknetworks.net> 1.0.0-02
+- db defaults migrated from SPEC file to rpm files [SME: 5193]
+- removed %post and %postun macros [SME: 5194]
+- added Requires perl-Geo-IP [SME: 1866]
+- added e-smith-devtools as a requirement [SME: 1866]
 
 * Thu Jun 16 2007 Doug Kruhm <dakruhm@daknetworks.net>
 - 1.0.0-01
 - Original version
 
+
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
-
-DEFAULTS=root/etc/e-smith/db/configuration/defaults/qpsmtpd
-mkdir -p $DEFAULTS
-
-echo "enabled"  > $DEFAULTS/GeoIP
-echo ""  > $DEFAULTS/BadCountries
-
+%{__mkdir_p} root/var/lib/GeoIP
+perl createlinks
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,14 +72,8 @@ rm -f %{name}-%{version}-filelist
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/etc/e-smith/events/actions/initialize-default-databases
-/sbin/e-smith/expand-template /var/service/qpsmtpd/config/badcountries
-/sbin/e-smith/expand-template /var/service/qpsmtpd/config/peers/0
-true
 
 %postun
-/sbin/e-smith/expand-template /var/service/qpsmtpd/config/peers/0
-true
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)