rpms/plplot/devel plplot-5.7.2-multilib.patch, NONE, 1.1 plplot-5.7.3-jni.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 plplot.spec, 1.28, 1.29 sources, 1.8, 1.9 plplot-5.7.2-nopgcpp.patch, 1.1, NONE

Mon Mar 26 18:44:44 UTC 2007

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15133

Modified Files:
	.cvsignore plplot.spec sources 
Added Files:
	plplot-5.7.2-multilib.patch plplot-5.7.3-jni.patch 
Removed Files:
	plplot-5.7.2-nopgcpp.patch 
Log Message:
- Update to 5.7.3
- Hack to run itcl examples
- Install Java JNI into %%{_libdir}/plplot%%{_version}
- java package requires java (bug #233905)
- devel requires main package (bug #233905)
- Enable octave api requirement
- Enable new ada interface - not installed yet though
- Renaable pstex driver
- Set PREBUILT_DOC so docs are installed
- Fix up tclIndex files so they are the same on all builds (bug #228172)
- Fix up examples/tk/Makefile for multilib (bug #228172)
- Install python in arch specific dirs (bug #228173)
- Enable itcl


plplot-5.7.2-multilib.patch:

--- NEW FILE plplot-5.7.2-multilib.patch ---
--- plplot-5.7.2/examples/tk/Makefile.examples.in.multilib	2007-01-21 17:46:03.000000000 -0700
+++ plplot-5.7.2/examples/tk/Makefile.examples.in	2007-02-12 14:01:06.000000000 -0700
@@ -24,8 +24,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
 
 EXECUTABLES_list = \
 		 xtk01$(EXEEXT) \
@@ -38,7 +36,7 @@
 	rm -f $(EXECUTABLES_list)
 
 .c$(EXEEXT):
- at pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
+ at pkg_config_true@	$(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
 @pkg_config_false@	$(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl`
 
 .SUFFIXES: .c $(EXEEXT)

plplot-5.7.3-jni.patch:

--- NEW FILE plplot-5.7.3-jni.patch ---
--- plplot-5.7.3/cmake/modules/java.cmake.jni	2007-03-25 18:41:53.000000000 -0600
+++ plplot-5.7.3/cmake/modules/java.cmake	2007-03-26 11:41:54.000000000 -0600
@@ -71,7 +71,7 @@
   set(JAR_DIR ${CMAKE_INSTALL_DATADIR}/java)
   get_filename_component(JAVADATA_HARDDIR ${JAR_DIR} ABSOLUTE)
   # JNI .so files.
-  set(JAVAWRAPPER_DIR ${LIB_DIR}/jni)
+  set(JAVAWRAPPER_DIR ${LIB_DIR}/plplot at VERSION@)
   get_filename_component(JAVAWRAPPER_HARDDIR ${JAVAWRAPPER_DIR} ABSOLUTE)
   # Library name suffix is system dependent.  Tests have shown
   # that ${CMAKE_SHARED_LIBRARY_SUFFIX} gives the correct suffix on both


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Jan 2007 21:04:00 -0000	1.8
+++ .cvsignore	26 Mar 2007 18:44:11 -0000	1.9
@@ -1 +1 @@
-plplot-5.7.2.tar.gz
+plplot-5.7.3.tar.gz


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plplot.spec	9 Feb 2007 21:39:58 -0000	1.28
+++ plplot.spec	26 Mar 2007 18:44:11 -0000	1.29
@@ -1,24 +1,26 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?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)}
 
 Name:           plplot
-Version:        5.7.2
-Release:        2%{?dist}
+Version:        5.7.3
+Release:        1%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
 License:        LGPL
 URL:            http://plplot.sourceforge.net/
-Source0:        http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
 Patch1:         plplot-5.6.1-octave.patch
 Patch2:         plplot-5.6.1-info.patch
-Patch3:         plplot-5.7.2-nopgcpp.patch
+Patch5:         plplot-5.7.2-multilib.patch
+Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
-BuildRequires:  gcc-gfortran, freetype-devel, octave-devel, qhull-devel
-BuildRequires:  java-devel, libgcj-devel, ncurses-devel
-BuildRequires:  gd-devel, tcl-devel, tk-devel
+BuildRequires:  gcc-gfortran, gcc-gnat
+BuildRequires:  java-devel, libgcj-devel
+BuildRequires:  freetype-devel, octave-devel, qhull-devel , ncurses-devel
+BuildRequires:  gd-devel, tcl-devel, tk-devel, itcl-devel, itk-devel
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
 BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
@@ -66,6 +68,7 @@
 %package        devel
 Summary:        Development headers and libraries for PLplot
 Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       qhull-devel, freetype-devel
@@ -99,6 +102,7 @@
 Summary:        Functions for scientific plotting with Java
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       java
 
 %description    java
 %{summary}.
@@ -118,7 +122,7 @@
 Summary:        Functions for scientific plotting with Octave
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}, octave
-#Requires:       octave(api) = %{octave_api}
+Requires:       octave(api) = %{octave_api}
 
 %description    octave
 %{summary}.
@@ -152,12 +156,24 @@
 %description    wxGTK
 %{summary}.
 
+%package        wxGTK-devel
+Summary:        Development files for using PLplot with wxGTK
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-wxGTK = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    wxGTK-devel
+%{summary}.
+
 
 %prep
 %setup -q
 %patch1 -p1 -b .octave
 %patch2 -p1 -b .orig
-%patch3 -p1 -b .nopgcpp
+%patch5 -p1 -b .multilib
+%patch6 -p1 -b .jni
 
 
 %build
@@ -170,6 +186,7 @@
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
         -DBUILD_SHARED_LIBS:BOOL=ON \
+	-DENABLE_ada:BOOL=ON \
 	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
 	-DPLD_aqt:BOOL=ON \
 	-DPLD_conex:BOOL=ON \
@@ -180,6 +197,7 @@
 	-DPLD_ljiip:BOOL=ON \
 	-DPLD_mskermit:BOOL=ON \
 	-DPLD_ntk:BOOL=ON \
+	-DPLD_pstex:BOOL=ON \
 	-DPLD_svg:BOOL=ON \
 	-DPLD_tek4010:BOOL=ON \
 	-DPLD_tek4010f:BOOL=ON \
@@ -188,12 +206,16 @@
 	-DPLD_versaterm:BOOL=ON \
 	-DPLD_vlt:BOOL=ON \
 	-DPLD_xterm:BOOL=ON \
+	-DPLD_wxwidgets:BOOL=ON \
+	-DPREBUILT_DOC:BOOL=ON \
 	-DBUILD_TEST=ON
 make VERBOSE=1
 
 
 %check
 cd fedora
+#Hack
+export ITCL_LIBRARY=%{_libdir}/itcl3.3
 ctest
 
 
@@ -206,6 +228,18 @@
 # 'cmake' does not set +x permissions for libraries; hence they won't be stripped
 find $RPM_BUILD_ROOT%_libdir -name \*.so | xargs chmod +x
 
+# Fix up tclIndex files so they are the same on all builds
+for file in $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/*/tclIndex
+do
+   grep '^[# ]' ${file} > tclIndex.hd
+   grep -v '^[# ]' ${file} | sort > tclIndex
+   cat tclIndex.hd tclIndex > ${file}
+done
+
+#Don't want MANIFESTs
+rm $RPM_BUILD_ROOT%{_infodir}/INFO-MANIFEST*
+rm $RPM_BUILD_ROOT%{_mandir}/man3/MAN-MANIFEST*
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -273,6 +307,8 @@
 %{_libdir}/plplot%{version}/driversd/plmeta.so
 %{_libdir}/plplot%{version}/driversd/ps.rc
 %{_libdir}/plplot%{version}/driversd/ps.so
+%{_libdir}/plplot%{version}/driversd/pstex.rc
+%{_libdir}/plplot%{version}/driversd/pstex.so
 %{_libdir}/plplot%{version}/driversd/psttf.rc
 %{_libdir}/plplot%{version}/driversd/psttf.so
 %{_libdir}/plplot%{version}/driversd/svg.rc
@@ -283,12 +319,12 @@
 %{_libdir}/plplot%{version}/driversd/xfig.so
 %{_libdir}/plplot%{version}/driversd/xwin.rc
 %{_libdir}/plplot%{version}/driversd/xwin.so
-%{python_sitelib}/_plplotcmodule.so
-%{python_sitelib}/plplot.py*
-%{python_sitelib}/plplot_widgetmodule.so
-%{python_sitelib}/plplotc.py*
-%{python_sitelib}/plplotcanvas.py*
-#%{_infodir}/plplotdoc.info*
+%{python_sitearch}/_plplotcmodule.so
+%{python_sitearch}/plplot.py*
+%{python_sitearch}/plplot_widgetmodule.so
+%{python_sitearch}/plplotc.py*
+%{python_sitearch}/plplotcanvas.py*
+%{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
 %{_mandir}/man1/plrender.1.gz
@@ -339,19 +375,20 @@
 %{_datadir}/plplot%{version}/examples/f77/
 %{_datadir}/plplot%{version}/examples/f95/
 %{_datadir}/plplot%{version}/examples/Makefile
+%{_datadir}/plplot%{version}/examples/test_ada.sh
 %{_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_f95.sh
-#%{_mandir}/man3/pl*.3*
+%{_mandir}/man3/pl*.3*
 
 %files gnome
 %defattr(-,root,root,-)
 %{_libdir}/libplplotgnome2d.so.*
 %{_libdir}/plplot%{version}/driversd/gcw.rc
 %{_libdir}/plplot%{version}/driversd/gcw.so
-%{python_sitelib}/gcwmodule.so
-%{python_sitelib}/cplplotcanvasmodule.so
+%{python_sitearch}/gcwmodule.so
+%{python_sitearch}/cplplotcanvasmodule.so
 
 %files gnome-devel
 %defattr(-,root,root,-)
@@ -360,7 +397,7 @@
 
 %files java
 %defattr(-,root,root,-)
-%{_libdir}/jni/plplotjavac_wrap.so
+%{_libdir}/plplot%{version}/plplotjavac_wrap.so
 %{_datadir}/java/plplot.jar
 
 %files java-devel
@@ -400,11 +437,35 @@
 
 %files wxGTK
 %defattr(-,root,root,-)
+%{_libdir}/libplplotwxwidgetsd.so.*
 %{_libdir}/plplot%{version}/driversd/wxwidgets.rc
 %{_libdir}/plplot%{version}/driversd/wxwidgets.so
 
+%files wxGTK-devel
+%{_libdir}/libplplotwxwidgetsd.so
+%{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 %changelog
+* Mon Mar 26 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-1
+- Update to 5.7.3
+- Hack to run itcl examples
+- Install Java JNI into %%{_libdir}/plplot%%{_version}
+- java package requires java (bug #233905)
+- devel requires main package (bug #233905)
+- Enable octave api requirement
+- Enable new ada interface - not installed yet though
+- Renaable pstex driver
+
+* Tue Mar 20 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.2-4
+- Set PREBUILT_DOC so docs are installed
+
+* Wed Mar 14 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.2-3
+- Fix up tclIndex files so they are the same on all builds (bug #228172)
+- Fix up examples/tk/Makefile for multilib (bug #228172)
+- Install python in arch specific dirs (bug #228173)
+- Enable itcl
+- Update to CVS
+
 * Fri Feb 09 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.2-2
 - Rebuild for Tcl 8.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Jan 2007 21:04:00 -0000	1.8
+++ sources	26 Mar 2007 18:44:11 -0000	1.9
@@ -1 +1 @@
-33e43d26df05bcb8a91c3ec769dcc81c  plplot-5.7.2.tar.gz
+8c5ed411bc63a4fd07b362a1b9a3e46c  plplot-5.7.3.tar.gz


--- plplot-5.7.2-nopgcpp.patch DELETED ---


