rpms/paraview/devel .cvsignore, 1.3, 1.4 paraview.spec, 1.12, 1.13 sources, 1.3, 1.4 paraview-2.4.2-tcltk.patch, 1.1, NONE paraview-2.4.3-png.patch, 1.1, NONE paraview-2.4.3-python.patch, 1.1, NONE paraview-2.4.4-cmake245.patch, 1.2, NONE paraview-2.4.4-const.patch, 1.1, NONE

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Thu Jul 12 19:14:46 UTC 2007 

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20221

Modified Files:
	.cvsignore paraview.spec sources 
Removed Files:
	paraview-2.4.2-tcltk.patch paraview-2.4.3-png.patch 
	paraview-2.4.3-python.patch paraview-2.4.4-cmake245.patch 
	paraview-2.4.4-const.patch 
Log Message:
* Wed Jul 11 2007 - Orion Poplawski <orion at cora.wnra.com> - 3.0.2-1
- Update to 3.0.2
- Turn mpi build back on
- Add devel packages
- Remove demo package no longer in upstream
- Use cmake macros



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2006 22:08:51 -0000	1.3
+++ .cvsignore	12 Jul 2007 19:14:13 -0000	1.4
@@ -1 +1 @@
-paraview-2.4.4.tar.gz
+paraview-3.0.2.tar.gz


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- paraview.spec	9 Mar 2007 18:32:03 -0000	1.12
+++ paraview.spec	12 Jul 2007 19:14:13 -0000	1.13
@@ -1,33 +1,36 @@
-%{!?build_mpi:%define build_mpi 0}
+%{!?build_mpi:%define build_mpi 1}
 
 Name:           paraview
-Version:        2.4.4
-Release:        6%{?dist}
+Version:        3.0.2
+Release:        1%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
 License:        Distributable
 URL:            http://www.paraview.org/
-Source0:        http://www.paraview.org/files/v2.4/paraview-%{version}.tar.gz
+# This version was actually made with:
+#  cvs -d :pserver:anoncvs at www.paraview.org:/cvsroot/ParaView3 login
+#          (respond with empty password)
+#  cvs -d :pserver:anoncvs at www.paraview.org:/cvsroot/ParaView3 -z3 export -r ParaView_3_0_2 ParaView3
+#  mv ParaView3 paraview-3.0.2
+#  tar czf paraview-3.0.2.tar.gz paraview-3.0.2
+#
+# Next release promises to provide a source tarball
+Source0:        http://www.paraview.org/files/v3.0/paraview-%{version}.tar.gz
 Source1:        paraview_22x22.png
 Source2:        paraview.xml
-Patch0:         paraview-2.4.2-tcltk.patch
-Patch1:         paraview-2.4.3-png.patch
-Patch2:         paraview-2.4.3-python.patch
-Patch3:         paraview-2.4.4-const.patch
-Patch4:         paraview-2.4.4-cmake245.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
 %if %{build_mpi}
 BuildRequires:  openmpi-devel
 %endif
-BuildRequires:  libGLU-devel, libXt-devel, mesa-libOSMesa-devel
+BuildRequires:  qt4-devel, mesa-libOSMesa-devel
 BuildRequires:  python-devel, tk-devel, hdf5-devel
-BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
+BuildRequires:  freetype-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  /usr/bin/desktop-file-install
-
+BuildRequires:  doxygen, graphviz
 Requires:       %{name}-data = %{version}-%{release}
 Requires(post):   /usr/bin/update-desktop-database
 Requires(postun): /usr/bin/update-desktop-database
@@ -75,11 +78,10 @@
 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.
+NOTE: This version has been compiled with OpenMPI support and requires an
+operating OpenMPI runtime enviroment.
 %endif
 
-
 %package        data
 Summary:        Data files for ParaView
 Group:          Applications/Engineering
@@ -91,24 +93,27 @@
 %{summary}.
 
 
-%package        demos
-Summary:        Demo files for ParaView
+%package        devel
+Summary:        Development files for ParaView
 Group:          Applications/Engineering
-Requires:       %{name}-data = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+%{summary}.
+
 
-%description    demos
+%package        mpi-devel
+Summary:        Development files for the mpi version of ParaView
+Group:          Applications/Engineering
+Requires:       %{name}-mpi = %{version}-%{release}
+
+%description    mpi-devel
 %{summary}.
 
 
 %prep
 %setup -q
-%patch -p1 -b .tcltk
-%patch1 -p1 -b .png
-%patch2 -p1 -b .python
-%patch3 -p0 -b .const
-%patch4 -p1 -b .cmake245
 rm -rf Utilities/TclTk
-sed -i -e 's,INSTALL_FILES(/man/,INSTALL_FILES(/share/man/,' Utilities/IceT/doc/man/CMakeLists.txt
 
 
 %build
@@ -120,19 +125,16 @@
 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 \
-        -DCMAKE_SKIP_RPATH:BOOL=ON \
-        -DBUILD_SHARED_LIBS:BOOL=ON \
+%cmake .. \
+        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview \
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
         -DCMAKE_C_COMPILER:FILEPATH=$CC \
-        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
         -DTCL_LIBRARY:PATH=tcl \
         -DTK_LIBRARY:PATH=tk \
+        -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
-        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
         -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
+	-DVTK_USE_INFOVIS:BOOL=OFF \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
         -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -141,7 +143,8 @@
         -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
-make
+cmake ..
+make VERBOSE=1 %{?_smp_flags}
 popd
 %if %{build_mpi}
 mkdir fedora-mpi
@@ -151,22 +154,20 @@
 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 \
+%cmake .. \
+        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-mpi \
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
         -DCMAKE_C_COMPILER:FILEPATH=$CC \
-        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
         -DTCL_LIBRARY:PATH=tcl \
         -DTK_LIBRARY:PATH=tk \
+        -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
-        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
+        -DICET_BUILD_TESTING:BOOL=ON \
         -DVTK_USE_MPI:BOOL=ON \
         -DMPI_INCLUDE_PATH:PATH="%{_includedir}/openmpi" \
         -DMPI_LIBRARY:STRING="-L%{_libdir}/openmpi" \
         -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
+	-DVTK_USE_INFOVIS:BOOL=OFF \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
         -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -175,7 +176,8 @@
         -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
-make
+cmake ..
+make VERBOSE=1 %{?_smp_flags}
 %endif
 
 %install
@@ -195,11 +197,8 @@
 # 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
+
+#Create desktop file
 cat > paraview-mpi.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
@@ -221,20 +220,22 @@
 
 popd
 
-#Move the mpi binaries out of the way
+#Move the mpi binaries, includes, and man pages out of the way
 pushd $RPM_BUILD_ROOT/%{_bindir}
 for f in *
 do
    mv $f ${f}-mpi
 done
 popd
+mv $RPM_BUILD_ROOT/%{_includedir}/paraview-3.0 $RPM_BUILD_ROOT/%{_includedir}/paraview-3.0-mpi
+rm -rf $RPM_BUILD_ROOT%{_mandir}
 %endif
 
 #Install the normal version
 pushd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4/
-install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4/
+
+#Create desktop file
 cat > paraview.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
@@ -256,8 +257,8 @@
 
 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
+#Don't ship the VTK Qt Designer plugin
+rm -r $RPM_BUILD_ROOT/usr/plugins
 
 
 %clean
@@ -267,6 +268,7 @@
 %post
 update-desktop-database &> /dev/null ||:
 
+
 %postun
 update-desktop-database &> /dev/null ||:
 
@@ -279,7 +281,6 @@
 update-desktop-database &> /dev/null ||:
 %endif
 
-
 %post   data
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
@@ -289,48 +290,58 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Copyright.txt README.html
+%doc License_v1.1.txt
 %{_bindir}/paraview
-%{_bindir}/pvbatch
-%{_bindir}/pvclient
 %{_bindir}/pvdataserver
 %{_bindir}/pvpython
 %{_bindir}/pvrenderserver
 %{_bindir}/pvserver
+%{_bindir}/pvTestDriver
+%{_bindir}/vtkSMExtractDocumentation
 %{_datadir}/applications/fedora-paraview.desktop
-%{_libdir}/paraview-2.4/
+%{_libdir}/paraview/
 
 
 %if %{build_mpi}
 %files mpi
 %defattr(-,root,root,-)
-%doc Copyright.txt README.html
+%doc License_v1.1.txt
 %{_bindir}/paraview-mpi
-%{_bindir}/pvbatch-mpi
-%{_bindir}/pvclient-mpi
 %{_bindir}/pvdataserver-mpi
 %{_bindir}/pvpython-mpi
 %{_bindir}/pvrenderserver-mpi
 %{_bindir}/pvserver-mpi
+%{_bindir}/pvTestDriver-mpi
+%{_bindir}/vtkSMExtractDocumentation-mpi
 %{_datadir}/applications/fedora-paraview-mpi.desktop
-%{_libdir}/paraview-2.4-mpi/
+%{_libdir}/paraview-mpi/
 %endif
 
 
 %files data
 %defattr(-,root,root,-)
-%{_datadir}/paraview-2.4/
-%exclude %{_datadir}/paraview-2.4/Demos
 %{_datadir}/pixmaps/paraview_22x22.png
 %{_datadir}/mime/packages/paraview.xml
 
 
-%files demos
+%files devel
 %defattr(-,root,root,-)
-%{_datadir}/paraview-2.4/Demos/
+%{_includedir}/paraview-3.0/
+
+
+%files mpi-devel
+%defattr(-,root,root,-)
+%{_includedir}/paraview-3.0-mpi/
 
 
 %changelog
+* Wed Jul 11 2007 - Orion Poplawski <orion at cora.wnra.com> - 3.0.2-1
+- Update to 3.0.2
+- Turn mpi build back on
+- Add devel packages
+- Remove demo package no longer in upstream
+- Use cmake macros
+
 * Thu Mar 08 2007 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-6
 - Don't build mpi version until upstream fixes the build system
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2006 22:08:51 -0000	1.3
+++ sources	12 Jul 2007 19:14:13 -0000	1.4
@@ -1 +1 @@
-7f8e926542268546563e8e8c1d4ad852  paraview-2.4.4.tar.gz
+3184bd889d1cc8c2d1efc7c8ed3e3759  paraview-3.0.2.tar.gz


--- paraview-2.4.2-tcltk.patch DELETED ---


--- paraview-2.4.3-png.patch DELETED ---


--- paraview-2.4.3-python.patch DELETED ---


--- paraview-2.4.4-cmake245.patch DELETED ---


--- paraview-2.4.4-const.patch DELETED ---

More information about the fedora-extras-commits mailing list