rpms/archivemail/devel .cvsignore, 1.2, 1.3 archivemail.spec, 1.3, 1.4 sources, 1.2, 1.3 test_archivemail.patch, 1.1, 1.2
Jon Ciesla (limb)
fedora-extras-commits at redhat.com
Thu Nov 8 17:01:52 UTC 2007
Author: limb
Update of /cvs/pkgs/rpms/archivemail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9502
Modified Files:
.cvsignore archivemail.spec sources test_archivemail.patch
Log Message:
Bumped to upstream, corrected patches to accomodate.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/archivemail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 May 2007 12:41:27 -0000 1.2
+++ .cvsignore 8 Nov 2007 17:01:12 -0000 1.3
@@ -1 +1 @@
-archivemail-0.7.0.tar.gz
+archivemail-0.7.1.tar.gz
Index: archivemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archivemail/devel/archivemail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- archivemail.spec 16 Aug 2007 11:58:44 -0000 1.3
+++ archivemail.spec 8 Nov 2007 17:01:12 -0000 1.4
@@ -1,6 +1,6 @@
Name: archivemail
-Version: 0.7.0
-Release: 7%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
Summary: A tool for archiving and compressing old email in mailboxes
Group: Applications/Internet
@@ -13,8 +13,6 @@
Patch0: test_archivemail.patch
Patch1: archivemail-test-noshebang.patch
Patch2: archivemail-main-noshebang.patch
-Patch3: archivemail-0.7.0-fpname.patch
-Patch4: archivemail-0.7.0-imap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -40,8 +38,6 @@
%patch1 -p0
%patch2 -p0
-%patch3 -p0
-%patch4 -p0
%build
@@ -65,6 +61,11 @@
%{_mandir}/man1/archivemail.1.gz
%changelog
+* Thu Nov 8 2007 Jon Ciesla <limb at jcomserv.net> 0.7.1-1
+- Update to 0.7.1.
+- Updated test_archivemail.patch for new version.
+- Removed fpname and imap patches, fixed by upstream.
+
* Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> 0.7.0-7
- License tag correction.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/archivemail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 May 2007 12:41:27 -0000 1.2
+++ sources 8 Nov 2007 17:01:12 -0000 1.3
@@ -1 +1 @@
-087c9707daa6bb5c44cd052b6d71ce88 archivemail-0.7.0.tar.gz
+52fb980dc447fe353583114685aff6bc archivemail-0.7.1.tar.gz
test_archivemail.patch:
Index: test_archivemail.patch
===================================================================
RCS file: /cvs/pkgs/rpms/archivemail/devel/test_archivemail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_archivemail.patch 25 May 2007 12:41:27 -0000 1.1
+++ test_archivemail.patch 8 Nov 2007 17:01:12 -0000 1.2
@@ -1,5 +1,5 @@
---- test_archivemail.py 2006-10-30 22:02:09.000000000 +0200
-+++ test_archivemail-mod.py 2007-05-23 15:58:44.000000000 +0200
+--- test_archivemail.py 2007-11-08 10:17:39.000000000 -0600
++++ test_archivemail.py 2007-11-08 10:22:05.000000000 -0600
@@ -30,6 +30,8 @@
"""
@@ -9,17 +9,15 @@
import sys
def check_python_version():
-@@ -59,7 +61,9 @@
- import time
+@@ -60,6 +62,7 @@
import unittest
-+
try:
+ sys.path.insert(0, ARCHIVEMAIL_DATADIR)
import archivemail
except ImportError:
print "The archivemail script needs to be called 'archivemail.py'"
-@@ -355,7 +359,7 @@
+@@ -432,7 +435,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -28,7 +26,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -418,7 +422,7 @@
+@@ -495,7 +498,7 @@
self.mbox_name = make_mbox(messages=3, headers=headers)
self.copy_name = tempfile.mkstemp()[1]
shutil.copyfile(self.mbox_name, self.copy_name)
@@ -37,7 +35,7 @@
self.assertEqual(os.system(run), 0)
assert(os.path.exists(self.mbox_name))
self.assertEqual(os.path.getsize(self.mbox_name), 0)
-@@ -435,7 +439,7 @@
+@@ -512,7 +515,7 @@
self.mbox_name = make_mbox(messages=3, headers=headers)
self.copy_name = tempfile.mkstemp()[1]
shutil.copyfile(self.mbox_name, self.copy_name)
@@ -46,7 +44,7 @@
self.assertEqual(os.system(run), 0)
assert(os.path.exists(self.mbox_name))
assert(filecmp.cmp(self.mbox_name, self.copy_name, shallow=0))
-@@ -455,7 +459,7 @@
+@@ -532,7 +535,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -55,7 +53,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -480,7 +484,7 @@
+@@ -557,7 +560,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -64,7 +62,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -508,7 +512,7 @@
+@@ -585,7 +588,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -73,7 +71,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -603,7 +607,7 @@
+@@ -680,7 +683,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -82,7 +80,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -626,7 +630,7 @@
+@@ -703,7 +706,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -91,7 +89,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -649,7 +653,7 @@
+@@ -726,7 +729,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -100,7 +98,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -683,11 +687,11 @@
+@@ -760,11 +763,11 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system_long":
@@ -114,7 +112,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -711,11 +715,11 @@
+@@ -788,11 +791,11 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system_long":
@@ -128,7 +126,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -748,11 +752,11 @@
+@@ -825,11 +828,11 @@
self.copy_name = tempfile.mkstemp()[1]
shutil.copyfile(self.mbox_name, self.copy_name)
if execute == "system_long":
@@ -142,7 +140,7 @@
(suffix, self.mbox_name)
self.assertEqual(os.system(run), 0)
elif execute == "package":
-@@ -799,10 +803,10 @@
+@@ -876,10 +879,10 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system_long":
@@ -155,7 +153,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -835,10 +839,10 @@
+@@ -912,10 +915,10 @@
archivemail.options.days_old_max = 11
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -168,7 +166,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -863,10 +867,10 @@
+@@ -940,10 +943,10 @@
archivemail.options.days_old_max = 11
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -181,7 +179,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -904,7 +908,7 @@
+@@ -981,7 +984,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -190,7 +188,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -926,7 +930,7 @@
+@@ -1003,7 +1006,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -199,7 +197,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -946,7 +950,7 @@
+@@ -1023,7 +1026,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -208,7 +206,34 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -980,7 +984,7 @@
+@@ -1061,7 +1064,7 @@
+ if execute == "package":
+ archivemail.archive(self.mbox_name)
+ elif execute == "system":
+- run = "./archivemail.py --copy --quiet %s" % self.mbox_name
++ run = "python archivemail.py --copy --quiet %s" % self.mbox_name
+ self.assertEqual(os.system(run), 0)
+ else:
+ sys.exit(1)
+@@ -1087,7 +1090,7 @@
+ if execute == "package":
+ archivemail.archive(self.mbox_name)
+ elif execute == "system":
+- run = "./archivemail.py --copy --quiet %s" % self.mbox_name
++ run = "python archivemail.py --copy --quiet %s" % self.mbox_name
+ self.assertEqual(os.system(run), 0)
+ else:
+ sys.exit(1)
+@@ -1113,7 +1116,7 @@
+ if execute == "package":
+ archivemail.archive(self.mbox_name)
+ elif execute == "system":
+- run = "./archivemail.py --copy --quiet %s" % self.mbox_name
++ run = "python archivemail.py --copy --quiet %s" % self.mbox_name
+ self.assertEqual(os.system(run), 0)
+ else:
+ sys.exit(1)
+@@ -1153,7 +1156,7 @@
archivemail.options.include_flagged = 0
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -217,7 +242,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -1002,7 +1006,7 @@
+@@ -1175,7 +1178,7 @@
archivemail.options.include_flagged = 1
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -226,7 +251,7 @@
self.mbox_name
self.assertEqual(os.system(run), 0)
else:
-@@ -1025,7 +1029,7 @@
+@@ -1198,7 +1201,7 @@
archivemail.options.include_flagged = 1
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -235,7 +260,7 @@
self.mbox_name
self.assertEqual(os.system(run), 0)
else:
-@@ -1064,11 +1068,11 @@
+@@ -1237,11 +1240,11 @@
archivemail.options.output_dir = self.dir_name
archivemail.archive(self.mbox_name)
elif execute == "system_long":
@@ -249,7 +274,7 @@
(self.dir_name, self.mbox_name)
self.assertEqual(os.system(run), 0)
else:
-@@ -1113,7 +1117,7 @@
+@@ -1286,7 +1289,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -258,7 +283,7 @@
self.mbox_name
self.assertEqual(os.system(run), 0)
else:
-@@ -1139,7 +1143,7 @@
+@@ -1312,7 +1315,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -267,7 +292,7 @@
self.mbox_name
self.assertEqual(os.system(run), 0)
else:
-@@ -1165,7 +1169,7 @@
+@@ -1338,7 +1341,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -276,7 +301,7 @@
self.mbox_name
self.assertEqual(os.system(run), 0)
else:
-@@ -1192,7 +1196,7 @@
+@@ -1365,7 +1368,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -285,7 +310,7 @@
self.mbox_name
self.assertEqual(os.system(run), 0)
else:
-@@ -1231,11 +1235,11 @@
+@@ -1404,11 +1407,11 @@
archivemail.options.min_size = size_arg
archivemail.archive(self.mbox_name)
elif execute == "system_long":
@@ -299,7 +324,7 @@
(size_arg, self.mbox_name)
self.assertEqual(os.system(run), 0)
else:
-@@ -1262,11 +1266,11 @@
+@@ -1435,11 +1438,11 @@
archivemail.options.min_size = size_arg
archivemail.archive(self.mbox_name)
elif execute == "system_long":
@@ -313,7 +338,7 @@
(size_arg, self.mbox_name)
self.assertEqual(os.system(run), 0)
else:
-@@ -1299,7 +1303,7 @@
+@@ -1472,7 +1475,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -322,7 +347,7 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -1322,7 +1326,7 @@
+@@ -1495,7 +1498,7 @@
if execute == "package":
archivemail.archive(self.mbox_name)
elif execute == "system":
@@ -331,11 +356,9 @@
self.assertEqual(os.system(run), 0)
else:
sys.exit(1)
-@@ -1393,5 +1397,7 @@
- return name
+@@ -1567,4 +1570,5 @@
-+
if __name__ == "__main__":
+ os.chdir(ARCHIVEMAIL_DATADIR)
unittest.main()
More information about the fedora-extras-commits
mailing list