rpms/svnmailer/F-7 svnmailer-multipart.patch, NONE, 1.1 svnmailer.spec, 1.3, 1.4
Michael Fleming (mfleming)
fedora-extras-commits at redhat.com
Tue Apr 8 11:14:32 UTC 2008
Author: mfleming
Update of /cvs/extras/rpms/svnmailer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8604
Modified Files:
svnmailer.spec
Added Files:
svnmailer-multipart.patch
Log Message:
* Tue Apr 8 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.0.8-5
- Update Requires (remove obsolete abi() generation)
- Add patch to fix crash when sending multipart messages (bz# 438112)
- Update BuildRequires to fix bz# 4407884
- Add egg-info files.
svnmailer-multipart.patch:
--- NEW FILE svnmailer-multipart.patch ---
--- src/lib/svnmailer/notifier/_base.py.orig 2008-04-08 20:02:27.000000000 +1000
+++ src/lib/svnmailer/notifier/_base.py 2008-04-08 20:02:34.000000000 +1000
@@ -345,7 +345,6 @@
@return: The two encodings
@rtype: C{tuple} of C{str}
"""
- from encodings import exceptions
enc1 = enc2 = default
if not change.wasAdded() or change.wasCopied():
@@ -353,7 +352,7 @@
enc1 = self._getContentEncoding(
change.getBasePath(), change.getBaseRevision()
)
- except exceptions.LookupError:
+ except LookupError:
# fall back
pass
@@ -364,7 +363,7 @@
enc2 = self._getContentEncoding(
change.path, change.revision
)
- except exceptions.LookupError:
+ except LookupError:
# fall back
pass
@@ -389,7 +388,6 @@
@exception encodings.exception.LookupError: The specified encoding
is not implemented or no encoding was specified
"""
- from encodings import exceptions
# first try the svn:mime-type
enc = self.getEncodingFromMimeType(path, revision)
@@ -427,7 +425,7 @@
codecs.lookup(enc)
return enc
- raise exceptions.LookupError("No Encoding configured")
+ raise LookupError("No Encoding configured")
def getEncodingFromMimeType(self, path, revision):
Index: svnmailer.spec
===================================================================
RCS file: /cvs/extras/rpms/svnmailer/F-7/svnmailer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svnmailer.spec 9 Dec 2006 05:12:07 -0000 1.3
+++ svnmailer.spec 8 Apr 2008 11:13:50 -0000 1.4
@@ -2,18 +2,19 @@
Name: svnmailer
Version: 1.0.8
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Tool to post subversion repository commit information
Group: Development/Tools
License: Apache Software License
URL: http://opensource.perlig.de/svnmailer/
Source0: http://storage.perlig.de/svnmailer/svnmailer-%{version}.tar.bz2
+Patch0: svnmailer-multipart.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python-devel subversion >= 1.0.0
-Requires: subversion >= 1.0.0 python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires: python python-devel subversion >= 1.0.0
+Requires: subversion >= 1.0.0
%description
Svnmailer is a tool to post subversion repository commit information by mail,
@@ -29,7 +30,7 @@
%prep
%setup -q
-
+%patch -b .multi
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -47,12 +48,10 @@
%files
%defattr(-,root,root,-)
%doc README CHANGES CREDITS LICENSE NOTICE
-# Include files and dirs below %{python_sitelib} (for noarch packages) and
-# %{python_sitearch} (for arch-dependent packages) as appropriate, and mark
-# *.pyo as %ghost (do not include in package).
%{_bindir}/svn-mailer
%dir %{python_sitelib}/svnmailer
%dir %{python_sitelib}/svnmailer/notifier
+%{python_sitelib}/svnmailer*.egg-info
%{python_sitelib}/svnmailer/*.py
%{python_sitelib}/svnmailer/*.pyc
%{python_sitelib}/svnmailer/*.pyo
@@ -65,6 +64,12 @@
%doc docs/*
%changelog
+* Tue Apr 8 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.0.8-5
+- Update Requires (remove obsolete abi() generation)
+- Add patch to fix crash when sending multipart messages (bz# 438112)
+- Update BuildRequires to fix bz# 4407884
+- Add egg-info files.
+
* Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.0.8-3
- Rebuild for python 2.5
More information about the scm-commits
mailing list