rpms/plplot/devel plplot.spec,1.29,1.30

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	plplot.spec 
Log Message:
Use cmake macros



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plplot.spec	26 Mar 2007 18:44:11 -0000	1.29
+++ plplot.spec	16 Apr 2007 16:56:12 -0000	1.30
@@ -3,7 +3,7 @@
 
 Name:           plplot
 Version:        5.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -182,10 +182,8 @@
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export FFLAGS="$RPM_OPT_FLAGS"
-cmake .. \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+%cmake .. \
         -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 \
@@ -209,14 +207,7 @@
 	-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
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
@@ -225,9 +216,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version}
 
-# '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
@@ -241,6 +229,13 @@
 rm $RPM_BUILD_ROOT%{_mandir}/man3/MAN-MANIFEST*
 
 
+%check
+cd fedora
+#Hack
+export ITCL_LIBRARY=%{_libdir}/itcl3.3
+ctest
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -446,6 +441,9 @@
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 %changelog
+* Mon Apr 16 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-2
+- Use cmake macros
+
 * 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