From f7d85842f0862b625daee0eac666f4d604a2b785 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Apr 18 2011 20:53:36 +0000 Subject: Update to 3.10.1 Drop build patch fixed upstream --- diff --git a/.gitignore b/.gitignore index 2d634c0..52c0c81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ ParaView-3.8.1.tar.gz /ParaView-3.10.0-RC1.tar.gz /ParaView-3.10.0.tar.gz +/ParaView-3.10.1.tar.gz diff --git a/paraview-3.10.0-build.patch b/paraview-3.10.0-build.patch deleted file mode 100644 index 389c051..0000000 --- a/paraview-3.10.0-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: David Partyka -Date: Sun, 13 Mar 2011 16:02:48 +0000 (-0400) -Subject: Properly Export pqApplicationComponents. -X-Git-Url: http://paraview.org/gitweb?p=ParaView.git;a=commitdiff_plain;h=9bed3f26be47c8088556ba356e25303dd4631884 - -Properly Export pqApplicationComponents. - -This fixes and issue pointed out by Orion when building on Fedora with Examples enabled. ---- - -diff --git a/Qt/ApplicationComponents/CMakeLists.txt b/Qt/ApplicationComponents/CMakeLists.txt -index 5fc86d3..d541cf7 100644 ---- a/Qt/ApplicationComponents/CMakeLists.txt -+++ b/Qt/ApplicationComponents/CMakeLists.txt -@@ -327,7 +327,7 @@ SOURCE_GROUP("Generated" FILES - ${CMAKE_CURRENT_BINARY_DIR}/pqApplicationComponentsExport.h - ) - --ADD_LIBRARY(pqApplicationComponents -+VTK_ADD_LIBRARY(pqApplicationComponents - ${SOURCE_FILES} - ${UI_BUILT_SOURCES} - ${MOC_BUILT_SOURCES} -@@ -340,6 +340,7 @@ TARGET_LINK_LIBRARIES(pqApplicationComponents - - IF(NOT PV_INSTALL_NO_LIBRARIES) - INSTALL(TARGETS pqApplicationComponents -+ EXPORT ${PV_INSTALL_EXPORT_NAME} - RUNTIME DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime - LIBRARY DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Runtime - ARCHIVE DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Development) diff --git a/paraview.spec b/paraview.spec index 65db0c7..3bc5768 100644 --- a/paraview.spec +++ b/paraview.spec @@ -2,7 +2,7 @@ %{!?build_mpich2:%global build_mpich2 1} %global pv_maj 3 %global pv_min 10 -%global pv_patch 0 +%global pv_patch 1 %global pv_majmin %{pv_maj}.%{pv_min} %global rcver %{nil} @@ -19,8 +19,6 @@ URL: http://www.paraview.org/ Source0: http://www.paraview.org/files/v%{pv_majmin}/ParaView-%{version}%{?rcver}.tar.gz Source1: paraview_22x22.png Source2: paraview.xml -#Patch from upsream to fix examples build issue -Patch0: paraview-3.10.0-build.patch #Add some needed includes Patch1: paraview-3.8.0-include.patch #Need some more includes () for gcc 4.6.0 @@ -210,7 +208,6 @@ BuildArch: noarch %prep %setup -q -n ParaView-%{version}%{?rcver} -%patch0 -p1 -b .build %patch1 -p1 -b .include %patch2 -p1 -b .gcc46 %patch5 -p1 -b .demo @@ -431,6 +428,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon Apr 18 2011 Orion Poplawski - 3.10.1-1 +- Update to 3.10.1 +- Drop build patch fixed upstream + * Mon Apr 4 2011 Orion Poplawski - 3.10.0-1 - Update to 3.10.0 - Drop lib and py27 patches fixed upstream diff --git a/sources b/sources index 3005747..a983bcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5369f05667f1ad8aaca7a879208aeb3c ParaView-3.10.0.tar.gz +d8a9d4a997a720589ffd57568bcdd449 ParaView-3.10.1.tar.gz