Author: glehmann
Date: Mon Dec 11 11:57:10 2006
New Revision: 94760
Added:
packages/cooker/itk/current/SOURCES/InsightToolkit-3.0.0.tar.bz2
(contents, props changed)
packages/cooker/itk/current/SOURCES/ItkSoftwareGuide.pdf.bz2 (contents,
props changed)
packages/cooker/itk/current/SOURCES/consolidatedMorphology.tar.bz2
(contents, props changed)
packages/cooker/itk/current/SOURCES/itk-flat-strel-tests.patch.bz2
(contents, props changed)
packages/cooker/itk/current/SOURCES/watershed.tar.bz2 (contents, props
changed)
Removed:
packages/cooker/itk/current/SOURCES/ImageCompare.tar.bz2
packages/cooker/itk/current/SOURCES/InsightToolkit-2.8.1.tar.bz2
packages/cooker/itk/current/SOURCES/ItkSoftwareGuide-2.4.0.pdf.bz2
packages/cooker/itk/current/SOURCES/histoErodeDilate.tar.bz2
packages/cooker/itk/current/SOURCES/topHat.tar.bz2
Modified:
packages/cooker/itk/current/SOURCES/binaryErodeDilate.tar.bz2
packages/cooker/itk/current/SOURCES/fastReconstruction.tar.bz2
packages/cooker/itk/current/SOURCES/wrapping-convenience-patches.patch.bz2
packages/cooker/itk/current/SPECS/itk.spec
Log:
3.0.0
Added: packages/cooker/itk/current/SOURCES/InsightToolkit-3.0.0.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/itk/current/SOURCES/ItkSoftwareGuide.pdf.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/itk/current/SOURCES/binaryErodeDilate.tar.bz2
==============================================================================
Binary files. No diff available.
Added: packages/cooker/itk/current/SOURCES/consolidatedMorphology.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/itk/current/SOURCES/fastReconstruction.tar.bz2
==============================================================================
Binary files. No diff available.
Added: packages/cooker/itk/current/SOURCES/itk-flat-strel-tests.patch.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/itk/current/SOURCES/watershed.tar.bz2
==============================================================================
Binary file. No diff available.
Modified:
packages/cooker/itk/current/SOURCES/wrapping-convenience-patches.patch.bz2
==============================================================================
Binary files. No diff available.
Modified: packages/cooker/itk/current/SPECS/itk.spec
==============================================================================
--- packages/cooker/itk/current/SPECS/itk.spec (original)
+++ packages/cooker/itk/current/SPECS/itk.spec Mon Dec 11 11:57:10 2006
@@ -1,12 +1,9 @@
-%define build_java 0
-%{?_with_java: %{expand: %%global build_java 1}}
-
%define build_patented 0
%{?_with_patented: %{expand: %%global build_patented 1}}
%define name itk
-%define version 2.8.1
-%define release 3
+%define version 3.0.0
+%define release 1
%define libname %mklibname %{name}
%define libname_devel %mklibname %{name} -d
@@ -21,7 +18,7 @@
Group: Sciences/Other
URL: http://www.itk.org
Source0:
http://ovh.dl.sourceforge.net/sourceforge/itk/InsightToolkit-%{version}.tar.bz2
-Source1:
http://ovh.dl.sourceforge.net/sourceforge/itk/ItkSoftwareGuide-2.4.0.pdf.bz2
+Source1: http://www.itk.org/ItkSoftwareGuide.pdf.bz2
Patch10: wrapping-convenience-patches.patch.bz2
Patch11: python-interface-patches.patch.bz2
# enhance binary erosion and dilation
@@ -30,12 +27,11 @@
Source3: fastReconstruction.tar.bz2
Patch30: itk-headertest.patch.bz2
# enhance grayscale dilation and erosion
-Source4: histoErodeDilate.tar.bz2
-# fix bug in tophat and grayscale opening/closing
-Source5: topHat.tar.bz2
-# a tool to compare images - useful to run tests
-Source6:
http://insight-journal.org/documentation/CMake/ImageCompare.tar.bz2
-BuildRequires: cmake >= 1.8.3
+Source4: consolidatedMorphology.tar.bz2
+Patch40: itk-flat-strel-tests.patch.bz2
+# contain a more efficient implementation of the connected component filter
+Source5: watershed.tar.bz2
+BuildRequires: cmake >= 2.4.2
BuildRequires: XFree86-devel
BuildRequires: png-devel
BuildRequires: tiff-devel
@@ -113,13 +109,13 @@
of Health. NLM in turn was supported by member institutions of NIH (see
sponsors).
-%package examples
-Summary: C++, Tcl and Python example programs/scripts for ITK
+%package utils
+Summary: ITK utilities
Group: Development/C++
Requires: %{name}-data = %{version}
Requires: %{libname} = %{version}
-%description examples
+%description utils
ITK is an open-source software system to support the Visible Human Project.
Currently under active development, ITK employs leading-edge segmentation
and registration algorithms in two, three, and more dimensions.
@@ -133,11 +129,13 @@
of Health. NLM in turn was supported by member institutions of NIH (see
sponsors).
-%package data
-Summary: These data are required to run various examples from the
examples package
+%package examples
+Summary: C++, Tcl and Python example programs/scripts for ITK
Group: Development/C++
+Requires: %{name}-data = %{version}
+Requires: %{libname} = %{version}
-%description data
+%description examples
ITK is an open-source software system to support the Visible Human Project.
Currently under active development, ITK employs leading-edge segmentation
and registration algorithms in two, three, and more dimensions.
@@ -151,11 +149,11 @@
of Health. NLM in turn was supported by member institutions of NIH (see
sponsors).
-%package doc
-Summary: Documentation for ITK
+%package data
+Summary: These data are required to run various examples from the
examples package
Group: Development/C++
-%description doc
+%description data
ITK is an open-source software system to support the Visible Human Project.
Currently under active development, ITK employs leading-edge segmentation
and registration algorithms in two, three, and more dimensions.
@@ -169,40 +167,11 @@
of Health. NLM in turn was supported by member institutions of NIH (see
sponsors).
-# %package -n python-%{name}
-# Summary: Python bindings for ITK
-# Group: Development/Python
-# Requires: python
-# Requires: python-numarray
-# Requires: %{name} = %{version}
-# Requires(pre): %{name} = %{version}
-# Obsoletes: %{name}-pyhon
-# Provides: %{name}-pyhon
-#
-# %description -n python-%{name}
-# ITK is an open-source software system to support the Visible Human Project.
-# Currently under active development, ITK employs leading-edge segmentation
-# and registration algorithms in two, three, and more dimensions.
-#
-# The Insight Toolkit was developed by six principal organizations, three
-# commercial (Kitware, GE Corporate R&D, and Insightful) and three academic
-# (UNC Chapel Hill, University of Utah, and University of Pennsylvania).
-# Additional team members include Harvard Brigham & Women's Hospital,
-# University of Pittsburgh, and Columbia University. The funding for the
-# project is from the National Library of Medicine at the National Institutes
-# of Health. NLM in turn was supported by member institutions of NIH (see
-# sponsors).
-
-%if %build_java
-%package -n java-%{name}
-Summary: Java bindings for ITK
-Group: Development/Java
-Requires: %{name} = %{version}
-Requires(pre): %{name} = %{version}
-Obsoletes: %{name}-java
-Provides: %{name}-java
+%package doc
+Summary: Documentation for ITK
+Group: Development/C++
-%description -n java-%{name}
+%description doc
ITK is an open-source software system to support the Visible Human Project.
Currently under active development, ITK employs leading-edge segmentation
and registration algorithms in two, three, and more dimensions.
@@ -215,30 +184,6 @@
project is from the National Library of Medicine at the National Institutes
of Health. NLM in turn was supported by member institutions of NIH (see
sponsors).
-%endif
-
-# %package -n tcl-%{name}
-# Summary: TCL bindings for ITK
-# Group: Development/Other
-# Requires: %{name} = %{version}
-# Requires(pre): %{name} = %{version}
-# Requires: tcl
-# Obsoletes: %{name}-tcl
-# Provides: %{name}-tcl
-#
-# %description -n tcl-%{name}
-# ITK is an open-source software system to support the Visible Human Project.
-# Currently under active development, ITK employs leading-edge segmentation
-# and registration algorithms in two, three, and more dimensions.
-#
-# The Insight Toolkit was developed by six principal organizations, three
-# commercial (Kitware, GE Corporate R&D, and Insightful) and three academic
-# (UNC Chapel Hill, University of Utah, and University of Pennsylvania).
-# Additional team members include Harvard Brigham & Women's Hospital,
-# University of Pittsburgh, and Columbia University. The funding for the
-# project is from the National Library of Medicine at the National Institutes
-# of Health. NLM in turn was supported by member institutions of NIH (see
-# sponsors).
%prep
@@ -249,19 +194,19 @@
%patch10 -p0
%patch11 -p0
%patch30
+%patch40 -p0
# install code fix/enhancements
tar xvjf %{SOURCE2}
tar xvjf %{SOURCE3}
tar xvjf %{SOURCE4}
tar xvjf %{SOURCE5}
-tar xvjf %{SOURCE6}
cp -f binaryErodeDilate/itk* Code/BasicFilters
cp -f fastReconstruction/itk* Code/BasicFilters
-cp -f histoErodeDilate/itk* Code/BasicFilters
-cp -f topHat/itk* Code/BasicFilters
-
+cp -f watershed/itkConnectedComponent* Code/BasicFilters
+cp -f consolidatedMorphology/itk* Code/BasicFilters
+mv -f Code/BasicFilters/itkFlatStructuringElement* Code/Review
# doc
bunzip2 %{SOURCE1} -c > ItkSoftwareGuide.pdf
@@ -283,9 +228,9 @@
-DITK_USE_SYSTEM_TIFF:BOOL=ON \
-DITK_USE_SYSTEM_PNG:BOOL=ON \
-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
- -DCMAKE_SKIP_RPATH:BOOL=ON \
-DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS" \
-DCMAKE_C_FLAGS:STRING="$RPM_OPT_FLAGS" \
+ -DITK_USE_REVIEW:BOOL=ON \
.
# -DCableSwig_DIR:PATH=%{_libdir}/CableSwig \
@@ -298,15 +243,6 @@
# -DCMAKE_CXX_FLAGS:STRING=$RPM_OPT_FLAGS \
# -DCMAKE_C_FLAGS:STRING=$RPM_OPT_FLAGS \
-%if %build_java
-cmake -DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \
- -DJAVA_INCLUDE_PATH2:PATH=$JAVA_HOME/include/linux \
- -DJAVA_AWT_INCLUDE_PATH:PATH=$JAVA_HOME/include \
- -DJAVA_AWT_LIBRARY:PATH=$JAVA_HOME/jre/lib/i386/libawt.so \
- -DVTK_WRAP_JAVA:BOOL=ON \
-.
-%endif
-
%if %build_patented
cmake -DITK_USE_PATENTED:BOOL=ON \
.
@@ -320,21 +256,6 @@
%make
-
-# build ImageCompare
-(
-cd ImageCompare
-cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
- -DCMAKE_CXX_COMPILER:PATH=%{_bindir}/c++ \
- -DCMAKE_C_COMPILER:PATH=%{_bindir}/gcc \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DCMAKE_SKIP_RPATH:BOOL=ON \
- -DITK_DIR:PATH=.. \
-.
-%make
-)
-
-
# build docs
mkdir -p Documentation/Doxygen
doxygen doxygen.config
@@ -385,10 +306,6 @@
#cp Wrapping/CSwig/Tcl/itkutils.tcl
$RPM_BUILD_ROOT/%{_libdir}/InsightToolkit/tcl/
# rm -f $RPM_BUILD_ROOT/%{_libdir}/InsightToolkit/itkwish
-# install ImageCompare
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-cp ImageCompare/ImageCompare $RPM_BUILD_ROOT/%{_bindir}
-
# multiarch support
%multiarch_includes
$RPM_BUILD_ROOT/%{_includedir}/InsightToolkit/Utilities/itksys/FundamentalType.h
@@ -422,11 +339,14 @@
%files -n %{libname_devel}
%defattr(0644,root,root,0755)
-%attr(0755,root,root) %{_bindir}/ImageCompare
%{_includedir}/*
%{_libdir}/InsightToolkit/*.cmake
%{_libdir}/InsightToolkit/lib*.so
+%files utils
+%defattr(0755,root,root,0755)
+%{_bindir}/*
+
%files doc
%defattr(0644,root,root,0755)
%doc Documentation/InsightDeveloperStart.pdf
@@ -443,24 +363,3 @@
%defattr(0644,root,root,0755)
%{_datadir}/%{name}-data
-# %files -n python-%{name}
-# %defattr(0644,root,root,0755)
-# %{_libdir}/InsightToolkit/*Python.so
-# %{_libdir}/InsightToolkit/python
-# %{_libdir}/InsightToolkit/*.py
-# %(python -c"import os,sys; print os.path.join(sys.exec_prefix, '%{_lib}',
'python' + sys.version[:3],'site-packages', 'InsightToolkit.pth')")
-
-# %files -n tcl-%{name}
-# %defattr(0644,root,root,0755)
-# %attr(755,root,root) %{_bindir}/itkwish
-# %{_libdir}/InsightToolkit/tcl
-# %{_libdir}/InsightToolkit/*Tcl.so
-# %attr(755,root,root) %{_libdir}/InsightToolkit/itkwish
-
-%if %build_java
-%files -n java-%{name}
-%defattr(0644,root,root,0755)
-%{_libdir}/InsightToolkit/java
-%{_libdir}/InsightToolkit/*Java.so
-%endif
-
