rpms/python-reportlab/F-12 .cvsignore, 1.6, 1.7 python-reportlab.spec, 1.19, 1.20 sources, 1.6, 1.7 python-reportlab-2.1-remove_luxifont.patch, 1.1, NONE

[Konstantin Ryabitsev]

Author: icon

Update of /cvs/pkgs/rpms/python-reportlab/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23668/F-12

Modified Files:
	.cvsignore python-reportlab.spec sources 
Removed Files:
	python-reportlab-2.1-remove_luxifont.patch 
Log Message:
Update F-11, F-12, and devel to reportlab-2.3. Tweak the specfile accordingly,
partly in order to build the PDF docs.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-reportlab/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 May 2007 00:30:40 -0000	1.6
+++ .cvsignore	15 Nov 2009 05:20:49 -0000	1.7
@@ -1 +1 @@
-ReportLab_2_1.tgz
+ReportLab_2_3.tar.gz


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-reportlab/F-12/python-reportlab.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- python-reportlab.spec	26 Jul 2009 20:59:18 -0000	1.19
+++ python-reportlab.spec	15 Nov 2009 05:20:50 -0000	1.20
@@ -1,20 +1,18 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-reportlab
-Version:	2.1
-Release:	6%{?dist}
+Version:	2.3
+Release:	1%{?dist}
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
 License:	BSD
 URL:		http://www.reportlab.org/
-Source0:	http://www.reportlab.org/ftp/ReportLab_2_1.tgz
-Patch0:		%{name}-%{version}-remove_luxifont.patch
+Source0:	http://www.reportlab.org/ftp/ReportLab_2_3.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
 
-BuildRequires:	python-devel
+BuildRequires: python-devel, python-imaging
 
 
 %description
@@ -28,37 +26,25 @@ Requires:	%{name} = %{version}-%{release
 
 
 %description docs
-The %{name}-docs package contains the documentation for ReportLab in PDF format.
+Contains the documentation for ReportLab.
 
 
 %prep
-%setup -q -n reportlab_2_1
-%patch0 -p1 -b .luxifont
+%setup -q -n ReportLab_2_3
+# clean up hashbangs from libraries
+find src -name '*.py' | xargs sed -i -e '/^#!\//d'
 
 
 %build
-cd ./reportlab
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+# a bit of a horrible hack due to a chicken-and-egg problem. The docs
+# require reportlab, which isn't yet installed, but is at least built.
+PYTHONPATH="`pwd`/`ls -d build/lib*`" %{__python} docs/genAll.py
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd ./reportlab
-%{__python} setup.py install --root $RPM_BUILD_ROOT
-
-# Remove test, doc, and demo files.
-rm -Rf ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/demos
-rm -Rf ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/graphics/samples
-rm -Rf ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/tools/pythonpoint/demos
-rm -Rf ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/docs
-rm -Rf ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/test/
-
-rm ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
-rm ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
-rm ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
-
-# Remove luxi font, since it doesn't permit modifications.
-rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/fonts/luxiserif*
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 
 %clean
@@ -67,28 +53,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc reportlab/README reportlab/changes reportlab/license.txt
-%dir %{python_sitelib}/reportlab
-%{python_sitelib}/reportlab/*.py*
-%{python_sitelib}/reportlab/extensions/
-%{python_sitelib}/reportlab/fonts/
-%{python_sitelib}/reportlab/graphics/
-%{python_sitelib}/reportlab/lib/
-%{python_sitelib}/reportlab/pdfbase/
-%{python_sitelib}/reportlab/pdfgen/
-%{python_sitelib}/reportlab/platypus/
-%{python_sitelib}/reportlab/tools/
-%{python_sitelib}/Reportlab-2.1-py?.?.egg-info
+%doc README.txt CHANGES.txt LICENSE.txt
+%{python_sitearch}/reportlab
+%{python_sitearch}/reportlab*.egg-info
+%{python_sitearch}/*.so
 
 
 %files docs
 %defattr(-,root,root,-)
-%doc reportlab/docs/*.pdf
+%doc docs/*.pdf demos tools LICENSE.txt
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Nov 12 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.3-1
+- Updated to 2.3
+- New version is no longer noarch.
+
+* Fri Apr 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1-6
+- Rebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
@@ -138,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add dist tag.
 
 * Sat Apr 24 2004 Brian Pepple <bdpepple at ameritech.net> 0:1.19-0.fdr.2
-- Removed %ghosts.
+- Removed ghosts.
 
 * Sat Mar 20 2004 Brian Pepple <bdpepple at ameritech.net> 0:1.19-0.fdr.1
 - Initial Fedora RPM build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-reportlab/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 May 2007 00:30:40 -0000	1.6
+++ sources	15 Nov 2009 05:20:50 -0000	1.7
@@ -1 +1 @@
-d6eefe9e6e06aaa1315462045c9726ba  ReportLab_2_1.tgz
+057b846bd3b7b2c3498bf14f6a523632  ReportLab_2_3.tar.gz


--- python-reportlab-2.1-remove_luxifont.patch DELETED ---