rpms/PyX/devel .cvsignore,1.3,1.4 PyX.spec,1.6,1.7 sources,1.3,1.4

Fri Jan 11 16:12:16 UTC 2008

Author: jamatos

Update of /cvs/pkgs/rpms/PyX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7848

Modified Files:
	.cvsignore PyX.spec sources 
Log Message:
* Fri Jan 11 2008 JosÃ© Matos <jamatos[AT]fc.up.pt> - 0.10-1
- New upstream release (#426816).
- Package cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyX/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	3 Jun 2006 11:51:50 -0000	1.3
+++ .cvsignore	11 Jan 2008 16:11:39 -0000	1.4
@@ -1,4 +1,2 @@
-PyX-0.8.1-manual.pdf
-PyX-0.8.1.tar.gz
-PyX-0.9-manual.pdf
-PyX-0.9.tar.gz
+PyX-0.10.tar.gz
+PyX-0.10-manual.pdf


Index: PyX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyX/devel/PyX.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PyX.spec	28 Aug 2007 17:56:23 -0000	1.6
+++ PyX.spec	11 Jan 2008 16:11:39 -0000	1.7
@@ -1,24 +1,32 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+# Necessary as soon as mkhowto is used
+# at the moment that is not possible (#220693)
+#%define pybasever %(%{__python} -c "from sys import version_info; print '%d.%d' % version_info[:2]")
+#%define doc_tools_dir %{_libdir}/python%{pybasever}/Doc/tools
+
 Name:           PyX
-Version:        0.9
-Release:        5%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Python graphics package
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://pyx.sourceforge.net/
-Source0:        http://download.sourceforge.net/sourceforge/pyx/PyX-%{version}.tar.gz
-# Fedora doesn't seem to ship with the python mkhowto script needed to generate
-# the manual at build time. The manual here is from:
-# http://pyx.sourceforge.net/manual.pdf
-Source1:	%{name}-%{version}-manual.pdf
+Source0:        http://downloads.sourceforge.net/sourceforge/pyx/PyX-%{version}.tar.gz
+Source1:        %{name}-%{version}-manual.pdf
+
 # Fix the install root in the siteconfig.py
 Patch0:         PyX-0.8.1-siteconfig.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
+BuildRequires:  kpathsea-devel
 BuildRequires:  tetex-latex
+# for mkhowto
+#BuildRequires:  python-tools
+
 Requires:       tetex
 
 %description
@@ -33,26 +41,21 @@
 
 
 %build
-%{__sed} -i 's?^build_t1code=.*?build_t1code=1?' setup.cfg
-# Bug #150085 excludes x86_64 - don't enable pykpathsea C module for x86_64
-%ifnarch x86_64
-%{__sed} -i 's?^build_pykpathsea=.*?build_pykpathsea=1?' setup.cfg
-%endif
+%{__sed} -i 's|^build_t1code=.*|build_t1code=1|' setup.cfg
+%{__sed} -i 's|^build_pykpathsea=.*|build_pykpathsea=1|' setup.cfg
 
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 # turn on ipc in config file
-%{__sed} -i 's?^texipc =.*?texipc = 1?' pyxrc
+%{__sed} -i 's|^texipc =.*|texipc = 1|' pyxrc
 
 pushd faq
 make
 popd
 
 pushd manual
-## Nope - fedora doesn't ship with mkhowto
-## Bug #177349
-# ln -s /path/to/python/mkhowto .
-# make
+#ln -s %{doc_tools_dir}/mkhowto .
+#make
 cp %{SOURCE1} ./manual.pdf
 popd
 
@@ -62,9 +65,9 @@
 
 # Fix the non-exec with shellbang rpmlint errors
 for file in `find %{buildroot}%{python_sitearch}/pyx -type f -name "*.py"`; do
-  [ ! -x ${file} ] && %{__sed} -i 's?^#!?##?' ${file}
+  [ ! -x ${file} ] && %{__sed} -i 's|^#!|##|' ${file}
 done
- 
+
 %clean
 rm -rf %{buildroot}
 
@@ -75,34 +78,14 @@
 %doc contrib/ examples/
 %config(noreplace) %{_sysconfdir}/pyxrc
 %{_datadir}/pyx/
-%dir %{python_sitearch}/pyx
-%{python_sitearch}/pyx/*.py
-%{python_sitearch}/pyx/*.py[co]
-%dir %{python_sitearch}/pyx/graph
-%{python_sitearch}/pyx/graph/*.py
-%{python_sitearch}/pyx/graph/*.py[co]
-%dir %{python_sitearch}/pyx/graph/axis
-%{python_sitearch}/pyx/graph/axis/*.py
-%{python_sitearch}/pyx/graph/axis/*.py[co]
-%dir %{python_sitearch}/pyx/pykpathsea
-%{python_sitearch}/pyx/pykpathsea/*.py
-%{python_sitearch}/pyx/pykpathsea/*.py[co]
-%ifnarch x86_64
-%{python_sitearch}/pyx/pykpathsea/*.so
-%endif
-### t1strip stuff moved to font in 0.9
-#%%dir %{python_sitearch}/pyx/t1strip
-#%%{python_sitearch}/pyx/t1strip/*.py
-#%%{python_sitearch}/pyx/t1strip/*.pyc
-#%%ghost %{python_sitearch}/pyx/t1strip/*.pyo
-#%%{python_sitearch}/pyx/t1strip/*.so
-%dir %{python_sitearch}/pyx/font
-%{python_sitearch}/pyx/font/*.py
-%{python_sitearch}/pyx/font/*.py[co]
-%{python_sitearch}/pyx/font/*.so
+%{python_sitearch}/pyx/
 
 
 %changelog
+* Fri Jan 11 2008 JosÃ© Matos <jamatos[AT]fc.up.pt> - 0.10-1
+- New upstream release (#426816).
+- Package cleanup.
+
 * Tue Aug 28 2007 JosÃ© Matos <jamatos[AT]fc.up.pt> - 0.9-5
 - License fix, rebuild for devel (F8).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyX/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jun 2006 11:51:50 -0000	1.3
+++ sources	11 Jan 2008 16:11:39 -0000	1.4
@@ -1,4 +1,2 @@
-bfab7bbc4f3442c946f489133df515f0  PyX-0.8.1-manual.pdf
-5e751cef8d62774a6fc659cc9a03c231  PyX-0.8.1.tar.gz
-937cfe462b5d1c8341e3d3285f676f7c  PyX-0.9-manual.pdf
-c90c59e257e713cae1dc99677100ffeb  PyX-0.9.tar.gz
+20a8697a4b37c3ead10348ad5a49ba1a  PyX-0.10.tar.gz
+4b473a641144ad6bdecd93e47abcc7be  PyX-0.10-manual.pdf


