rpms/plplot/devel .cvsignore, 1.3, 1.4 plplot.spec, 1.3, 1.4 sources, 1.3, 1.4
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Thu Aug 11 22:23:39 UTC 2005
Author: orion
Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15998
Modified Files:
.cvsignore plplot.spec sources
Log Message:
- Breakout java into its own sub-package, don't build on non x86
- Add patch to fix c test on ppc
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 10 Aug 2005 20:39:31 -0000 1.3
+++ .cvsignore 11 Aug 2005 22:23:37 -0000 1.4
@@ -1,3 +1,4 @@
plplot-5.5.3.tar.gz
plplot-5.5.3-x86_64.patch
plplot-5.5.3-octave.patch
+plplot-5.5.3-check.patch
Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plplot.spec 10 Aug 2005 20:40:04 -0000 1.3
+++ plplot.spec 11 Aug 2005 22:23:37 -0000 1.4
@@ -2,7 +2,7 @@
Name: plplot
Version: 5.5.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
@@ -14,11 +14,17 @@
Patch2: plplot-5.5.3-buffer.patch
Patch3: plplot-5.5.3-x86_64.patch
Patch4: plplot-5.5.3-octave.patch
+Patch5: plplot-5.5.3-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel
+%ifarch %{ix86} x86_64
BuildRequires: java-devel, libgcj-devel
+%define java_config %{nil}
+%else
+%define java_config --disable-java
+%endif
BuildRequires: gd-devel, tcl-devel, tk-devel
BuildRequires: python-devel, pygtk2-devel, python-numeric
BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
@@ -71,12 +77,34 @@
Summary: Development files for using PLplot GNOME
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-gnome = %{version}-%{release}
%description gnome-devel
%{summary}
+%ifarch %{ix86} x86_64
+%package java
+Summary: Functions for scientific plotting with Java
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description java
+%{summary}
+
+%package java-devel
+Summary: Development files for using PLplot GNOME
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-java = %{version}-%{release}
+
+%description java-devel
+%{summary}
+%endif
+
+
%package octave
Summary: Functions for scientific plotting with Octave
Group: Development/Libraries
@@ -98,6 +126,7 @@
Summary: Development files for using PLplot with Tk
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-tk = %{version}-%{release}
%description tk-devel
@@ -110,6 +139,7 @@
%patch2 -p1 -b .orig
%patch3 -p1 -b .orig
%patch4 -p1 -b .orig
+%patch5 -p1 -b .orig
%build
@@ -117,7 +147,7 @@
%configure --disable-static --without-rpath --with-pthreads \
--with-freetype-font-dir=/usr/share/fonts \
--with-libunicode=no --disable-cgm --disable-linuxvga \
- --disable-wingcc --disable-aqt --disable-pdl
+ --disable-wingcc --disable-aqt --disable-pdl %{java_config}
make
@@ -193,7 +223,6 @@
%{_libdir}/plplot%{version}/driversd/xfig.so
%{_libdir}/plplot%{version}/driversd/xwin.rc
%{_libdir}/plplot%{version}/driversd/xwin.so
-%{_libdir}/jni/plplotjavac_wrap.so
%{python_sitelib}/_plplotcmodule.so
%{python_sitelib}/plplot.py
%{python_sitelib}/plplot_widgetmodule.so
@@ -204,7 +233,6 @@
%{_mandir}/man1/plrender.1.gz
%{_mandir}/man1/pltek.1.gz
%{_mandir}/man1/pstex2eps.1.gz
-%{_datadir}/java/plplot.jar
%dir %{_datadir}/plplot%{version}
%{_datadir}/plplot%{version}/*.map
%{_datadir}/plplot%{version}/*.fnt
@@ -231,12 +259,10 @@
%{_datadir}/plplot%{version}/examples/c/
%{_datadir}/plplot%{version}/examples/c++/
%{_datadir}/plplot%{version}/examples/f77/
-%{_datadir}/plplot%{version}/examples/java/
%{_datadir}/plplot%{version}/examples/Makefile
%{_datadir}/plplot%{version}/examples/test_c.sh
%{_datadir}/plplot%{version}/examples/test_cxx.sh
%{_datadir}/plplot%{version}/examples/test_f77.sh
-%{_datadir}/plplot%{version}/examples/test_java.sh
%files gnome
%defattr(-,root,root,-)
@@ -250,6 +276,18 @@
%defattr(-,root,root,-)
%{_libdir}/libplplotgnome2d.so
+%ifarch %{ix86} x86_64
+%files java
+%defattr(-,root,root,-)
+%{_libdir}/jni/plplotjavac_wrap.so
+%{_datadir}/java/plplot.jar
+
+%files java-devel
+%defattr(-,root,root,-)
+%{_datadir}/plplot%{version}/examples/java/
+%{_datadir}/plplot%{version}/examples/test_java.sh
+%endif
+
%files octave
%defattr(-,root,root,-)
%{_datadir}/plplot_octave/
@@ -279,6 +317,10 @@
%{_datadir}/plplot%{version}/examples/tk/
%changelog
+* Thu Aug 11 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-7
+- Breakout java into its own sub-package, don't build on non x86
+- Add patch to fix c test on ppc
+
* Wed Aug 10 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-6
- Add patch to find tcl on x86_64
- Add patch to use new octave in devel
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 10 Aug 2005 20:39:31 -0000 1.3
+++ sources 11 Aug 2005 22:23:37 -0000 1.4
@@ -1,3 +1,4 @@
6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz
02cc9f8eb72211581aae2bd38670252f plplot-5.5.3-x86_64.patch
7970faa7d90fe1e98e19354fd607a309 plplot-5.5.3-octave.patch
+22f2761b863bf1f47fb37b7d7fb9ab85 plplot-5.5.3-check.patch
More information about the fedora-extras-commits
mailing list