From 5d894c80bdeec2730469bde2ad432a3c8da50612 Mon Sep 17 00:00:00 2001
From: Nick Bebout <nb@fedoraproject.org>
Date: Feb 17 2011 02:26:56 +0000
Subject: Merge branch 'master' into f13


---

diff --git a/.gitignore b/.gitignore
index dad7412..f577ae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 imapsync-1.340.tgz
 /imapsync-1.366.tgz
+/imapsync-1.398.tgz
diff --git a/imapsync-1.398-makefile.patch b/imapsync-1.398-makefile.patch
new file mode 100644
index 0000000..cab1ed0
--- /dev/null
+++ b/imapsync-1.398-makefile.patch
@@ -0,0 +1,12 @@
+--- imapsync-1.398-orig/Makefile	2011-01-12 00:59:13.000000000 +0000
++++ imapsync-1.398/Makefile	2011-02-17 02:13:09.000000000 +0000
+@@ -62,7 +62,9 @@
+ 	pod2man imapsync > imapsync.1
+ 
+ install: testp imapsync.1
++	mkdir -p $(DESTDIR)/usr/bin
+ 	install imapsync $(DESTDIR)/usr/bin/imapsync
++	mkdir -p $(DESTDIR)/usr/share/man/man1
+ 	install imapsync.1 $(DESTDIR)/usr/share/man/man1/imapsync.1
+ 	chmod 755 $(DESTDIR)/usr/bin/imapsync
+ 
diff --git a/imapsync.spec b/imapsync.spec
index 7375631..b263a26 100644
--- a/imapsync.spec
+++ b/imapsync.spec
@@ -1,28 +1,26 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
-Version: 1.366
+Version: 1.398
 Release: 1%{?dist}
 License: WTFPL
 Group: Applications/Internet
 
-URL: http://freshmeat.net/projects/imapsync/
-#Source: http://www.linux-france.org/prj/imapsync/dist/%{name}-%{version}.tgz
+URL: http://fedorahosted.org/imapsync
 Source0: https://fedorahosted.org/releases/i/m/%{name}-%{version}.tgz
-#Patch0: imapsync-1.255-authuser.patch
+Patch0:  imapsync-1.398-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 BuildRequires: perl(Test::Simple)
-BuildRequires: perl(Mail::Box)
-BuildRequires: perl(Mail::IMAPClient)
-BuildRequires: perl(Date::Manip)
-Requires: perl(Date::Manip)
-Requires: perl(Term::ReadKey)
-Requires: perl(IO::Socket::SSL)
+#BuildRequires: perl(Mail::Box)
+BuildRequires: perl(Mail::IMAPClient) >= 3.25
+#BuildRequires: perl(Date::Manip)
+#Requires: perl(Mail::Box)
 Requires: perl(Test::Simple)
-Requires: perl(Mail::Box)
-Requires: perl(Mail::IMAPClient) >= 3.19
-Requires: perl(Date::Manip)
+Requires: perl(Digest::MD5) perl(Digest::HMAC_MD5)
+Requires: perl(Term::ReadKey) perl(IO::Socket::SSL)
+Requires: perl(File::Spec) perl(File::Path) perl(Date::Manip)
+Requires: perl(Mail::IMAPClient) >= 3.25
 
 
 %description
@@ -35,7 +33,7 @@ optionally be deleted after a successful transfer.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .authuser
+%patch0 -p1
 
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -64,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644, root, root) %{_mandir}/man1/imapsync.1*
 
 %ChangeLog
+* Wed Feb 16 2011 Nick Bebout <nb@fedoraproject.org> - 1.398-1
+- Upgrade to 1.398
+
 * Sun Dec 5 2010 Nick Bebout <nb@fedoraproject.org> - 1.366-1
 - Upgrade to 1.366
 
diff --git a/sources b/sources
index 5c44875..b726a5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56641586a58d0361bf8decac026565f0  imapsync-1.366.tgz
+3ff1cd4981ea45022e555da90608f594  imapsync-1.398.tgz