[paraview] - Update to 4.0.1 - Drop jpeg patch fixed upstream

[Orion Poplawski]

commit 288bfd578940fc3369aee073dabc5bb11db9c8d8
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Jul 19 20:33:05 2013 -0600

    - Update to 4.0.1
    - Drop jpeg patch fixed upstream

 .gitignore     |    1 +
 paraview.spec  |   24 ++++++++++++++++--------
 sources        |    2 +-
 vtk-jpeg.patch |   52 ----------------------------------------------------
 4 files changed, 18 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b46bda8..72427c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ ParaView-3.8.1.tar.gz
 /ParaView-3.14.1-Source.tar.gz
 /ParaView-3.98.0-src.tgz
 /ParaView-3.98.1-source.tar.gz
+/ParaView-v4.0.1-source.tgz
diff --git a/paraview.spec b/paraview.spec
index 969c1c6..1a87716 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -3,8 +3,8 @@
 %endif
 %{!?build_openmpi:%global build_openmpi 1}
 %{!?build_mpich:%global build_mpich 1}
-%global pv_maj 3
-%global pv_min 98
+%global pv_maj 4
+%global pv_min 0
 %global pv_patch 1
 %global pv_majmin %{pv_maj}.%{pv_min}
 %global rcver %{nil}
@@ -13,13 +13,13 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
 License:        BSD
 URL:            http://www.paraview.org/
-Source0:        http://www.paraview.org/files/v%{pv_majmin}/ParaView-%{version}%{?rcver}-source.tar.gz
+Source0:        http://www.paraview.org/files/v%{pv_majmin}/ParaView-v%{version}%{?rcver}-source.tgz
 Source1:        paraview_22x22.png
 Source2:        paraview.xml
 # Patch to fix install locations
@@ -31,8 +31,6 @@ Patch1:         vtk-6.0.0-system.patch
 Patch2:         paraview-Protobuf.patch
 #Patch to vtk to use system netcdf library
 Patch3:         vtk-6.0.0-netcdf.patch
-# Upstream patch for jpeg_mem_src support
-Patch4:         vtk-jpeg.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -81,6 +79,11 @@ Provides:       paraview-doc = %{version}-%{release}
 #-- Plugin: MantaView - Manta Ray-Cast View : Disabled - Requires Manta
 #-- Plugin: ForceTime - Override time requests : Disabled - Build is failing
 #-- Plugin: VaporPlugin - Plugin to read NCAR VDR files : Disabled - Requires vapor
+
+# We want to build with a system vtk someday, but it doesn't work yet
+# -DUSE_EXTERNAL_VTK:BOOL=ON \\\
+# -DVTK_DIR=%{_libdir}/vtk \\\
+
 %define paraview_cmake_options \\\
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
@@ -222,12 +225,11 @@ developing applications that use %{name}-mpich.
 
 
 %prep
-%setup -q -n ParaView-%{version}-source
+%setup -q -n ParaView-v%{version}%{rcver}-source
 %patch0 -p1 -b .install
 %patch1 -p0 -b .system
 %patch2 -p1 -b .Protobuf
 %patch3 -p0 -b .netcdf
-%patch4 -p0 -b .jpeg
 #Remove included thirdparty sources just to be sure
 for x in protobuf
 do
@@ -237,6 +239,8 @@ for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff
 do
   rm -r VTK/ThirdParty/${x}/vtk${x}
 done
+# We want to build with a system vtk someday, but it doesn't work yet
+#rm -r VTK
 
 
 %build
@@ -442,6 +446,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Aug 12 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-1
+- Update to 4.0.1
+- Drop jpeg patch fixed upstream
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.98.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 44f9bcb..9163a0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e91992b825be4c8e5ef8639fdfa0b557  ParaView-3.98.1-source.tar.gz
+6a300744eaf32676a3a7e1b42eb642c7  ParaView-v4.0.1-source.tgz