rpms/python-twisted-mail/devel .cvsignore, 1.3, 1.4 python-twisted-mail.spec, 1.7, 1.8 sources, 1.3, 1.4

Matthias Saou thias at fedoraproject.org
Tue Dec 23 21:29:13 UTC 2008


Author: thias

Update of /cvs/extras/rpms/python-twisted-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1999

Modified Files:
	.cvsignore python-twisted-mail.spec sources 
Log Message:
Update to 8.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2007 12:00:16 -0000	1.3
+++ .cvsignore	23 Dec 2008 21:28:43 -0000	1.4
@@ -1 +1 @@
-TwistedMail-0.4.0.tar.bz2
+TwistedMail-8.1.0.tar.bz2


Index: python-twisted-mail.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/python-twisted-mail.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-twisted-mail.spec	30 Nov 2008 12:38:44 -0000	1.7
+++ python-twisted-mail.spec	23 Dec 2008 21:28:43 -0000	1.8
@@ -1,23 +1,18 @@
-%{?!python:%define python python}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define origname TwistedMail
+%{!?python:%define python python}
+%{!?python_sitearch: %define python_sitearch %(%{python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           %{python}-twisted-mail
-Version:        0.4.0
-Release:        6%{?dist}
-Summary:        A Twisted Mail library, server and client
-
+Version:        8.1.0
+Release:        2%{?dist}
+Summary:        SMTP, IMAP and POP protocol implementation together with clients and servers
 Group:          Development/Libraries
 License:        MIT
-URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.4/TwistedMail-%{version}.tar.bz2
+URL:            http://www.twistedmatrix.com/trac/wiki/TwistedMail
+Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/8.1/TwistedMail-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{python}-twisted-core >= 2.5.0
-BuildRequires:  python-devel
-
-Requires:       %{python}-twisted-core >= 2.5.0
+BuildRequires:  %{python}-twisted-core >= 8.1.0
+BuildRequires:  %{python}-devel
+Requires:       %{python}-twisted-core >= 8.1.0
 Requires:       %{python}-twisted-names
 
 # a noarch-turned-arch package should not have debuginfo
@@ -26,53 +21,66 @@
 %description
 Twisted is an event-based framework for internet applications.
 
-Twisted Mail contains high-level, efficient protocol implementations
-for both clients and servers of SMTP, POP3, and IMAP4. Additionally,
-it contains an "out of the box" combination SMTP/POP3 virtual-hosting
-mail server. Also included is a read/write Maildir implementation and
-a basic Mail Exchange calculator.
+Twisted Mail contains high-level, efficient protocol implementations for both
+clients and servers of SMTP, POP3, and IMAP4. Additionally, it contains an "out
+of the box" combination SMTP/POP3 virtual-hosting mail server. Also included is
+a read/write Maildir implementation and a basic Mail Exchange calculator.
 
 %prep
-%setup -n %{origname}-%{version} -q
+%setup -q -n TwistedMail-%{version}
+
+# Remove spurious shellbangs
+%{__sed} -i -e '/^#! *\/usr\/bin\/python/d' twisted/mail/test/pop3testserver.py
 
 %build
+%{python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-# this is a pure python package, but extending the twisted namespace from
+%{__rm} -rf %{buildroot}
+
+# This is a pure python package, but extending the twisted namespace from
 # python-twisted-core, which is arch-specific, so it needs to go in sitearch
-%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --install-purelib %{python_sitearch}
+%{python} setup.py install -O1 --skip-build \
+    --install-purelib %{python_sitearch} --root %{buildroot}
 
 # Man pages
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
-cp -a doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-rm -rf doc/man
-
-# this .py file has a shebang line so should be executable
-chmod +x $RPM_BUILD_ROOT%{python_sitearch}/twisted/mail/test/pop3testserver.py
+%{__mkdir_p} %{buildroot}%{_mandir}/man1/
+%{__cp} -a doc/man/*.1 %{buildroot}%{_mandir}/man1/
+%{__rm} -rf doc/man
+
+# See if there's any egg-info
+if [ -f %{buildroot}%{python_sitearch}/Twisted*.egg-info ]; then
+    echo %{buildroot}%{python_sitearch}/Twisted*.egg-info |
+        %{__sed} -e 's|^%{buildroot}||'
+fi > egg-info
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p %{_libexecdir}/twisted-dropin-cache
+%{__rm} -rf %{buildroot}
 
-%postun -p %{_libexecdir}/twisted-dropin-cache
+%post
+if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
+    %{_libexecdir}/twisted-dropin-cache || :
+fi
+
+%postun
+if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
+    %{_libexecdir}/twisted-dropin-cache || :
+fi
 
-%files
+%files -f egg-info
 %defattr(-,root,root,-)
 %doc LICENSE NEWS README doc/*
-%{_mandir}/man1/*
 %{_bindir}/mailmail
-
+%{_mandir}/man1/mailmail.1*
 %{python_sitearch}/twisted/mail/
-
 %{python_sitearch}/twisted/plugins/twisted_mail.py*
 
-%if 0%{?fedora} >= 9
-  %{python_sitearch}/Twisted_Mail-%{version}-py?.?.egg-info
-%endif
-
 %changelog
+* Tue Dec 23 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-2
+- Update to 8.1.0.
+- Merge back changes from Paul Howarth.
+- Make sure the scriplets never return a non-zero exit status.
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.0-6
 - Fix locations for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2007 12:00:16 -0000	1.3
+++ sources	23 Dec 2008 21:28:43 -0000	1.4
@@ -1 +1 @@
-b2e1428b527333878434777f284f0e91  TwistedMail-0.4.0.tar.bz2
+b471434356da5cdfb04dbe38802425ef  TwistedMail-8.1.0.tar.bz2




More information about the fedora-extras-commits mailing list