[paraview/epel7: 18/19] Merge changelog

[Orion Poplawski]

commit 2d443b1dbd62ddcb8dd687402c6210fda3d499af
Merge: a298649 ed1cb09
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Feb 6 21:44:23 2014 -0700

    Merge changelog

 .gitignore                                         |    3 +
 ...Protobuf.patch => paraview-4.0.1-Protobuf.patch |   52 ++++++----
 paraview-install.patch                             |   34 ++++--
 paraview.spec                                      |  110 +++++++++++++++-----
 sources                                            |    2 +-
 vtk-6.0.0-netcdf.patch                             |   75 -------------
 vtk-6.1.0-netcdf.patch                             |   29 +++++
 vtk-6.0.0-system.patch => vtk-6.1.0-system.patch   |   32 +++---
 vtk-jpeg.patch                                     |   52 ---------
 9 files changed, 189 insertions(+), 200 deletions(-)
---
diff --cc paraview.spec
index 588e2df,63fce31..8cc28c2
--- a/paraview.spec
+++ b/paraview.spec
@@@ -442,9 -473,41 +473,38 @@@ update-mime-database %{_datadir}/mime &
  
  
  %changelog
+ * Tue Jan 21 2014 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-1
+ - Update to 4.1.0 final
+ - Drop cstddef patch applied upstream
+ 
+ * Mon Dec 30 2013 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.1.rc2
+ - Rebase install patch
+ - Add patch to include needed cstddef for gcc 4.8.2
+ - Set VTK_INSTALL_DATA_DIR
+ - Set QtTesting_* install macros
+ 
+ * Fri Dec 27 2013 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.1.rc2
+ - Update to 4.1.0-RC2
+ 
+ * Fri Oct 18 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-3
+ - Require vtk-devel for vtkProcessShader
+ 
+ * Mon Oct 14 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-2
+ - Remove conflicts with vtk-devel (bug #1018432)
+ 
+ * 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
+ 
+ * Tue Jul 30 2013 Petr Machata <pmachata at redhat.com> - 3.98.1-7
+ - Rebuild for boost 1.54.0
+ 
 -* Sat Jul 20 2013 Deji Akingunola <dakingun at gmail.com> - 3.98.1-6
 +* Wed Jul 24 2013 Deji Akingunola <dakingun at gmail.com> - 3.98.1-5
  - Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
  
 -* Thu May 16 2013 Orion Poplawski <orion at cora.nwra.com> - 3.98.1-5
 -- Rebuild for hdf5 1.8.11
 -
  * Tue Apr 30 2013 Jon Ciesla <limburgher at gmail.com> - 3.98.1-4
  - Drop desktop vendor tag.