rpms/paraview/FC-6 paraview.spec,1.8,1.9
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Dec 19 02:56:27 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/paraview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8433/FC-6
Modified Files:
paraview.spec
Log Message:
* Tue Dec 18 2007 - Orion Poplawski <orion at cora.wnra.com> - 3.2.1-2
- Name ld.so.conf.d file with .conf extension
Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/FC-6/paraview.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- paraview.spec 7 Oct 2006 04:42:31 -0000 1.8
+++ paraview.spec 19 Dec 2007 02:55:48 -0000 1.9
@@ -1,6 +1,6 @@
Name: paraview
Version: 2.4.4
-Release: 3%{?dist}
+Release: 3%{?dist}.1
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -44,31 +44,31 @@
NOTE: This version has NOT been compiled with MPI support.
-%package mpi
-Summary: Parallel visualization application
-Group: Applications/Engineering
-Requires: %{name}-data = %{version}-%{release}
-Provides: %{name}
-Requires(post): /usr/bin/update-desktop-database
-Requires(postun): /usr/bin/update-desktop-database
-
-%description mpi
-ParaView is an application designed with the need to visualize large data
-sets in mind. The goals of the ParaView project include the following:
-
- * Develop an open-source, multi-platform visualization application.
- * Support distributed computation models to process large data sets.
- * Create an open, flexible, and intuitive user interface.
- * Develop an extensible architecture based on open standards.
-
-ParaView runs on distributed and shared memory parallel as well as single
-processor systems and has been successfully tested on Windows, Linux and
-various Unix workstations and clusters. Under the hood, ParaView uses the
-Visualization Toolkit as the data processing and rendering engine and has a
-user interface written using a unique blend of Tcl/Tk and C++.
-
-NOTE: This version has been compiled with LAM-MPI support and requires an
-operating LAM-MPI runtime enviroment.
+#%package mpi
+#Summary: Parallel visualization application
+#Group: Applications/Engineering
+#Requires: %{name}-data = %{version}-%{release}
+#Provides: %{name}
+#Requires(post): /usr/bin/update-desktop-database
+#Requires(postun): /usr/bin/update-desktop-database
+#
+#%description mpi
+#ParaView is an application designed with the need to visualize large data
+#sets in mind. The goals of the ParaView project include the following:
+#
+# * Develop an open-source, multi-platform visualization application.
+# * Support distributed computation models to process large data sets.
+# * Create an open, flexible, and intuitive user interface.
+# * Develop an extensible architecture based on open standards.
+#
+#ParaView runs on distributed and shared memory parallel as well as single
+#processor systems and has been successfully tested on Windows, Linux and
+#various Unix workstations and clusters. Under the hood, ParaView uses the
+#Visualization Toolkit as the data processing and rendering engine and has a
+#user interface written using a unique blend of Tcl/Tk and C++.
+#
+#NOTE: This version has been compiled with LAM-MPI support and requires an
+#operating LAM-MPI runtime enviroment.
%package data
@@ -121,7 +121,6 @@
-DTK_LIBRARY:PATH=tk \
-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
-DPARAVIEW_WRAP_PYTHON:BOOL=ON \
- -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -132,38 +131,37 @@
-DBUILD_EXAMPLES:BOOL=ON
make
popd
-mkdir fedora-mpi
-pushd fedora-mpi
-export CC='gcc'
-export CXX='g++'
-export MAKE='make'
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-cmake .. \
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
- -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-2.4-mpi \
- -DCMAKE_SKIP_RPATH:BOOL=ON \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
- -DCMAKE_C_COMPILER:FILEPATH=$CC \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
- -DTCL_LIBRARY:PATH=tcl \
- -DTK_LIBRARY:PATH=tk \
- -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
- -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
- -DVTK_USE_MPI:BOOL=ON \
- -DMPI_INCLUDE_PATH:PATH=%{_includedir}/lam \
- -DMPI_LIBRARY:STRING="-L%{_libdir}/lam -llammpio -llammpi++ -llamf77mpi -lmpi -llam -laio -lutil -ldl" \
- -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
- -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
- -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
- -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
- -DVTK_USE_SYSTEM_PNG:BOOL=ON \
- -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
- -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
- -DBUILD_DOCUMENTATION:BOOL=ON \
- -DBUILD_EXAMPLES:BOOL=ON
-make
+#mkdir fedora-mpi
+#pushd fedora-mpi
+#export CC='gcc'
+#export CXX='g++'
+#export MAKE='make'
+#export CFLAGS="$RPM_OPT_FLAGS"
+#export CXXFLAGS="$RPM_OPT_FLAGS"
+#cmake .. \
+# -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+# -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-2.4-mpi \
+# -DCMAKE_SKIP_RPATH:BOOL=ON \
+# -DBUILD_SHARED_LIBS:BOOL=ON \
+# -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
+# -DCMAKE_C_COMPILER:FILEPATH=$CC \
+# -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+# -DTCL_LIBRARY:PATH=tcl \
+# -DTK_LIBRARY:PATH=tk \
+# -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
+# -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
+# -DVTK_USE_MPI:BOOL=ON \
+# -DMPI_INCLUDE_PATH:PATH=%{_includedir}/lam \
+# -DMPI_LIBRARY:STRING="-L%{_libdir}/lam -llammpio -llammpi++ -llamf77mpi -lmpi -llam -laio -lutil -ldl" \
+# -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
+# -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
+# -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
+# -DVTK_USE_SYSTEM_PNG:BOOL=ON \
+# -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
+# -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
+# -DBUILD_DOCUMENTATION:BOOL=ON \
+# -DBUILD_EXAMPLES:BOOL=ON
+#make
%install
@@ -180,41 +178,41 @@
install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages
# Install mpi version
-pushd fedora-mpi
-make install DESTDIR=$RPM_BUILD_ROOT
-#Get rid of useless man and cmake files
-install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/
-install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/*ICET*cmake
-cat > paraview-mpi.desktop <<EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=ParaView Viewer MPI
-GenericName=Data Viewer
-Comment=ParaView allows MPI enabled viewing of large data sets
-Type=Application
-Terminal=false
-Icon=paraview_22x22.png
-MimeType=application/x-paraview
-Categories=Application;Graphics;
-Exec=mpirun C paraview-mpi
-EOF
-
-desktop-file-install --vendor=fedora \
- --add-category=X-Fedora \
- --dir %{buildroot}%{_datadir}/applications/ \
- paraview-mpi.desktop
-
-popd
-
+#pushd fedora-mpi
+#make install DESTDIR=$RPM_BUILD_ROOT
+##Get rid of useless man and cmake files
+#install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/
+#install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/
+#rm -rf $RPM_BUILD_ROOT%{_mandir}
+#rm $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/*ICET*cmake
+#cat > paraview-mpi.desktop <<EOF
+#[Desktop Entry]
+#Encoding=UTF-8
+#Name=ParaView Viewer MPI
+#GenericName=Data Viewer
+#Comment=ParaView allows MPI enabled viewing of large data sets
+#Type=Application
+#Terminal=false
+#Icon=paraview_22x22.png
+#MimeType=application/x-paraview
+#Categories=Application;Graphics;
+#Exec=mpirun C paraview-mpi
+#EOF
+#
+#desktop-file-install --vendor=fedora \
+# --add-category=X-Fedora \
+# --dir %{buildroot}%{_datadir}/applications/ \
+# paraview-mpi.desktop
+#
+#popd
+#
#Move the mpi binaries out of the way
-pushd $RPM_BUILD_ROOT/%{_bindir}
-for f in *
-do
- mv $f ${f}-mpi
-done
-popd
+#pushd $RPM_BUILD_ROOT/%{_bindir}
+#for f in *
+#do
+# mv $f ${f}-mpi
+#done
+#popd
#Install the normal version
pushd fedora
@@ -242,6 +240,9 @@
popd
+# 'cmake' does not set +x permissions for libraries; hence they won't be stripped
+find $RPM_BUILD_ROOT%_libdir -name \*.so | xargs chmod +x
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -254,11 +255,11 @@
update-desktop-database &> /dev/null ||:
-%post mpi
-update-desktop-database &> /dev/null ||:
-
-%postun mpi
-update-desktop-database &> /dev/null ||:
+#%post mpi
+#update-desktop-database &> /dev/null ||:
+#
+#%postun mpi
+#update-desktop-database &> /dev/null ||:
%post data
@@ -282,18 +283,18 @@
%{_libdir}/paraview-2.4/
-%files mpi
-%defattr(-,root,root,-)
-%doc Copyright.txt README.html
-%{_bindir}/paraview-mpi
-%{_bindir}/pvbatch-mpi
-%{_bindir}/pvclient-mpi
-%{_bindir}/pvdataserver-mpi
-%{_bindir}/pvpython-mpi
-%{_bindir}/pvrenderserver-mpi
-%{_bindir}/pvserver-mpi
-%{_datadir}/applications/fedora-paraview-mpi.desktop
-%{_libdir}/paraview-2.4-mpi/
+#%files mpi
+#%defattr(-,root,root,-)
+#%doc Copyright.txt README.html
+#%{_bindir}/paraview-mpi
+#%{_bindir}/pvbatch-mpi
+#%{_bindir}/pvclient-mpi
+#%{_bindir}/pvdataserver-mpi
+#%{_bindir}/pvpython-mpi
+#%{_bindir}/pvrenderserver-mpi
+#%{_bindir}/pvserver-mpi
+#%{_datadir}/applications/fedora-paraview-mpi.desktop
+#%{_libdir}/paraview-2.4-mpi/
%files data
@@ -310,6 +311,9 @@
%changelog
+* Mon Dec 11 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-4
+- Fix .so permissions
+
* Fri Oct 6 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-3
- Install needed python libraries to get around make install bug
More information about the scm-commits
mailing list