From 5180d8c0eae79b1f094f9312b31e4d990186dfa1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 18:51:02 +0000 Subject: [PATCH 1/9] Initialize branch F-8 for vtk --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 19bc09887a1bec69b5872b2ac0f85073ed5c1b09 Mon Sep 17 00:00:00 2001 From: athimm Date: Sat, 23 Feb 2008 11:45:44 +0000 Subject: [PATCH 2/9] Upgrade to 5.0.4. --- .cvsignore | 2 +- sources | 2 +- vtk.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index a7f176e..9abde8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vtk-5.0.3.tar.gz +vtk-5.0.4.tar.gz diff --git a/sources b/sources index b62a147..1281a7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0148a3d3c46d0599ab63e79f7f406609 vtk-5.0.3.tar.gz +1e353886bbd6559633e31436d88a1f03 vtk-5.0.4.tar.gz diff --git a/vtk.spec b/vtk.spec index 1c362e2..8a7cfd4 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,8 +6,8 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 5.0.3 -Release: 20%{?dist} +Version: 5.0.4 +Release: 19%{?dist} License: BSD-like Group: System Environment/Libraries Source: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz @@ -27,6 +27,7 @@ BuildRequires: libtiff-devel, zlib-devel BuildRequires: qt-devel %{?with_qt4:BuildRequires: qt4-devel} BuildRequires: chrpath +BuildRequires: doxygen, graphviz %description VTK is an open-source software system for image processing, 3D @@ -137,6 +138,7 @@ cmake_command="cmake . \ -DVTK_INSTALL_INCLUDE_DIR:PATH=%{_includedir}/vtk \ -DVTK_INSTALL_LIB_DIR:PATH=%{_libdir} \ -DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \ + -DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \ %if %{with OSMesa} -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ %endif @@ -334,7 +336,8 @@ rm -rf %{buildroot} %files python %defattr(-,root,root,-) -%{python_sitearch}/vtk +#%{python_sitearch}/vtk +%{python_sitearch}/* %{_libdir}/*PythonD.so.* %{_bindir}/vtkpython %{_bindir}/vtkWrapPython @@ -364,8 +367,8 @@ rm -rf %{buildroot} %{_libdir}/vtk-examples-5.0 %changelog -* Tue Aug 28 2007 Fedora Release Engineering - 5.0.3-20 -- Rebuild for selinux ppc32 issue. +* Sat Feb 23 2008 Axel Thimm - 5.0.4-19 +- Update to 5.0.4. * Mon May 28 2007 Axel Thimm - 5.0.3-18 - Move headers to %%{_includedir}/vtk. From 865e6c818720d3b757d5a7b0662c47296d4935ec Mon Sep 17 00:00:00 2001 From: athimm Date: Mon, 25 Aug 2008 12:06:41 +0000 Subject: [PATCH 3/9] %%check || : does not work anymore, enable java by default. --- vtk.spec | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/vtk.spec b/vtk.spec index 8a7cfd4..dcbfa80 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,17 +1,21 @@ %bcond_without OSMesa %bcond_with qt4 -%bcond_with java +%bcond_without java %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.0.4 -Release: 19%{?dist} -License: BSD-like +Release: 23%{?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 +License: BSD Group: System Environment/Libraries Source: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz Patch0: vtk-5.0.0-pythondestdir.patch +Patch1: vtk-5.0.4-gcc43.patch URL: http://vtk.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: cmake >= 2.0.4 @@ -24,7 +28,7 @@ BuildRequires: tk-devel, tcl-devel BuildRequires: python-devel BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel BuildRequires: libtiff-devel, zlib-devel -BuildRequires: qt-devel +BuildRequires: qt3-devel %{?with_qt4:BuildRequires: qt4-devel} BuildRequires: chrpath BuildRequires: doxygen, graphviz @@ -101,6 +105,7 @@ programming languages. %prep %setup -q -n VTK %patch0 -p1 +%patch1 -p1 -b .gcc43 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} # otherwise it will break on symlinks. @@ -283,7 +288,7 @@ find Utilities/Upgrading -type f | xargs chmod -x # Add exec bits to shared libs ... chmod 0755 %{buildroot}%{_libdir}/vtk-5.0/CMake/*.so -%check || : +%check #LD_LIBARARY_PATH=`pwd`/bin ctest -V %clean @@ -367,6 +372,19 @@ rm -rf %{buildroot} %{_libdir}/vtk-examples-5.0 %changelog +* Sun Aug 24 2008 Axel Thimm - 5.0.4-23 +- %%check || : does not work anymore. +- enable java by default. + +* Wed May 21 2008 Tom "spot" Callaway - 5.0.4-22 +- fix license tag + +* Sat Apr 12 2008 Axel Thimm - 5.0.4-21 +- Fixes for gcc 4.3 by Orion Poplawski. + +* Sat Apr 5 2008 Axel Thimm - 5.0.4-20 +- Change BR to qt-devel to qt3-devel. + * Sat Feb 23 2008 Axel Thimm - 5.0.4-19 - Update to 5.0.4. From cdf47a6ff9c3afa004aba1cc4f64d4313390d639 Mon Sep 17 00:00:00 2001 From: athimm Date: Tue, 26 Aug 2008 17:18:38 +0000 Subject: [PATCH 4/9] Change java build dependencies from java-devel to gcj. --- vtk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index dcbfa80..3abf712 100644 --- a/vtk.spec +++ b/vtk.spec @@ -7,7 +7,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.0.4 -Release: 23%{?dist} +Release: 24%{?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 @@ -20,7 +20,7 @@ URL: http://vtk.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: cmake >= 2.0.4 BuildRequires: gcc-c++ -%{?with_java:BuildRequires: java-devel} +%{?with_java:BuildRequires: gcc-java, libgcj-devel} BuildRequires: libX11-devel, libXt-devel, libXext-devel BuildRequires: libICE-devel, libGL-devel %{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel} @@ -372,6 +372,9 @@ rm -rf %{buildroot} %{_libdir}/vtk-examples-5.0 %changelog +* Mon Aug 25 2008 Axel Thimm - 5.0.4-24 +- Change java build dependencies from java-devel to gcj. + * Sun Aug 24 2008 Axel Thimm - 5.0.4-23 - %%check || : does not work anymore. - enable java by default. From 2cc786f8eb5ff993ff8767c307b62e1ea0a526d0 Mon Sep 17 00:00:00 2001 From: athimm Date: Tue, 26 Aug 2008 17:52:13 +0000 Subject: [PATCH 5/9] Missing patches backcvs'ed --- vtk-5.0.4-gcc43.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 vtk-5.0.4-gcc43.patch diff --git a/vtk-5.0.4-gcc43.patch b/vtk-5.0.4-gcc43.patch new file mode 100644 index 0000000..bdc9633 --- /dev/null +++ b/vtk-5.0.4-gcc43.patch @@ -0,0 +1,33 @@ +--- VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2007-05-03 11:12:13.000000000 -0600 ++++ VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-04-11 13:52:05.000000000 -0600 +@@ -31,7 +31,7 @@ + + #include + #include +-#include ++#include + #include + #include + #if defined(__BORLANDC__) +--- VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 ++++ VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx 2008-02-18 10:31:08.000000000 -0700 +@@ -26,7 +26,7 @@ + #include "DICOMFile.h" + + #include +-#include ++#include + + DICOMFile::DICOMFile() : InputStream() + { +--- VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 ++++ VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx 2008-02-18 10:33:07.000000000 -0700 +@@ -39,7 +39,7 @@ + #include + #endif + +-#include ++#include + + // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr + // #define DEBUG_DICOM From 67945bb646204570b71d4ab400c7ba549060ea0a Mon Sep 17 00:00:00 2001 From: athimm Date: Tue, 26 Aug 2008 18:33:46 +0000 Subject: [PATCH 6/9] F8 has no 'qt3' --- vtk.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vtk.spec b/vtk.spec index 3abf712..1f8b0fd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -7,7 +7,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.0.4 -Release: 24%{?dist} +Release: 23.99%{?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 @@ -28,7 +28,7 @@ BuildRequires: tk-devel, tcl-devel BuildRequires: python-devel BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel BuildRequires: libtiff-devel, zlib-devel -BuildRequires: qt3-devel +BuildRequires: qt-devel %{?with_qt4:BuildRequires: qt4-devel} BuildRequires: chrpath BuildRequires: doxygen, graphviz @@ -385,9 +385,6 @@ rm -rf %{buildroot} * Sat Apr 12 2008 Axel Thimm - 5.0.4-21 - Fixes for gcc 4.3 by Orion Poplawski. -* Sat Apr 5 2008 Axel Thimm - 5.0.4-20 -- Change BR to qt-devel to qt3-devel. - * Sat Feb 23 2008 Axel Thimm - 5.0.4-19 - Update to 5.0.4. From ae929389a17d73e40924545d19b17b73642ab337 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 21 Dec 2008 21:58:47 +0000 Subject: [PATCH 7/9] Update to 5.2.0 --- .cvsignore | 2 +- sources | 2 +- vtk-5.0.0-pythondestdir.patch | 11 ------- vtk-5.0.4-gcc43.patch | 33 ------------------- vtk.spec | 62 +++++++++++++++++++---------------- 5 files changed, 36 insertions(+), 74 deletions(-) delete mode 100644 vtk-5.0.0-pythondestdir.patch delete mode 100644 vtk-5.0.4-gcc43.patch diff --git a/.cvsignore b/.cvsignore index 9abde8c..de3cd17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vtk-5.0.4.tar.gz +vtk-5.2.0.tar.gz diff --git a/sources b/sources index 1281a7a..9df2052 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e353886bbd6559633e31436d88a1f03 vtk-5.0.4.tar.gz +eb8c3b463c027490164538b0fc3b35ad vtk-5.2.0.tar.gz diff --git a/vtk-5.0.0-pythondestdir.patch b/vtk-5.0.0-pythondestdir.patch deleted file mode 100644 index c24f65a..0000000 --- a/vtk-5.0.0-pythondestdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- VTK/Wrapping/Python/CMakeLists.txt~ 2005-08-25 21:31:14.000000000 +0200 -+++ VTK/Wrapping/Python/CMakeLists.txt 2006-05-27 13:32:40.000000000 +0200 -@@ -299,7 +299,7 @@ - # Create default python setup arguments if they are not set. - IF(DEFINED VTK_PYTHON_SETUP_ARGS) - ELSE(DEFINED VTK_PYTHON_SETUP_ARGS) -- SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\"" -+ SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\" -O1" - CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.") - MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS) - ENDIF(DEFINED VTK_PYTHON_SETUP_ARGS) diff --git a/vtk-5.0.4-gcc43.patch b/vtk-5.0.4-gcc43.patch deleted file mode 100644 index bdc9633..0000000 --- a/vtk-5.0.4-gcc43.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2007-05-03 11:12:13.000000000 -0600 -+++ VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-04-11 13:52:05.000000000 -0600 -@@ -31,7 +31,7 @@ - - #include - #include --#include -+#include - #include - #include - #if defined(__BORLANDC__) ---- VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 -+++ VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx 2008-02-18 10:31:08.000000000 -0700 -@@ -26,7 +26,7 @@ - #include "DICOMFile.h" - - #include --#include -+#include - - DICOMFile::DICOMFile() : InputStream() - { ---- VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 -+++ VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx 2008-02-18 10:33:07.000000000 -0700 -@@ -39,7 +39,7 @@ - #include - #endif - --#include -+#include - - // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr - // #define DEBUG_DICOM diff --git a/vtk.spec b/vtk.spec index 1f8b0fd..6f98642 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,16 +6,16 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 5.0.4 -Release: 23.99%{?dist} +Version: 5.2.0 +Release: 26%{?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 License: BSD Group: System Environment/Libraries -Source: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz -Patch0: vtk-5.0.0-pythondestdir.patch -Patch1: vtk-5.0.4-gcc43.patch +Source: http://www.vtk.org/files/release/5.2/%{name}-%{version}.tar.gz +Patch0: vtk-5.2.0-pythondestdir.patch +Patch1: vtk-5.2.0-gcc43.patch URL: http://vtk.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: cmake >= 2.0.4 @@ -28,7 +28,7 @@ BuildRequires: tk-devel, tcl-devel BuildRequires: python-devel BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel BuildRequires: libtiff-devel, zlib-devel -BuildRequires: qt-devel +BuildRequires: qt3-devel %{?with_qt4:BuildRequires: qt4-devel} BuildRequires: chrpath BuildRequires: doxygen, graphviz @@ -104,7 +104,7 @@ programming languages. %prep %setup -q -n VTK -%patch0 -p1 +%patch0 -p1 -b .pythondestdir %patch1 -p1 -b .gcc43 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} @@ -116,9 +116,9 @@ grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \ find . -name \*.c -or -name \*.cxx -or -name \*.h | xargs chmod -x # Save an unbuilt copy of the Example's sources for %doc -mkdir vtk-examples-5.0 -cp -a Examples vtk-examples-5.0 -find vtk-examples-5.0 -type f | xargs chmod -R a-x +mkdir vtk-examples-5.2 +cp -a Examples vtk-examples-5.2 +find vtk-examples-5.2 -type f | xargs chmod -R a-x %build export CFLAGS="%{optflags} -D_UNICODE" @@ -139,9 +139,10 @@ cmake_command="cmake . \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:PATH=$tmpinstall \ + -DDESIRED_QT_VERSION:STRING=3 \ -DVTK_INSTALL_BIN_DIR:PATH=%{_bindir} \ -DVTK_INSTALL_INCLUDE_DIR:PATH=%{_includedir}/vtk \ - -DVTK_INSTALL_LIB_DIR:PATH=%{_libdir} \ + -DVTK_INSTALL_LIB_DIR:PATH=%{_libdir}/vtk-5.2 \ -DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \ -DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \ %if %{with OSMesa} @@ -205,13 +206,10 @@ fi ls %{buildroot}%{_libdir}/*.so.* \ | grep -Ev '(Java|QVTK|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list -mkdir -p %{buildroot}%{_libdir}/vtk-examples-5.0 \ - %{buildroot}%{_libdir}/vtk-testing-5.0 - # List of executable utilities cat > utils.list << EOF vtkParseOGLExt -vtkVREncodeString +vtkEncodeString EOF # List of executable examples @@ -273,9 +271,10 @@ done cat libs.list utils.list > main.list # Make shared libs and scripts executable +mv %{buildroot}%{_libdir}/vtk-5.2/lib*.so* %{buildroot}%{_libdir}/ chmod a+x %{buildroot}%{_libdir}/lib*.so.* -chmod a+x %{buildroot}%{_libdir}/vtk-5.0/doxygen/*.pl -chmod a+x %{buildroot}%{_libdir}/vtk-5.0/testing/*.{py,tcl} +chmod a+x %{buildroot}%{_libdir}/vtk-5.2/doxygen/*.pl +chmod a+x %{buildroot}%{_libdir}/vtk-5.2/testing/*.{py,tcl} # Remove exec bit from non-scripts and %%doc for file in `find %{buildroot} -type f -perm 0755 \ @@ -286,7 +285,7 @@ done find Utilities/Upgrading -type f | xargs chmod -x # Add exec bits to shared libs ... -chmod 0755 %{buildroot}%{_libdir}/vtk-5.0/CMake/*.so +chmod 0755 %{buildroot}%{_libdir}/vtk-5.2/CMake/*.so %check #LD_LIBARARY_PATH=`pwd`/bin ctest -V @@ -323,12 +322,12 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %doc Utilities/Upgrading -%{_libdir}/vtk-5.0/doxygen +%{_libdir}/vtk-5.2/doxygen %{_includedir}/vtk %{_libdir}/*.so -%{_libdir}/vtk-5.0/CMake -%{_libdir}/vtk-5.0/*.cmake -%{_libdir}/vtk-5.0/hints +%{_libdir}/vtk-5.2/CMake +%{_libdir}/vtk-5.2/*.cmake +%{_libdir}/vtk-5.2/hints %files tcl %defattr(-,root,root,-) @@ -336,8 +335,8 @@ rm -rf %{buildroot} %{_bindir}/vtk %{_bindir}/vtkWrapTcl %{_bindir}/vtkWrapTclInit -%{_libdir}/vtk-5.0/pkgIndex.tcl -%{_libdir}/vtk-5.0/tcl +%{_libdir}/vtk-5.2/pkgIndex.tcl +%{_libdir}/vtk-5.2/tcl %files python %defattr(-,root,root,-) @@ -363,15 +362,19 @@ rm -rf %{buildroot} %files testing -f testing.list %defattr(-,root,root,-) -%{_libdir}/vtk-5.0/testing -%{_libdir}/vtk-testing-5.0 +%{_libdir}/vtk-5.2/testing %files examples -f examples.list %defattr(-,root,root,-) -%doc vtk-examples-5.0/Examples -%{_libdir}/vtk-examples-5.0 +%doc vtk-examples-5.2/Examples %changelog +* Sun Oct 5 2008 Axel Thimm - 5.2.0-26 +- Update to 5.2.0. + +* Wed Oct 1 2008 Orion Poplawski - 5.0.2-25 +- Fix patch fuzz + * Mon Aug 25 2008 Axel Thimm - 5.0.4-24 - Change java build dependencies from java-devel to gcj. @@ -385,6 +388,9 @@ rm -rf %{buildroot} * Sat Apr 12 2008 Axel Thimm - 5.0.4-21 - Fixes for gcc 4.3 by Orion Poplawski. +* Sat Apr 5 2008 Axel Thimm - 5.0.4-20 +- Change BR to qt-devel to qt3-devel. + * Sat Feb 23 2008 Axel Thimm - 5.0.4-19 - Update to 5.0.4. From be00c7be5b80e4686dd8751baa00b1471659b235 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:01 +0000 Subject: [PATCH 8/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 42e614e..b61294b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vtk -# $Id$ +# $Id: Makefile,v 1.1 2007/06/03 18:27:30 kevin Exp $ NAME := vtk SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9d7f2e1e4056e2d5aaedc3bd26fe09194955a680 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:09:54 +0000 Subject: [PATCH 9/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b61294b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vtk -# $Id: Makefile,v 1.1 2007/06/03 18:27:30 kevin Exp $ -NAME := vtk -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8