Accepting request 351544 from home:pluskalm:branches:Application:Geo

- Cleanup spec filew with spec-cleaner - Use cmake macros - Use spdx license and install license file - Use url for source OBS-URL: https://build.opensuse.org/request/show/351544 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/insighttoolkit?expand=0&rev=2
2016-01-01 11:16:16 +00:00 · 2016-01-01 11:16:16 +00:00 · 31f9a60fba
commit 31f9a60fba
parent 80cecb468a
4 changed files with 95 additions and 93 deletions
--- a/InsightToolkit-4.8.2.tar.gz
+++ b/InsightToolkit-4.8.2.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8d5e3aea700588c60b01418c440b2d95b517ea18dd4c834c5164354e53596af
-size 17400381
--- a/InsightToolkit-4.8.2.tar.xz
+++ b/InsightToolkit-4.8.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fec268ba180bdb78d760aa4f6f467d0a5fc71b3a34e3201d8425d0edfa23ef5f
+size 11261016
--- a/insighttoolkit.changes
+++ b/insighttoolkit.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan  1 08:07:48 UTC 2016 - mpluskal@suse.com
+
+- Cleanup spec filew with spec-cleaner
+- Use cmake macros
+- Use spdx license and install license file
+- Use url for source
+
 ----------------------------------------------------------------------------
 * Sat Dec 26 15:34:00 UTC 2015 Angelos Tzotsos <tzotsos@opensuse.org> - 4.8.2

--- a/insighttoolkit.spec
+++ b/insighttoolkit.spec
@ -1,6 +1,7 @@
 #
 # spec file for package insighttoolkit
 #
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2015 Angelos Tzotsos <tzotsos@opensuse.org>.
 #
 # All modifications and additions to the file contributed by third parties
@ -13,72 +14,75 @@
 # published by the Open Source Initiative.

 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#

-# norootforbuild

 %define tarname InsightToolkit
-
 Name:           insighttoolkit
 Version:        4.8.2
-Release:        1
+Release:        0
 Summary:        Insight Segmentation and Registration Toolkit
+License:        Apache-2.0
 Group:          Development/Libraries
-License:        Apache-2
-URL:            http://www.itk.org
-Source0:        %{tarname}-%{version}.tar.gz
+Url:            http://www.itk.org
+Source0:        http://sourceforge.net/projects/itk/files/itk/4.8/%{tarname}-%{version}.tar.xz
 Patch0:         nrrdio-linking.patch
 Patch1:         doubleconv.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-BuildRequires:	cmake >= 2.8.0
-BuildRequires:  gcc-c++ 
-BuildRequires:  gcc
-BuildRequires:  swig
-BuildRequires:  zlib-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libtiff-devel
+BuildRequires:  cmake >= 2.8.0
+BuildRequires:  dcmtk-devel
+BuildRequires:  fdupes
 BuildRequires:  fftw3-devel
 BuildRequires:  fftw3-threads-devel
-BuildRequires:  dcmtk-devel
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 # BuildRequires:  gdcm-devel
 BuildRequires:  hdf5-devel
-BuildRequires:  python-devel
-BuildRequires:  vtk-devel
-BuildRequires:  python-vtk
-BuildRequires:  libjpeg-devel
 BuildRequires:  libexpat-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  python-devel
+BuildRequires:  python-vtk
 BuildRequires:  sed
-BuildRequires:  fdupes
-
+BuildRequires:  swig
+BuildRequires:  vtk-devel
+BuildRequires:  xz
+BuildRequires:  zlib-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
-ITK is an open-source, cross-platform system that provides developers with an extensive suite of software tools for image analysis
+ITK is an open-source, cross-platform system that provides developers with
+an extensive suite of software tools for image analysis.

 %package devel
 Summary:        Development files for ITK
 Group:          Development/Libraries
-Requires:       lib%{name}4 = %{version}
-Requires:       zlib-devel
-Requires:       libpng-devel
-Requires:       libtiff-devel
+Requires:       dcmtk-devel
 Requires:       fftw3-devel
 Requires:       fftw3-threads-devel
-Requires:       dcmtk-devel
 Requires:       hdf5-devel
-Requires:       vtk-devel
-Requires:       libjpeg-devel
+Requires:       lib%{name}4 = %{version}
 Requires:       libexpat-devel
+Requires:       libjpeg-devel
+Requires:       libpng-devel
+Requires:       libtiff-devel
+Requires:       vtk-devel
+Requires:       zlib-devel
 Provides:       lib%{name}-devel

 %description devel
-Development files for the ITK library. ITK is an open-source, cross-platform system that provides developers with an extensive suite of software tools for image analysis
+Development files for the ITK library. ITK is an open-source,
+cross-platform system that provides developers with an extensive suite of
+software tools for image analysis.

 %package -n lib%{name}4
 Summary:        ITK static libraries
 Group:          System/Libraries

 %description -n lib%{name}4
-Shared ITK library. ITK is an open-source, cross-platform system that provides developers with an extensive suite of software tools for image analysis.
+Shared ITK library. ITK is an open-source, cross-platform system that
+provides developers with an extensive suite of software tools for image
+analysis..

 %prep
 %setup -q -n %{tarname}-%{version}
@ -86,84 +90,74 @@ Shared ITK library. ITK is an open-source, cross-platform system that provides d
 %patch1 -p1

 %build
-cd ..
-mkdir temp
-cd temp
-cmake  -DBUILD_EXAMPLES:BOOL=ON \
-       -DBUILD_SHARED_LIBS:BOOL=ON \
-       -DBUILD_TESTING:BOOL=OFF \
-       -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-       -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
-       -DCMAKE_SKIP_RPATH:BOOL=ON \
-       -DUSE_FFTWF=ON \
-       -DITK_USE_FFTWD:BOOL=ON \
-       -DITK_USE_FFTWF:BOOL=ON \
-       -DITK_USE_SYSTEM_FFTW:BOOL=ON \
-       -DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
-       -DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=OFF \
-       -DITK_USE_SYSTEM_DCMTK:BOOL=ON \
-       -DITK_USE_SYSTEM_GDCM:BOOL=OFF \
-       -DITK_USE_SYSTEM_HDF5:BOOL=ON \
-       -DITK_USE_SYSTEM_JPEG:BOOL=ON \
-       -DITK_USE_SYSTEM_PNG:BOOL=ON \
-       -DITK_USE_SYSTEM_TIFF:BOOL=ON \
-       -DITK_USE_SYSTEM_VXL:BOOL=OFF \
-       -DITK_USE_SYSTEM_ZLIB:BOOL=ON \
-       -DITK_USE_SYSTEM_GCCXML:BOOL=OFF \
-       -DITK_USE_SYSTEM_SWIG:BOOL=ON \
-       -DITK_USE_SYSTEM_EXPAT:BOOL=ON \
-       -DModule_ITKDCMTK:BOOL=ON \
-       -DModule_ITKIOPhilipsREC:BOOL=OFF \
-       -DModule_ITKLevelSetsv4Visualization:BOOL=OFF \
-       -DModule_ITKReview:BOOL=OFF \
-       -DModule_ITKVideoBridgeOpenCV:BOOL=OFF \
-       -DModule_ITKVideoBridgeVXL:BOOL=OFF \
-       -DModule_ITKVtkGlue:BOOL=OFF \
-       -DModule_ITKDeprecated:BOOL=OFF \
-       -DITKV3_COMPATIBILITY:BOOL=ON \
-       -DVCL_INCLUDE_CXX_0X:BOOL=ON \
-       -DITK_WRAP_DIMS="2;3;4" \
-       -DITK_WRAP_double:BOOL=ON \
-       -DITK_WRAP_vector_double:BOOL=ON \
-       -DITK_WRAP_covariant_vector_double:BOOL=ON \
-       -DITK_WRAP_complex_double:BOOL=ON \
-       -DITK_WRAPPING:BOOL=OFF \
-       -DITK_WRAP_PYTHON:BOOL=OFF \
-       -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-       -DCMAKE_BUILD_TYPE:STRING="Release" ../%{tarname}-%{version}/
+%cmake \
+  -DBUILD_EXAMPLES:BOOL=ON \
+  -DBUILD_SHARED_LIBS:BOOL=ON \
+  -DBUILD_TESTING:BOOL=OFF \
+  -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
+  -DUSE_FFTWF=ON \
+  -DITK_USE_FFTWD:BOOL=ON \
+  -DITK_USE_FFTWF:BOOL=ON \
+  -DITK_USE_SYSTEM_FFTW:BOOL=ON \
+  -DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
+  -DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=OFF \
+  -DITK_USE_SYSTEM_DCMTK:BOOL=ON \
+  -DITK_USE_SYSTEM_GDCM:BOOL=OFF \
+  -DITK_USE_SYSTEM_HDF5:BOOL=ON \
+  -DITK_USE_SYSTEM_JPEG:BOOL=ON \
+  -DITK_USE_SYSTEM_PNG:BOOL=ON \
+  -DITK_USE_SYSTEM_TIFF:BOOL=ON \
+  -DITK_USE_SYSTEM_VXL:BOOL=OFF \
+  -DITK_USE_SYSTEM_ZLIB:BOOL=ON \
+  -DITK_USE_SYSTEM_GCCXML:BOOL=OFF \
+  -DITK_USE_SYSTEM_SWIG:BOOL=ON \
+  -DITK_USE_SYSTEM_EXPAT:BOOL=ON \
+  -DModule_ITKDCMTK:BOOL=ON \
+  -DModule_ITKIOPhilipsREC:BOOL=OFF \
+  -DModule_ITKLevelSetsv4Visualization:BOOL=OFF \
+  -DModule_ITKReview:BOOL=OFF \
+  -DModule_ITKVideoBridgeOpenCV:BOOL=OFF \
+  -DModule_ITKVideoBridgeVXL:BOOL=OFF \
+  -DModule_ITKVtkGlue:BOOL=OFF \
+  -DModule_ITKDeprecated:BOOL=OFF \
+  -DITKV3_COMPATIBILITY:BOOL=ON \
+  -DVCL_INCLUDE_CXX_0X:BOOL=ON \
+  -DITK_WRAP_DIMS="2;3;4" \
+  -DITK_WRAP_double:BOOL=ON \
+  -DITK_WRAP_vector_double:BOOL=ON \
+  -DITK_WRAP_covariant_vector_double:BOOL=ON \
+  -DITK_WRAP_complex_double:BOOL=ON \
+  -DITK_WRAPPING:BOOL=OFF \
+  -DITK_WRAP_PYTHON:BOOL=OFF \
+  -DCMAKE_BUILD_TYPE:STRING="Release"

 make VERBOSE=1 %{?_smp_mflags}


 %install
-cd ../temp
-make install DESTDIR=%{buildroot}
+%cmake_install

 %if "%{_lib}" == "lib64"
-mkdir -p %{buildroot}/usr/lib64
-mv %{buildroot}/usr/lib/* %{buildroot}/usr/lib64/
-sed -i 's|/lib/|/lib64/|g' %{buildroot}/usr/lib64/cmake/ITK-4.8/ITKConfig.cmake
-sed -i 's|/lib/|/lib64/|g' %{buildroot}/usr/lib64/cmake/ITK-4.8/ITKTargets.cmake
-sed -i 's|/lib/|/lib64/|g' %{buildroot}/usr/lib64/cmake/ITK-4.8/ITKTargets-release.cmake
+mkdir -p %{buildroot}%{_libdir}
+mv %{buildroot}%{_libexecdir}/* %{buildroot}%{_libdir}/
+sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.8/ITKConfig.cmake
+sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.8/ITKTargets.cmake
+sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.8/ITKTargets-release.cmake
 %endif
-rm -rf %{buildroot}/usr/lib/debug
+rm -rf %{buildroot}%{_libexecdir}/debug

 %fdupes %{buildroot}


-%clean
-rm -rf %{buildroot}
-
 %post -n lib%{name}4 -p /sbin/ldconfig

 %postun -n lib%{name}4 -p /sbin/ldconfig

 %files -n lib%{name}4
 %defattr(644,root,root,755)
-# %dir %{_libdir}/
+%doc LICENSE
 %{_libdir}/*.so.1

-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*