[imapfilter] Prepare the 2.5.6 update

[averi]

commit 01340c29be60e453c331d7eefbd134db53e1190c
Author: Andrea Veri <av at gnome.org>
Date:   Tue Dec 24 14:46:12 2013 +0100

    Prepare the 2.5.6 update

 imapfilter-makefile-fix-v2.5.6.patch |   37 ++++++++++++++++++++++++++++++++++
 imapfilter-makefile-fix.patch        |   22 --------------------
 imapfilter.spec                      |   11 +++++++--
 3 files changed, 45 insertions(+), 25 deletions(-)
---
diff --git a/imapfilter-makefile-fix-v2.5.6.patch b/imapfilter-makefile-fix-v2.5.6.patch
new file mode 100644
index 0000000..5f26cdc
--- /dev/null
+++ b/imapfilter-makefile-fix-v2.5.6.patch
@@ -0,0 +1,37 @@
+From 297b8c60803db84248c10e1eceed1d45e9226a97 Mon Sep 17 00:00:00 2001
+From: David Sommerseth <davids at redhat.com>
+Date: Tue, 2 Jul 2013 20:19:19 +0200
+Subject: [PATCH] Tweaks to src/Makefile to fit Fedora requirements
+
+Signed-off-by: David Sommerseth <davids at redhat.com>
+---
+ src/Makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index c1ec9d0..9e05544 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -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 @@ LIBPCRE = -lpcre
+ LIBSSL = -lssl
+ LIBCRYPTO = -lcrypto
+ 
+-CFLAGS = -Wall -Wextra -O -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS) $(MYCFLAGS)
++CFLAGS += -Wall -Wextra -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS)
+ LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
+ LIBS = -lm $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
+ 
+-- 
+1.7.10.2
+
diff --git a/imapfilter.spec b/imapfilter.spec
index d3eb2c0..50fd1e3 100644
--- a/imapfilter.spec
+++ b/imapfilter.spec
@@ -1,6 +1,6 @@
 Name:           imapfilter
-Version:        2.5.5
-Release:        2%{?dist}
+Version:        2.5.6
+Release:        1%{?dist}
 Summary:        A flexible client side mail filtering utility for IMAP servers
 
 Group:          Applications/Internet
@@ -11,7 +11,7 @@ URL:            https://github.com/lefcha/imapfilter/
 # Download it and save it as imapfilter-%{version}.tar.gz
 # And yeah, rpmlint will complain.
 Source0:        imapfilter-%{version}.tar.gz
-Patch0:         http://people.redhat.com/~dsommers/imapfilter/imapfilter-makefile-fix-v2.5.5.patch
+Patch0:         imapfilter-makefile-fix-v2.5.6.patch
 
 BuildRequires:  openssl-devel lua-devel pcre-devel
 
@@ -47,6 +47,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 24 2013 Andrea Veri <averi at fedoraproject.org> - 2.5.6-1
+- New upstream release.
+- Make use of the patch file available on the git repository itself,
+  update Patch0 accordingly.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild