[paraview] Update to 4.2.0-RC1
Orion Poplawski
orion at fedoraproject.org
Thu Sep 18 22:00:03 UTC 2014
commit 105554109c95b2541fd180593942db335e9563ae
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Sep 18 15:53:03 2014 -0600
Update to 4.2.0-RC1
- Drop paraview-install, paraview-4.0.1-Protobuf, and paraview-pqViewFrameActionGroup
patches fixed upstream
- Build against system pugixml
paraview-4.0.1-Protobuf.patch | 72 ---------------------------------
paraview-pqViewFrameActionGroup.patch | 11 -----
paraview.spec | 59 ++++++++++++++------------
3 files changed, 32 insertions(+), 110 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index 2f8c9e8..2031bc2 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -4,16 +4,16 @@
%{!?build_openmpi:%global build_openmpi 1}
%{!?build_mpich:%global build_mpich 1}
%global pv_maj 4
-%global pv_min 1
+%global pv_min 2
%global pv_patch 0
%global pv_majmin %{pv_maj}.%{pv_min}
-%global rcver %{nil}
+%global rcver -RC1
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 9%{?dist}
+Release: 0.1.rc1%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -22,20 +22,10 @@ URL: http://www.paraview.org/
Source0: http://www.paraview.org/files/v%{pv_majmin}/ParaView-v%{version}%{?rcver}-source.tar.gz
Source1: paraview_22x22.png
Source2: paraview.xml
-# Patch to fix install locations
-# http://paraview.org/Bug/view.php?id=13704
-Patch0: paraview-install.patch
#Patch to vtk (from vtk package) to use system libraries
Patch1: vtk-6.1.0-system.patch
-# Capitalize Protobuf so it finds FindProtobuf.cmake
-# http://paraview.org/Bug/view.php?id=13656
-Patch2: paraview-4.0.1-Protobuf.patch
# Patch to vtk to use system netcdf library
Patch3: vtk-6.1.0-netcdf.patch
-# Install missing pqViewFrameActionGroup.h header
-# http://www.paraview.org/Bug/view.php?id=14754
-# https://bugzilla.redhat.com/show_bug.cgi?id=1100905
-Patch4: paraview-pqViewFrameActionGroup.patch
# Install missing headers
# https://bugzilla.redhat.com/show_bug.cgi?id=1100911
# http://www.vtk.org/Bug/view.php?id=14700
@@ -84,6 +74,7 @@ BuildRequires: libtheora-devel
BuildRequires: libxml2-devel
BuildRequires: netcdf-cxx-devel
BuildRequires: protobuf-devel
+BuildRequires: pugixml-devel
Requires: hdf5 = %{_hdf5_version}
Requires: %{name}-data = %{version}-%{release}
Requires: %{name}-doc = %{version}-%{release}
@@ -129,7 +120,10 @@ Provides: paraview-doc = %{version}-%{release}
-DHDF5_HL_LIBRARY:FILEPATH=%{_libdir}/libhdf5_hl.so \\\
-DVTK_USE_SYSTEM_AUTOBAHN:BOOL=ON \\\
-DVTK_USE_SYSTEM_LIBPROJ4=OFF \\\
+ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON \\\
-DVTK_USE_SYSTEM_NETCDF=ON \\\
+ -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON \\\
+ -DVTK_USE_SYSTEM_PUGIXML:BOOL=ON \\\
-DVTK_USE_SYSTEM_QTTESTING=OFF \\\
-DVTK_USE_SYSTEM_TWISTED:BOOL=ON \\\
-DVTK_USE_SYSTEM_XDMF2=OFF \\\
@@ -226,8 +220,8 @@ Summary: Parallel visualization application
Group: Applications/Engineering
Requires: %{name}-data = %{version}-%{release}
Requires: mpich
-Provides: %{name}-mpich2 = %{version}-%{release}
-Obsoletes: %{name}-mpich2 < 3.98.1-6
+Provides: %{name}-mpich2 = %{version}-%{release}
+Obsoletes: %{name}-mpich2 < 3.98.1-6
%description mpich
This package contains copies of the ParaView server binaries compiled with
@@ -240,8 +234,8 @@ You will need to load the mpich-%{_arch} module to setup your path properly.
Summary: Development files for %{name}-mpich
Group: Development/Libraries
Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
-Provides: %{name}-mpich2-devel = %{version}-%{release}
-Obsoletes: %{name}-mpich2-devel < 3.98.1-6
+Provides: %{name}-mpich2-devel = %{version}-%{release}
+Obsoletes: %{name}-mpich2-devel < 3.98.1-6
%description mpich-devel
The %{name}-mpich-devel package contains libraries and header files for
@@ -250,23 +244,21 @@ developing applications that use %{name}-mpich.
%prep
-%setup -q -n ParaView-v%{version}%{rcver}
-%patch0 -p1 -b .install
+%setup -q -n ParaView-v%{version}%{rcver}-source
%patch1 -p0 -b .system
-%patch2 -p1 -b .Protobuf
%patch3 -p0 -b .netcdf
-%patch4 -p1 -b .pqViewFrameActionGroup
%patch5 -p1 -b .headers
%patch6 -p1 -b .topological-sort-cmake
%patch7 -p1 -b .plugin-env
# Install python properly
sed -i -s '/VTK_INSTALL_PYTHON_USING_CMAKE/s/TRUE/FALSE/' CMakeLists.txt
#Remove included thirdparty sources just to be sure
-for x in vtkmpi4py vtkprotobuf
+for x in vtkprotobuf
do
rm -r ThirdParty/*/${x}
done
-for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtksqlite vtktiff twisted vtkzlib zope
+rm ThirdParty/pugixml/pugixml.*
+for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtkmpi4py vtknetcdf vtkoggtheora vtkpng vtksqlite vtktiff twisted vtkzlib zope
do
rm -r VTK/ThirdParty/*/${x}
done
@@ -360,7 +352,7 @@ pushd fedora-openmpi
make install DESTDIR=$RPM_BUILD_ROOT
#Remove mpi copy of doc and man pages and data
-rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/share/{doc,man,paraview}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/share/{appdata,applications,doc,icons,man,paraview}
ln -sf ../../../share/paraview $RPM_BUILD_ROOT%{_libdir}/openmpi/share/
popd
%endif
@@ -371,7 +363,7 @@ pushd fedora-mpich
make install DESTDIR=$RPM_BUILD_ROOT
#Remove mpi copy of doc and man pages and data
-rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich/share/{doc,man,paraview}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich/share/{appdata,applications,doc,icons,man,paraview}
ln -sf ../../../share/paraview $RPM_BUILD_ROOT%{_libdir}/mpich/share/
popd
%endif
@@ -429,15 +421,19 @@ fi
%post data
-touch --no-create %{_datadir}/mime/packages &>/dev/null || :
+/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun data
if [ $1 -eq 0 ] ; then
update-mime-database %{_datadir}/mime &> /dev/null || :
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans data
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
@@ -454,12 +450,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_libdir}/paraview/
%files data
+%{_datadir}/appdata/paraview.appdata.xml
%{_datadir}/applications/*paraview.desktop
-%{_datadir}/pixmaps/paraview_22x22.png
+%{_datadir}/icons/hicolor/*/apps/paraview.png
%{_datadir}/mime/packages/paraview.xml
+%{_datadir}/pixmaps/paraview_22x22.png
%{_datadir}/paraview/
%files devel
+%{_bindir}/paraview-config
%{_bindir}/vtkWrapClientServer
%{_bindir}/vtkkwProcessXML
%{_includedir}/paraview/
@@ -496,6 +495,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Thu Sep 18 2014 Orion Poplawski <orion at cora.nwra.com> - 4.2.0-0.1.rc1
+- Update to 4.2.0-RC1
+- Drop paraview-install, paraview-4.0.1-Protobuf, and paraview-pqViewFrameActionGroup
+ patches fixed upstream
+- Build against system pugixml
+
* Mon Sep 08 2014 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-9
- update scriptlets
More information about the scm-commits
mailing list