jsteffan pushed to python-twisted (master). "Update to 15.1.0 with packaging fixes. (..more)"

Sat May 9 23:05:34 UTC 2015

From eb11e73d7a07e806b24b26d3882e8744b8a9c0ac Mon Sep 17 00:00:00 2001
From: Jonathan Steffan <jsteffan at fedoraproject.org>
Date: Sat, 9 May 2015 17:04:43 -0600
Subject: Update to 15.1.0 with packaging fixes.

- Update to 15.1.0 (RHBZ#1187921,RHBZ#1192707)
- Require python-service-identity (RHBZ#1119067)
- Obsolete python-twisted-core-doc (RHBZ#1187025)

diff --git a/.gitignore b/.gitignore
index 36c8eec..7f31408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /Twisted-14.0.0.tar.bz2
 /Twisted-14.0.2.tar.bz2
+/Twisted-15.1.0.tar.bz2
diff --git a/python-twisted-14.0.0-doc-lore-man-fix.patch b/python-twisted-14.0.0-doc-lore-man-fix.patch
deleted file mode 100644
index 3242ca8..0000000
--- a/python-twisted-14.0.0-doc-lore-man-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up Twisted-14.0.0/doc/lore/man/lore.1.orig Twisted-14.0.0/doc/lore/man/lore.1
---- Twisted-14.0.0/doc/lore/man/lore.1.orig	2014-06-07 22:20:59.400731476 -0600
-+++ Twisted-14.0.0/doc/lore/man/lore.1	2014-06-07 22:21:30.121599388 -0600
-@@ -55,8 +55,8 @@ Display version information and exit.
- .TP
- \fI--config\fR
- Add input/output-specific information. 
--HTML output allows for 'ext=<extension>',
--'template=<template>' and 'baseurl=<format string for API URLs>'. LaTeX
-+HTML output allows for 'ext=<extension>', 'template=<template>'
-+and 'baseurl=<format string for API URLs>'. LaTeX
- output allows for 'section' or 'chapter' in Lore, and nothing in Math-Lore. 
- Lore output allows for 'ext=<extension>'. Lint output allows nothing.
- Note that disallowed \fI--config\fR options are merely ignored, and do
diff --git a/python-twisted-15.1.0-doc-lore-man-fix.patch b/python-twisted-15.1.0-doc-lore-man-fix.patch
new file mode 100644
index 0000000..3242ca8
--- /dev/null
+++ b/python-twisted-15.1.0-doc-lore-man-fix.patch
@@ -0,0 +1,14 @@
+diff -up Twisted-14.0.0/doc/lore/man/lore.1.orig Twisted-14.0.0/doc/lore/man/lore.1
+--- Twisted-14.0.0/doc/lore/man/lore.1.orig	2014-06-07 22:20:59.400731476 -0600
++++ Twisted-14.0.0/doc/lore/man/lore.1	2014-06-07 22:21:30.121599388 -0600
+@@ -55,8 +55,8 @@ Display version information and exit.
+ .TP
+ \fI--config\fR
+ Add input/output-specific information. 
+-HTML output allows for 'ext=<extension>',
+-'template=<template>' and 'baseurl=<format string for API URLs>'. LaTeX
++HTML output allows for 'ext=<extension>', 'template=<template>'
++and 'baseurl=<format string for API URLs>'. LaTeX
+ output allows for 'section' or 'chapter' in Lore, and nothing in Math-Lore. 
+ Lore output allows for 'ext=<extension>'. Lint output allows nothing.
+ Note that disallowed \fI--config\fR options are merely ignored, and do
diff --git a/python-twisted.spec b/python-twisted.spec
index 0879e6d..ebd2cce 100644
--- a/python-twisted.spec
+++ b/python-twisted.spec
@@ -1,24 +1,29 @@
 Name:           python-twisted
-Version:        14.0.2
+Version:        15.1.0
 Release:        1%{?dist}
 Summary:        Twisted is a networking engine written in Python
 License:        MIT
 URL:            http://twistedmatrix.com/
-Source0:        http://twistedmatrix.com/Releases/Twisted/14.0/Twisted-14.0.2.tar.bz2
-Patch0:         python-twisted-14.0.0-doc-lore-man-fix.patch
+Source0:        https://pypi.python.org/packages/source/T/Twisted/Twisted-%{version}.tar.bz2
+Patch0:         python-twisted-15.1.0-doc-lore-man-fix.patch
 BuildRequires:  python2-devel >= 2.6
 BuildRequires:  python-zope-interface >= 3.6.0
 BuildRequires:  python-crypto >= 2.6.1
 BuildRequires:  pyOpenSSL >= 0.10
+BuildRequires:  python-service-identity
+BuildRequires:  python-setuptools
 
 Requires:       python-zope-interface >= 3.6.0
 Requires:       pyOpenSSL >= 0.10
+Requires:       python-service-identity
 
 # Bring all provided resources back into the main package namespace.
 Obsoletes:      python-twisted-conch < 14
 Provides:       python-twisted-conch = %{version}-%{release}
 Obsoletes:      python-twisted-core < 14
 Provides:       python-twisted-core = %{version}-%{release}
+Obsoletes:      python-twisted-core-doc < 14
+Provides:       python-twisted-core-doc = %{version}-%{release}
 Obsoletes:      python-twisted-lore < 14
 Provides:       python-twisted-lore = %{version}-%{release}
 Obsoletes:      python-twisted-mail < 14
@@ -111,7 +116,7 @@ done
 
 
 %check
-# bin/trial twisted
+#bin/trial twisted
 # can't get this to work within the buildroot yet due to multicast
 # https://twistedmatrix.com/trac/ticket/7494
 
@@ -149,9 +154,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/trial.1*
 %{_mandir}/man1/twistd.1*
 %{python2_sitearch}/twisted
+%{python2_sitearch}/Twisted*
 
 
 %changelog
+* Sat May 09 2015 Jonathan Steffan <jsteffan at fedoraproject.org> - 15.1.0-1
+- Update to 15.1.0 (RHBZ#1187921,RHBZ#1192707)
+- Require python-service-identity (RHBZ#1119067)
+- Obsolete python-twisted-core-doc (RHBZ#1187025)
+
 * Sat Nov 22 2014 Jonathan Steffan <jsteffan at fedoraproject.org> - 14.0.2-1
 - Update to 14.0.2 (RHBZ#1143002)
 
diff --git a/sources b/sources
index 3478fa8..acc5e2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8379eb15601d6b7543a189594d3fed8f  Twisted-14.0.2.tar.bz2
+df65e3da0bee81140e7637156802a518  Twisted-15.1.0.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-twisted.git/commit/?h=master&id=eb11e73d7a07e806b24b26d3882e8744b8a9c0ac
