[imapfilter] Rebased against upstream imapfilter-2.5

[dsommers]

commit a095bb4e2873cb7fb76d2441101064ea6dddf28c
Author: David Sommerseth <davids at redhat.com>
Date:   Mon Feb 27 12:06:01 2012 +0100

    Rebased against upstream imapfilter-2.5
    
    Signed-off-by: David Sommerseth <davids at redhat.com>

 .gitignore                    |    1 +
 imapfilter-configure.patch    |   13 -------------
 imapfilter-makefile-fix.patch |   22 ++++++++++++++++++++++
 imapfilter.spec               |   21 +++++++++++----------
 sources                       |    2 +-
 5 files changed, 35 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3239b02..c2a396f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 imapfilter-2.0.11.tar.bz2
+/imapfilter-2.5.tar.gz
diff --git a/imapfilter-makefile-fix.patch b/imapfilter-makefile-fix.patch
new file mode 100644
index 0000000..bb74905
--- /dev/null
+++ b/imapfilter-makefile-fix.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.upstream	2012-02-27 11:26:33.399816815 +0100
++++ src/Makefile	2012-02-27 11:29:11.478811550 +0100
+@@ -1,8 +1,8 @@
+ DESTDIR =
+-PREFIX = /usr/local
++PREFIX = /usr
+ BINDIR = $(PREFIX)/bin
+ SHAREDIR = $(PREFIX)/share/imapfilter
+-MANDIR = $(PREFIX)/man
++MANDIR = $(PREFIX)/share/man
+ 
+ MYCFLAGS =
+ MYLDFLAGS =
+@@ -16,7 +16,7 @@
+ LIBSSL = -lssl
+ LIBCRYPTO = -lcrypto
+ 
+-CFLAGS = -Wall -O -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS) $(MYCFLAGS)
++CFLAGS += -Wall -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS)
+ LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
+ LIBS = -lm $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
+ 
diff --git a/imapfilter.spec b/imapfilter.spec
index cd768be..cf0ca24 100644
--- a/imapfilter.spec
+++ b/imapfilter.spec
@@ -1,13 +1,13 @@
 Name:           imapfilter
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        A flexible client side mail filtering utility for IMAP servers
 
 Group:          Applications/Internet
 License:        MIT
 URL:            http://imapfilter.hellug.gr/
-Source0:        http://imapfilter.hellug.gr/source/imapfilter-%{version}.tar.bz2
-Patch0:         http://people.redhat.com/~dsommers/imapfilter/imapfilter-configure.patch
+Source0:        https://github.com/downloads/lefcha/imapfilter/imapfilter-%{version}.tar.gz
+Patch0:         http://people.redhat.com/~dsommers/imapfilter/imapfilter-makefile-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel lua-devel pcre-devel
@@ -23,14 +23,11 @@ protocol are supported.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0
 
 %build
-# As the ./configure script in imapfilter is not autotools based, other arguments need to
-# be used.  This will cause rpmlint configure-without-libdir-spec warnings on the spec file
-# and the src.rpm.
-CFLAGS=$RPM_OPT_FLAGS ./configure -p %{_prefix} -b %{_bindir} -s %{_datadir}/imapfilter -m %{_mandir}
-make %{?_smp_mflags}
+# imapfilter does not have any autotools based ./configure - just a plain Makefile
+CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
 
 
 %install
@@ -52,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 27 2012 David Sommerseth <davids at redhat.com> - 2.5-1
+- Updated to latest upstream version
+- Replaced the configure patch with a makefile patch, as upstream has changed their building methods
+
 * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 2.2.2-4
 - Rebuild against PCRE 8.30
 
diff --git a/sources b/sources
index 1438b23..b2543c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09c6ffb085a5a244dc9f3e798259f341  imapfilter-2.2.2.tar.bz2
+93821a52b8906e789c63b639cbf86dac  imapfilter-2.5.tar.gz