commit 76ff4d877d7616fc4937d43d9779d21c2dfb4fbd
Author: Elan Ruusamäe <[email protected]>
Date: Mon Nov 9 22:52:05 2015 +0200
up to 0.16.2
fedmsg-kojitests.patch | 58 --------------------------------------------------
fedmsg.spec | 6 ++----
2 files changed, 2 insertions(+), 62 deletions(-)
---
diff --git a/fedmsg.spec b/fedmsg.spec
index 58c8f45..0efa601 100644
--- a/fedmsg.spec
+++ b/fedmsg.spec
@@ -9,14 +9,13 @@
Summary: Tools for Fedora Infrastructure real-time messaging
Name: fedmsg
-Version: 0.11.1
+Version: 0.16.2
Release: 1
License: LGPL v2+
Group: Applications/Networking
Source0:
http://pypi.python.org/packages/source/f/fedmsg/%{name}-%{version}.tar.gz
-# Source0-md5: 3074d89b779929b338ac609081e10340
+# Source0-md5: 43fc8257724252b38b34608b0c9a2218
Source1: %{name}-tmpfiles.conf
-Patch0: %{name}-kojitests.patch
Patch1: config.patch
URL: https://github.com/fedora-infra/fedmsg
BuildRequires: python-devel
@@ -120,7 +119,6 @@ firewall.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
# This only got shipped with fedmsg-0.6.3
diff --git a/fedmsg-kojitests.patch b/fedmsg-kojitests.patch
deleted file mode 100644
index 12f1970..0000000
--- a/fedmsg-kojitests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 261bf1fcb2ae393e3ef96805e7d7b2f93884f90d Mon Sep 17 00:00:00 2001
-From: Ralph Bean <[email protected]>
-Date: Fri, 7 Nov 2014 10:58:24 -0500
-Subject: [PATCH] Try to get tests passing in koji again.
-
----
- fedmsg/tests/test_crypto_switching.py | 6 ++++--
- fedmsg/tests/test_crypto_x509.py | 6 ++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/fedmsg/tests/test_crypto_switching.py
b/fedmsg/tests/test_crypto_switching.py
-index 64feca2..5644856 100644
---- a/fedmsg/tests/test_crypto_switching.py
-+++ b/fedmsg/tests/test_crypto_switching.py
-@@ -18,14 +18,16 @@
- # Authors: Ralph Bean <[email protected]>
- #
- import six
-+import sys
- import os
-
- import nose.tools.nontrivial
-
--try:
-+major, minor = sys.version_info[:2]
-+if major == 2 and minor <= 6:
- # For python-2.6, so we can do skipTest
- import unittest2 as unittest
--except ImportError:
-+else:
- import unittest
-
- import fedmsg.crypto
-diff --git a/fedmsg/tests/test_crypto_x509.py
b/fedmsg/tests/test_crypto_x509.py
-index 06bde10..efea61a 100644
---- a/fedmsg/tests/test_crypto_x509.py
-+++ b/fedmsg/tests/test_crypto_x509.py
-@@ -20,13 +20,15 @@
- import os
- import shutil
- import six
-+import sys
-
- import nose.tools.nontrivial
-
--try:
-+major, minor = sys.version_info[:2]
-+if major == 2 and minor <= 6:
- # For python-2.6, so we can do skipTest
- import unittest2 as unittest
--except ImportError:
-+else:
- import unittest
-
- import fedmsg.crypto
---
-1.9.3
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fedmsg.git/commitdiff/76ff4d877d7616fc4937d43d9779d21c2dfb4fbd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
