rpms/plplot/EL-5 plplot.spec,1.26,1.27

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Mon Aug 6 23:00:10 UTC 2007


Author: orion

Update of /cvs/pkgs/rpms/plplot/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6180

Modified Files:
	plplot.spec 
Log Message:
- pygtk2-devel is broken in EL-5, disable for now (bug #251029)
- Disable octave support until plplot supports octave 2.9.11+



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/EL-5/plplot.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- plplot.spec	3 Aug 2007 02:00:19 -0000	1.26
+++ plplot.spec	6 Aug 2007 22:59:35 -0000	1.27
@@ -1,5 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
+%{!?with_octave:%define with_octave 0}
+%{!?with_pygtk2:%define with_pygtk2 0}
 
 Name:           plplot
 Version:        5.7.3
@@ -25,10 +27,16 @@
 %else
 %define build_ada %{nil}
 %endif
+%if %{with_octave}
+BuildRequires:  octave-devel
+%endif
+%if %{with_pygtk2}
+BuildRequires:  pygtk2-devel
+%endif
 BuildRequires:  java-devel, libgcj-devel
-BuildRequires:  freetype-devel, octave-devel, qhull-devel , ncurses-devel
+BuildRequires:  freetype-devel, qhull-devel , ncurses-devel
 BuildRequires:  gd-devel, tcl-devel, tk-devel, itcl-devel, itk-devel
-BuildRequires:  python-devel, pygtk2-devel, python-numeric
+BuildRequires:  python-devel, python-numeric
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
 BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
 BuildRequires:  freefont
@@ -125,6 +133,7 @@
 %{summary}.
 
 
+%if %{with_octave}
 %package        octave
 Summary:        Functions for scientific plotting with Octave
 Group:          Development/Libraries
@@ -133,6 +142,7 @@
 
 %description    octave
 %{summary}.
+%endif
 
 
 %package        tk
@@ -262,9 +272,11 @@
 
 %postun gnome -p /sbin/ldconfig
 
+%if %{with_octave}
 %post octave -p /sbin/ldconfig
 
 %postun octave -p /sbin/ldconfig
+%endif
 
 %post tk -p /sbin/ldconfig
 
@@ -325,7 +337,9 @@
 %{python_sitearch}/plplot.py*
 %{python_sitearch}/plplot_widgetmodule.so
 %{python_sitearch}/plplotc.py*
+%if %{with_pygtk2}
 %{python_sitearch}/plplotcanvas.py*
+%endif
 %{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
@@ -391,8 +405,10 @@
 %{_libdir}/libplplotgnome2d.so.*
 %{_libdir}/plplot%{version}/driversd/gcw.rc
 %{_libdir}/plplot%{version}/driversd/gcw.so
+%if %{with_pygtk2}
 %{python_sitearch}/gcwmodule.so
 %{python_sitearch}/cplplotcanvasmodule.so
+%endif
 
 %files gnome-devel
 %defattr(-,root,root,-)
@@ -409,6 +425,7 @@
 %{_datadir}/plplot%{version}/examples/java/
 %{_datadir}/plplot%{version}/examples/test_java.sh
 
+%if %{with_octave}
 %files octave
 %defattr(-,root,root,-)
 %{_datadir}/plplot_octave/
@@ -417,6 +434,7 @@
 %{_datadir}/plplot%{version}/examples/lena.img
 %{_datadir}/plplot%{version}/examples/octave/
 %{_datadir}/plplot%{version}/examples/test_octave.sh
+%endif
 
 %files tk
 %defattr(-,root,root,-)
@@ -450,8 +468,10 @@
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 %changelog
-* Thu Aug  2 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3.1
+* Mon Aug 6 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3.1
 - Revert BR to gnome-python2 for EL
+- pygtk2-devel is broken in EL-5, disable for now (bug #251029)
+- Disable octave support until plplot supports octave 2.9.11+
 
 * Thu May 24 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3
 - Disable Ada interface on x86_64 until working (bug #241233)




More information about the fedora-extras-commits mailing list