From 59289f98e0dc7751e7758327cf6d8f6491596d7d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2014 13:58:45 -0700 Subject: [PATCH 1/7] Bump release and add changelog --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 0d4781c..7762547 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 7%{?dist} +Release: 8%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -441,6 +441,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Sun Jan 25 2014 Orion Poplawski - 6.0.0-8 +- Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) + * Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 969373914f3a4305e6313af8328c1306bb2a66c2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2014 14:00:10 -0700 Subject: [PATCH 2/7] Fix date --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 7762547..3c3d518 100644 --- a/vtk.spec +++ b/vtk.spec @@ -441,7 +441,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog -* Sun Jan 25 2014 Orion Poplawski - 6.0.0-8 +* Sun Jan 26 2014 Orion Poplawski - 6.0.0-8 - Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) * Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-7 From 0e857fd777cef55ac6e78769160128d9363cdba4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2014 20:52:26 -0700 Subject: [PATCH 3/7] Fix requires freetype-devel --- vtk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index 3c3d518..d350654 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 8%{?dist} +Release: 9%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -84,7 +84,7 @@ Requires: vtk = %{version}-%{release} Requires: cmake Requires: gl2ps-devel Requires: expat-devel, libjpeg-devel, libpng-devel -Requires: libfreetype-devel +Requires: freetype-devel Requires: libogg-devel Requires: libtheora-devel Requires: libtiff-devel @@ -441,6 +441,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Sun Jan 26 2014 Orion Poplawski - 6.0.0-9 +- Fix requires freetype-devel + * Sun Jan 26 2014 Orion Poplawski - 6.0.0-8 - Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) From b6acb72a9adda7dfe71c9655141907344cc78290 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 26 Mar 2014 20:18:27 -0600 Subject: [PATCH 4/7] Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) --- vtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d350654..e7f76c3 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 9%{?dist} +Release: 10%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -85,6 +85,7 @@ Requires: cmake Requires: gl2ps-devel Requires: expat-devel, libjpeg-devel, libpng-devel Requires: freetype-devel +Requires: hdf5-devel Requires: libogg-devel Requires: libtheora-devel Requires: libtiff-devel @@ -92,6 +93,7 @@ Requires: libxml2-devel Requires: postgresql-devel Requires: mysql-devel Requires: qt4-devel +Requires: qtwebkit-devel Group: Development/Libraries %description devel @@ -441,6 +443,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Wed Mar 26 2014 Orion Poplawski - 6.0.0-10 +- Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) + * Sun Jan 26 2014 Orion Poplawski - 6.0.0-9 - Fix requires freetype-devel From 6c8fd06d8a9b99ed3577c00f906212c2e933eacb Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 7 May 2014 10:29:49 -0400 Subject: [PATCH 5/7] rebuild against R without bundled lapack/blas --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index e7f76c3..f105353 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 10%{?dist} +Release: 11%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -443,6 +443,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Wed May 7 2014 Tom Callaway - 6.0.0-11 +- rebuild against R without bundled blas/lapack + * Wed Mar 26 2014 Orion Poplawski - 6.0.0-10 - Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) From 9c1ad6102d6cea81b3358565254f915a8cc1ef6e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 7 May 2014 10:49:13 -0400 Subject: [PATCH 6/7] old vtk needs explicit blas-devel, lapack-devel --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index f105353..c7d1429 100644 --- a/vtk.spec +++ b/vtk.spec @@ -59,7 +59,7 @@ BuildRequires: hdf5-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel -BuildRequires: R-devel +BuildRequires: R-devel, blas-devel, lapack-devel BuildRequires: PyQt4-devel BuildRequires: sip-devel BuildRequires: wget From 47f29e6cd714d490e8c59f351ccabf8a248ec336 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 5 Jun 2014 07:30:23 -0600 Subject: [PATCH 7/7] Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) --- vtk.spec | 53 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/vtk.spec b/vtk.spec index c7d1429..9eb53cd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 11%{?dist} +Release: 12%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -79,21 +79,25 @@ volume rendering, LOD control). %package devel Summary: VTK header files for building C++ code -Requires: vtk = %{version}-%{release} -%{?with_OSMesa:Requires: mesa-libOSMesa-devel} +Requires: vtk%{?_isa} = %{version}-%{release} +%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake -Requires: gl2ps-devel -Requires: expat-devel, libjpeg-devel, libpng-devel -Requires: freetype-devel -Requires: hdf5-devel -Requires: libogg-devel -Requires: libtheora-devel -Requires: libtiff-devel -Requires: libxml2-devel -Requires: postgresql-devel -Requires: mysql-devel -Requires: qt4-devel -Requires: qtwebkit-devel +Requires: blas-devel%{?_isa} +Requires: gl2ps-devel%{?_isa} +Requires: expat-devel%{?_isa} +Requires: freetype-devel%{?_isa} +Requires: hdf5-devel%{?_isa} +Requires: lapack-devel%{?_isa} +Requires: libjpeg-devel%{?_isa} +Requires: libpng-devel%{?_isa} +Requires: libogg-devel%{?_isa} +Requires: libtheora-devel%{?_isa} +Requires: libtiff-devel%{?_isa} +Requires: libxml2-devel%{?_isa} +Requires: postgresql-devel%{?_isa} +Requires: mysql-devel%{?_isa} +Requires: qt4-devel%{?_isa} +Requires: qtwebkit-devel%{?_isa} Group: Development/Libraries %description devel @@ -102,7 +106,7 @@ use VTK to do 3D visualization. %package tcl Summary: Tcl bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description tcl @@ -110,7 +114,7 @@ tcl bindings for VTK %package python Summary: Python bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description python @@ -119,7 +123,7 @@ python bindings for VTK %if %{with java} %package java Summary: Java bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description java @@ -128,7 +132,7 @@ Java bindings for VTK %package qt Summary: Qt bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description qt @@ -136,7 +140,7 @@ Qt bindings for VTK %package qt-python Summary: Qt Python bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description qt-python @@ -144,7 +148,7 @@ Qt Python bindings for VTK %package qt-tcl Summary: Qt TCL bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description qt-tcl @@ -152,7 +156,7 @@ Qt TCL bindings for VTK %package testing Summary: Testing programs for VTK -Requires: vtk = %{version}-%{release}, vtkdata = %{version} +Requires: vtk%{?_isa} = %{version}-%{release}, vtkdata = %{version} Group: Applications/Engineering %description testing @@ -160,7 +164,7 @@ Testing programs for VTK %package examples Summary: Examples for VTK -Requires: vtk = %{version}-%{release}, vtkdata = %{version} +Requires: vtk%{?_isa} = %{version}-%{release}, vtkdata = %{version} Group: Applications/Engineering %description examples @@ -443,6 +447,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Thu Jun 5 2014 Orion Poplawski - 6.0.0-12 +- Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) + * Wed May 7 2014 Tom Callaway - 6.0.0-11 - rebuild against R without bundled blas/lapack