From 398caaa0d52dd8e9aa0c9e7c3ab86a79de95334dc22bc376e30d6db33f63d685 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 29 May 2012 09:44:40 +0000 Subject: [PATCH] Accepting request 122375 from devel:languages:python Resubmit with fixed source OBS-URL: https://build.opensuse.org/request/show/122375 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-reportlab?expand=0&rev=8 --- python-reportlab.changes | 5 +++++ python-reportlab.spec | 23 ++++++++++++++--------- reportlab-2.5.tar.bz2 | 3 --- reportlab-2.5.tar.gz | 3 +++ 4 files changed, 22 insertions(+), 12 deletions(-) delete mode 100644 reportlab-2.5.tar.bz2 create mode 100644 reportlab-2.5.tar.gz diff --git a/python-reportlab.changes b/python-reportlab.changes index 2bac972..c3cc2e6 100644 --- a/python-reportlab.changes +++ b/python-reportlab.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 25 11:35:57 UTC 2012 - toddrme2178@gmail.com + +- Clean up spec file + ------------------------------------------------------------------- Thu Dec 8 13:54:44 UTC 2011 - coolo@suse.com diff --git a/python-reportlab.spec b/python-reportlab.spec index 449dd91..fce9878 100644 --- a/python-reportlab.spec +++ b/python-reportlab.spec @@ -1,7 +1,7 @@ # # spec file for package python-reportlab # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - -Name: python-reportlab +%define modname reportlab +Name: python-%{modname} Version: 2.5 Release: 0 Url: http://www.reportlab.com/ Summary: The Reportlab Toolkit License: BSD-2-Clause Group: Development/Languages/Python -Source: reportlab-%{version}.tar.bz2 +Source: http://www.reportlab.com/ftp/%{modname}-%{version}.tar.gz Patch0: reportlab-missing-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: freetype2-devel @@ -34,16 +33,17 @@ BuildRequires: python-xml Requires: python-imaging Provides: python-ReportLab = %{version} Obsoletes: python-ReportLab < %{version} -%if 0%{?suse_version} +%if 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%else %py_requires %endif -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description The ReportLab Toolkit. An Open Source Python library for generating PDFs and graphics. %prep -%setup -q -n reportlab-%{version} +%setup -q -n %{modname}-%{version} %patch0 sed -i "1d" src/reportlab/lib/{formatters,fonts,set_ops,corp,units,pagesizes,__init__,randomtext,logger,normalDate}.py sed -i "1d" src/reportlab/graphics/{widgets/table,barcode/test,testdrawings,testshapes}.py # Fix non-executable bits @@ -60,6 +60,11 @@ python setup.py tests %files %defattr(-,root,root,-) %doc CHANGES.txt README.txt -%{python_sitearch}/* +%{python_sitearch}/_renderPM.so +%{python_sitearch}/_rl_accel.so +%{python_sitearch}/pyHnj.so +%{python_sitearch}/sgmlop.so +%{python_sitearch}/%{modname}/ +%{python_sitearch}/%{modname}-%{version}-py%{py_ver}.egg-info %changelog diff --git a/reportlab-2.5.tar.bz2 b/reportlab-2.5.tar.bz2 deleted file mode 100644 index fe573cd..0000000 --- a/reportlab-2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58cdf1ade2a66f9fd6e32fafe257d2e543a0d495251bea5a1cbeb2705071be68 -size 1720701 diff --git a/reportlab-2.5.tar.gz b/reportlab-2.5.tar.gz new file mode 100644 index 0000000..ab29442 --- /dev/null +++ b/reportlab-2.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:805152084cc8421104a5e1e705482a1034598ecb4c266670dfba31996de6ff69 +size 1917306