Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1db7c6688a786292a5996900c2d097331e705caf
commit 1db7c6688a786292a5996900c2d097331e705caf
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Sat Nov 10 23:06:19 2007 +0100
archivemail-0.7.2-1-i686
version bump
removed -python25.patch, it's in upstream now
diff --git a/source/network-extra/archivemail/FrugalBuild
b/source/network-extra/archivemail/FrugalBuild
index 15b18e7..1556472 100644
--- a/source/network-extra/archivemail/FrugalBuild
+++ b/source/network-extra/archivemail/FrugalBuild
@@ -2,13 +2,11 @@
# Maintainer: VMiklos <[EMAIL PROTECTED]>
pkgname=archivemail
-pkgver=0.7.0
+pkgver=0.7.2
pkgrel=1
pkgdesc="A tool for archiving and compressing old email in mailboxes."
Finclude sourceforge
depends=('python')
groups=('network-extra')
archs=('i686')
-source=($source archivemail-0.7.0-python25.patch)
-sha1sums=('fcba04b7ae748d54b8ebcbecb0aad08c4f58e927' \
- '607cb3224adf67cf7d0c4d06eec586e6e6787936')
+sha1sums=('0ff9b8991b04f09cf9536c45b6f9e05d2427a459')
diff --git a/source/network-extra/archivemail/archivemail-0.7.0-python25.patch
b/source/network-extra/archivemail/archivemail-0.7.0-python25.patch
deleted file mode 100644
index 41e2f76..0000000
--- a/source/network-extra/archivemail/archivemail-0.7.0-python25.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- archivemail-0.7.0/archivemail.orig 2006-11-03 01:21:22.000000000 +0200
-+++ archivemail-0.7.0/archivemail 2007-05-10 12:04:16.000000000 +0300
-@@ -779,7 +779,10 @@
- # the headers have no valid dates -- last resort, try the file timestamp
- # this will not work for mbox mailboxes
- try:
-- file_name = message.fp.name
-+ if sys.hexversion >= 0x020500F0:
-+ file_name = message.fp._file.name
-+ else:
-+ file_name = message.fp.name
- except AttributeError:
- # we are looking at a 'mbox' mailbox - argh!
- # Just return the current time - this will never get archived :(
-@@ -788,7 +791,7 @@
- if not os.path.isfile(file_name):
- unexpected_error("mailbox file name '%s' has gone missing" % \
- file_name)
-- time_message = os.path.getmtime(message.fp.name)
-+ time_message = os.path.getmtime(file_name)
- vprint("using valid time found from '%s' last-modification time" % \
- file_name)
- return time_message
-@@ -806,7 +809,11 @@
- """
- status = ""
- x_status = ""
-- match = re.search(":2,(.+)$", message.fp.name)
-+ if sys.hexversion >= 0x020500F0:
-+ fpname = message.fp._file.name
-+ else:
-+ fpname = message.fp.name
-+ match = re.search(":2,(.+)$", fpname)
- if match:
- flags = match.group(1)
- for flag in flags:
-@@ -825,7 +832,7 @@
-
- # files in the maildir 'cur' directory are no longer new,
- # they are the same as messages with 'Status: O' headers in mbox
-- last_dir = os.path.basename(os.path.dirname(message.fp.name))
-+ last_dir = os.path.basename(os.path.dirname(fpname))
- if last_dir == "cur":
- status = status + "O"
-
-@@ -881,7 +888,10 @@
- return 1
- file_name = None
- try:
-- file_name = message.fp.name
-+ if sys.hexversion >= 0x020500F0:
-+ file_name = message.fp._file.name
-+ else:
-+ file_name = message.fp.name
- except AttributeError:
- pass
- # maildir mailboxes use the filename suffix to indicate flagged status
-@@ -901,7 +911,10 @@
- return 0
- file_name = None
- try:
-- file_name = message.fp.name
-+ if sys.hexversion >= 0x020500F0:
-+ file_name = message.fp._file.name
-+ else:
-+ file_name = message.fp.name
- except AttributeError:
- pass
- # maildir mailboxes use the filename suffix to indicate read status
-@@ -918,7 +931,10 @@
- file_name = None
- message_size = None
- try:
-- file_name = message.fp.name
-+ if sys.hexversion >= 0x020500F0:
-+ file_name = message.fp._file.name
-+ else:
-+ file_name = message.fp.name
- except AttributeError:
- pass
- if file_name:
-@@ -1269,7 +1285,11 @@
- if type == "maildir":
- add_status_headers(msg)
- archive.write(msg)
-- if not options.dry_run: delete_queue.append(msg.fp.name)
-+ if sys.hexversion >= 0x020500F0:
-+ fpname = msg.fp._file.name
-+ else:
-+ fpname = msg.fp.name
-+ if not options.dry_run: delete_queue.append(fpname)
- else:
- vprint("decision: retain message")
- msg = original.next()
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
