[archivemail] New upstream.

[Jon Ciesla]

commit 82c7b6bf9ef80f154402e733f9652663b58d95fb
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Aug 9 14:48:55 2010 -0500

    New upstream.

 .gitignore                        |    1 +
 archivemail-0.8.0-test_path.patch |   11 +++++++++++
 archivemail.spec                  |   27 ++++++++++++++++-----------
 sources                           |    2 +-
 4 files changed, 29 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e2d7d2..08b20ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 archivemail-0.7.2.tar.gz
+archivemail-0.8.0.tar.gz
diff --git a/archivemail-0.8.0-test_path.patch b/archivemail-0.8.0-test_path.patch
new file mode 100644
index 0000000..aa70516
--- /dev/null
+++ b/archivemail-0.8.0-test_path.patch
@@ -0,0 +1,11 @@
+--- test_archivemail~	2010-08-09 04:51:05.000000000 -0500
++++ test_archivemail	2010-08-09 14:28:20.517412363 -0500
+@@ -63,7 +63,7 @@
+ from types import ModuleType
+ archivemail = ModuleType("archivemail")
+ try:
+-    module_fp = open("archivemail", "r")
++    module_fp = open("/usr/share/archivemail/archivemail.py", "r")
+ except IOError:
+     print "The archivemail script should be in the current directory in order"
+     print "to be imported and tested. Sorry."
diff --git a/archivemail.spec b/archivemail.spec
index be2012d..74bd934 100644
--- a/archivemail.spec
+++ b/archivemail.spec
@@ -1,7 +1,6 @@
-%define _default_patch_fuzz 2
 Name:		archivemail
-Version:	0.7.2
-Release:	4%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	A tool for archiving and compressing old email in mailboxes
 
 Group:		Applications/Internet
@@ -11,9 +10,10 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Small wrapper script for launching archivemail
 Source1:	archivemail
 Source2:	archivemail-README.tests
-Patch0:		test_archivemail.patch
-Patch1:		archivemail-test-noshebang.patch
+#Patch0:		test_archivemail.patch
+#Patch1:		archivemail-test-noshebang.patch
 Patch2:		archivemail-main-noshebang.patch
+Patch3:		archivemail-0.8.0-test_path.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -27,18 +27,19 @@ optionally just delete old email.
 
 %prep
 %setup -q
-chmod 0644 test_archivemail.py
+chmod 0644 test_archivemail
 # The patch creates the foundation for removing hardcoded dirs...
-%patch0 -b .paths
+#%patch0 -b .paths
 # ...but I then use sed to further modify the files, so that the RPM build system's
 # path macros are used properly:
-sed -i "s:ARCHIVEMAIL_DATADIR = '\\./':ARCHIVEMAIL_DATADIR = '%{_datadir}/archivemail':" test_archivemail.py
+#sed -i "s:ARCHIVEMAIL_DATADIR = '\\./':ARCHIVEMAIL_DATADIR = '%{_datadir}/archivemail':" test_archivemail.py
 # Again, follow RPM's macros (in case these get redefined, the package can simply
 # be rebuilt instead of modified to compensate for it:
-sed -i "s:/usr/share/archivemail:%{_datadir}/archivemail:" %{SOURCE1}
+#sed -i "s:/usr/share/archivemail:%{_datadir}/archivemail:" %{SOURCE1}
 
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
+%patch3 -p0
 
 %build
 
@@ -56,12 +57,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc archivemail.sgml CHANGELOG COPYING FAQ README test_archivemail.py TODO examples archivemail-README.tests
+%doc archivemail.sgml CHANGELOG COPYING FAQ README test_archivemail TODO examples archivemail-README.tests
 %{_bindir}/archivemail
 %{_datadir}/archivemail
 %{_mandir}/man1/archivemail.1.gz
 
 %changelog
+* Mon Aug 09 2010 Jon Ciesla <limb at jcomserv.net> 0.8.0-1
+- New upstream release.
+- Updated test patches, dropped patch fuzz.  Finally. :)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index faee417..d2e19c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e444424688e6ec063e829176e4eb62e2  archivemail-0.7.2.tar.gz
+9708680537d1e6802d4e0960b68cd09b  archivemail-0.8.0.tar.gz