From e39831b48d1e78f2a4a2f9c679b1774c075aa14ed1f93b24a297eeef091228af Mon Sep 17 00:00:00 2001
From: Todd R <toddrme2178@gmail.com>
Date: Fri, 18 May 2012 15:28:08 +0000
Subject: [PATCH] Accepting request 121469 from
 home:TheBlackCat:branches:devel:languages:python

- Fix rpmlint warnings
- Improve openSUSE 11.4 build fix
- Clean up spec file

OBS-URL: https://build.opensuse.org/request/show/121469
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tornado?expand=0&rev=19
---
 python-tornado.changes  |  7 +++++++
 python-tornado.spec     | 12 +++++++++++-
 python3-tornado.changes |  7 +++++++
 python3-tornado.spec    | 16 ++++++++++++----
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/python-tornado.changes b/python-tornado.changes
index b68b623..7cf2f5a 100644
--- a/python-tornado.changes
+++ b/python-tornado.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 18 15:27:08 UTC 2012 - toddrme2178@gmail.com
+
+- Fix rpmlint warnings
+- Improve openSUSE 11.4 build fix
+- Clean up spec file
+
 -------------------------------------------------------------------
 Mon Apr 30 13:06:58 UTC 2012 - toddrme2178@gmail.com
 
diff --git a/python-tornado.spec b/python-tornado.spec
index 21a4099..00811e3 100644
--- a/python-tornado.spec
+++ b/python-tornado.spec
@@ -28,7 +28,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 Requires:       python-pycurl
 Requires:       python-simplejson
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%if 0%{?suse_version}
+BuildRequires:  fdupes
+%endif
+%if 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %else
 BuildArch:      noarch
@@ -58,10 +61,17 @@ python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%if 0%{?suse_version}
+%fdupes demos
+%endif
+# fix executability rmplint warning
+chmod +x %{buildroot}%{python_sitelib}/%{modname}/*.py
+chmod +x %{buildroot}%{python_sitelib}/%{modname}/*/*.py
 
 %files
 %defattr(-,root,root,-)
 %doc README demos
 %{python_sitelib}/%{modname}
 %{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info
+
 %changelog
diff --git a/python3-tornado.changes b/python3-tornado.changes
index e5c0568..5e4a745 100644
--- a/python3-tornado.changes
+++ b/python3-tornado.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 18 15:27:08 UTC 2012 - toddrme2178@gmail.com
+
+- Fix rpmlint warnings
+- Improve openSUSE 11.4 build fix
+- Clean up spec file
+
 -------------------------------------------------------------------
 Mon Apr 30 13:06:58 UTC 2012 - toddrme2178@gmail.com
 
diff --git a/python3-tornado.spec b/python3-tornado.spec
index f0b84ba..afdea5c 100644
--- a/python3-tornado.spec
+++ b/python3-tornado.spec
@@ -28,13 +28,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python3-devel
 BuildRequires:  python3-2to3
 BuildRequires:  python3-distribute
+%if 0%{?suse_version}
+BuildRequires:  fdupes
+%endif
 %if 0%{?suse_version} <= 1140
 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)}
-%ifarch x86_64
-# to allow ownership of noarch python directories
-BuildRequires:  python3-32bit
-%endif
 %endif
 BuildArch:      noarch
 Requires:       python3 >= %{py3_ver}
@@ -65,10 +64,19 @@ python3 setup.py build
 
 %install
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%fdupes demos
+# fix executability rpmlint warning
+chmod +x %{buildroot}%{python3_sitelib}/%{modname}/*.py
+chmod +x %{buildroot}%{python3_sitelib}/%{modname}/*/*.py
 
 %files
 %defattr(-,root,root,-)
 %doc README demos
 %{python3_sitelib}/%{modname}
 %{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info
+%if 0%{?suse_version} <= 1140
+%dir %{_prefix}/lib/python%{py3_ver}
+%dir %{python3_sitelib}
+%endif
+
 %changelog