From 89a72a73a1ec3d2c32f6c94aa35718bbd9d9287c2cdeeffc428ae414fb2d4767 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Sun, 24 Jul 2016 15:57:13 +0000
Subject: [PATCH] Accepting request 412406 from
home:1Antoine1:branches:devel:languages:python
- Fix build (boo#985412):
* Use --record-rpm instead of --record for listing files
installed with setup.py
* Fix ConcurrentLogHandler-0.9.1-testpath.patch: py files were
not installed.
OBS-URL: https://build.opensuse.org/request/show/412406
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-concurrentloghandler?expand=0&rev=8
---
ConcurrentLogHandler-0.9.1-testpath.patch | 7 +++----
python-concurrentloghandler.changes | 9 +++++++++
python-concurrentloghandler.spec | 8 ++++----
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ConcurrentLogHandler-0.9.1-testpath.patch b/ConcurrentLogHandler-0.9.1-testpath.patch
index 8df7064..0d75e92 100644
--- a/ConcurrentLogHandler-0.9.1-testpath.patch
+++ b/ConcurrentLogHandler-0.9.1-testpath.patch
@@ -1,10 +1,9 @@
--- setup.py
+++ setup.py
-@@ -261,14 +261,7 @@
- "cloghandler",
+@@ -262,13 +262,7 @@ setup(name='ConcurrentLogHandler',
"portalocker",
],
-- package_dir={ '' : 'src', },
+ package_dir={ '' : 'src', },
- data_files=[
- ('tests', ["stresstest.py"]),
- ('docs', [
@@ -12,7 +11,7 @@
- 'LICENSE',
- ]),
- ],
-+ data_files=[ ],
++ data_files=[],
url="http://launchpad.net/python-concurrent-log-handler",
license = "http://www.apache.org/licenses/LICENSE-2.0",
description=doc.pop(0),
diff --git a/python-concurrentloghandler.changes b/python-concurrentloghandler.changes
index 0d0cff3..82a794b 100644
--- a/python-concurrentloghandler.changes
+++ b/python-concurrentloghandler.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jul 20 17:05:26 UTC 2016 - antoine.belvire@laposte.net
+
+- Fix build (boo#985412):
+ * Use --record-rpm instead of --record for listing files
+ installed with setup.py
+ * Fix ConcurrentLogHandler-0.9.1-testpath.patch: py files were
+ not installed.
+
-------------------------------------------------------------------
Thu Sep 26 23:38:12 UTC 2013 - p.drouand@gmail.com
diff --git a/python-concurrentloghandler.spec b/python-concurrentloghandler.spec
index 7b87c0e..02d490f 100644
--- a/python-concurrentloghandler.spec
+++ b/python-concurrentloghandler.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-concurrentloghandler
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,11 +20,11 @@
Name: python-concurrentloghandler
Version: 0.9.1
-Release: 1
+Release: 0
Summary: Concurrent logging handler
-Url: http://pypi.python.org/pypi/ConcurrentLogHandler
License: Apache-2.0
Group: Development/Libraries/Python
+Url: http://pypi.python.org/pypi/ConcurrentLogHandler
Source: https://pypi.python.org/packages/source/C/ConcurrentLogHandler/%{modname}-%{version}.tar.gz
Patch0: %modname-0.9.1-testpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -51,7 +51,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
python setup.py build
%install
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-data=%_defaultdocdir/%name --record=INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-data=%_defaultdocdir/%name --record-rpm=INSTALLED_FILES
%files -f INSTALLED_FILES
%defattr(-,root,root)