Update to 2.6.1
- Remove obsolete patch to allow inplace build - Drop dependency on PostgreSQL and MySQL
This commit is contained in:
parent
862d2ce942
commit
a0686159c8
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@
|
|||||||
/gdcm-2.4.3.tar.bz2
|
/gdcm-2.4.3.tar.bz2
|
||||||
/gdcm-2.4.4.tar.bz2
|
/gdcm-2.4.4.tar.bz2
|
||||||
/gdcm-2.4.5.tar.bz2
|
/gdcm-2.4.5.tar.bz2
|
||||||
|
/gdcm-2.6.1.tar.bz2
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
--- gdcm-2.4.5.orig/CMakeLists.txt 2015-08-22 16:09:50.000000000 +0200
|
|
||||||
+++ gdcm-2.4.5/CMakeLists.txt 2015-08-29 15:19:12.908123494 +0200
|
|
||||||
@@ -30,17 +30,6 @@
|
|
||||||
# VTK source tree for "DELAYLOAD"
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
-if(NOT DEFINED GDCM_ALLOW_INSOURCE_BUILD)
|
|
||||||
- # Disallow insource build since I never test that
|
|
||||||
- string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${GDCM_BINARY_DIR}" INSOURCE)
|
|
||||||
- get_filename_component(PARENTDIR ${GDCM_BINARY_DIR} PATH)
|
|
||||||
- string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR)
|
|
||||||
- if(INSOURCE OR INSOURCESUBDIR)
|
|
||||||
- message(FATAL_ERROR "GDCM requires an out of source Build. "
|
|
||||||
- "Please create a separate binary directory and run CMake there. "
|
|
||||||
- "Or explicitly define GDCM_ALLOW_INSOURCE_BUILD")
|
|
||||||
- endif()
|
|
||||||
-endif()
|
|
||||||
#----------------------------------------------------------------------------
|
|
||||||
set(GDCM_MAJOR_VERSION 2)
|
|
||||||
set(GDCM_MINOR_VERSION 4)
|
|
73
gdcm.spec
73
gdcm.spec
@ -5,7 +5,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
Name: gdcm
|
Name: gdcm
|
||||||
Version: 2.4.5
|
Version: 2.6.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files
|
Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -14,13 +14,12 @@ URL: http://gdcm.sourceforge.net/wiki/index.php/Main_Page
|
|||||||
Source0: http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2
|
Source0: http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2
|
||||||
Source1: http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.gz
|
Source1: http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.gz
|
||||||
|
|
||||||
Patch1: gdcm-2.4.5-inplace-build.patch
|
Patch1: gdcm-2.4.0-usecopyright.patch
|
||||||
Patch2: gdcm-2.4.0-usecopyright.patch
|
Patch2: gdcm-2.4.0-install2libarch.patch
|
||||||
Patch3: gdcm-2.4.0-install2libarch.patch
|
Patch3: gdcm-2.4.0-no-versioned-dir.patch
|
||||||
Patch4: gdcm-2.4.0-no-versioned-dir.patch
|
|
||||||
# From http://public.kitware.com/pipermail/vtkusers/2013-February/127377.html
|
# From http://public.kitware.com/pipermail/vtkusers/2013-February/127377.html
|
||||||
Patch5: gdcm-0005-support-vtk6.patch
|
#Patch4: gdcm-0005-support-vtk6.patch
|
||||||
Patch6: gdcm-2.4.0-find-python27.patch
|
Patch5: gdcm-2.4.0-find-python27.patch
|
||||||
|
|
||||||
BuildRequires: CharLS-devel >= 1.0
|
BuildRequires: CharLS-devel >= 1.0
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
@ -33,15 +32,12 @@ BuildRequires: libogg-devel
|
|||||||
BuildRequires: libtheora-devel
|
BuildRequires: libtheora-devel
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
BuildRequires: mesa-libOSMesa-devel
|
BuildRequires: mesa-libOSMesa-devel
|
||||||
BuildRequires: mysql-libs
|
|
||||||
BuildRequires: mysql-devel
|
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: openjpeg-devel
|
BuildRequires: openjpeg-devel
|
||||||
#BuildRequires: /usr/bin/pdflatex
|
#BuildRequires: /usr/bin/pdflatex
|
||||||
#BuildRequires: poppler-devel
|
#BuildRequires: poppler-devel
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: postgresql-devel
|
|
||||||
BuildRequires: swig
|
BuildRequires: swig
|
||||||
#BuildRequires: texlive-ec
|
#BuildRequires: texlive-ec
|
||||||
#BuildRequires: vtk-devel
|
#BuildRequires: vtk-devel
|
||||||
@ -107,13 +103,13 @@ used this library with python
|
|||||||
%patch1 -p 1
|
%patch1 -p 1
|
||||||
%patch2 -p 1
|
%patch2 -p 1
|
||||||
%patch3 -p 1
|
%patch3 -p 1
|
||||||
%patch4 -p 1
|
#%patch4 -p 1
|
||||||
%patch5 -p 1
|
|
||||||
|
|
||||||
# Remove bundled utilities (we use Fedora's ones)
|
# Remove bundled utilities (we use Fedora's ones)
|
||||||
|
|
||||||
rm -rf Utilities/gdcmexpat
|
rm -rf Utilities/gdcmexpat
|
||||||
rm -rf Utilities/gdcmopenjpeg
|
rm -rf Utilities/gdcmopenjpeg-v1
|
||||||
|
rm -rf Utilities/gdcmopenjpeg-v2
|
||||||
rm -rf Utilities/gdcmzlib
|
rm -rf Utilities/gdcmzlib
|
||||||
rm -rf Utilities/gdcmuuid
|
rm -rf Utilities/gdcmuuid
|
||||||
rm -rf Utilities/gdcmcharls
|
rm -rf Utilities/gdcmcharls
|
||||||
@ -132,7 +128,7 @@ rm -rf %{py3dir}
|
|||||||
cp -a . %{py3dir}
|
cp -a . %{py3dir}
|
||||||
|
|
||||||
# apply patch after copying files for python3 build
|
# apply patch after copying files for python3 build
|
||||||
%patch6 -p 1
|
%patch5 -p 1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# build python3 build
|
# build python3 build
|
||||||
@ -151,20 +147,22 @@ pushd %{_target_platform}
|
|||||||
-DGDCM_WRAP_PYTHON:BOOL=ON \
|
-DGDCM_WRAP_PYTHON:BOOL=ON \
|
||||||
-DPYTHON_EXECUTABLE=%{__python3} \
|
-DPYTHON_EXECUTABLE=%{__python3} \
|
||||||
-DGDCM_INSTALL_PYTHONMODULE_DIR=%{python3_sitearch} \
|
-DGDCM_INSTALL_PYTHONMODULE_DIR=%{python3_sitearch} \
|
||||||
-DGDCM_WRAP_JAVA=OFF \
|
-DGDCM_WRAP_JAVA:BOOL=OFF \
|
||||||
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
|
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
|
||||||
-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
|
-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
|
||||||
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
|
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
|
||||||
-DGDCM_USE_VTK:BOOL=OFF \
|
-DGDCM_USE_VTK:BOOL=OFF \
|
||||||
-DGDCM_USE_SYSTEM_CHARLS=ON \
|
-DGDCM_USE_SYSTEM_CHARLS:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_EXPAT=ON \
|
-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_OPENJPEG=ON \
|
-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_ZLIB=ON \
|
-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_UUID=ON \
|
-DGDCM_USE_SYSTEM_UUID:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_LJPEG=OFF \
|
-DGDCM_USE_SYSTEM_LJPEG:BOOL=OFF \
|
||||||
-DGDCM_USE_SYSTEM_OPENSSL=ON \
|
-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
|
||||||
-DGDCM_USE_JPEGLS=ON \
|
-DGDCM_USE_JPEGLS:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_POPPLER=OFF
|
-DGDCM_USE_SYSTEM_LIBXML2:BOOL=OFF \
|
||||||
|
-DGDCM_USE_SYSTEM_JSON:BOOL=OFF \
|
||||||
|
-DGDCM_USE_SYSTEM_POPPLER:BOOL=OFF
|
||||||
popd
|
popd
|
||||||
|
|
||||||
make %{?_smp_mflags} -C %{_target_platform}
|
make %{?_smp_mflags} -C %{_target_platform}
|
||||||
@ -184,20 +182,22 @@ pushd %{_target_platform}
|
|||||||
-DGDCM_WRAP_PYTHON:BOOL=ON \
|
-DGDCM_WRAP_PYTHON:BOOL=ON \
|
||||||
-DPYTHON_EXECUTABLE=%{__python2} \
|
-DPYTHON_EXECUTABLE=%{__python2} \
|
||||||
-DGDCM_INSTALL_PYTHONMODULE_DIR=%{python2_sitearch} \
|
-DGDCM_INSTALL_PYTHONMODULE_DIR=%{python2_sitearch} \
|
||||||
-DGDCM_WRAP_JAVA=OFF \
|
-DGDCM_WRAP_JAVA:BOOL=OFF \
|
||||||
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
|
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
|
||||||
-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
|
-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
|
||||||
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
|
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
|
||||||
-DGDCM_USE_VTK:BOOL=OFF \
|
-DGDCM_USE_VTK:BOOL=OFF \
|
||||||
-DGDCM_USE_SYSTEM_CHARLS=ON \
|
-DGDCM_USE_SYSTEM_CHARLS:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_EXPAT=ON \
|
-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_OPENJPEG=ON \
|
-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_ZLIB=ON \
|
-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_UUID=ON \
|
-DGDCM_USE_SYSTEM_UUID:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_LJPEG=OFF \
|
-DGDCM_USE_SYSTEM_LJPEG:BOOL=OFF \
|
||||||
-DGDCM_USE_SYSTEM_OPENSSL=ON \
|
-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
|
||||||
-DGDCM_USE_JPEGLS=ON \
|
-DGDCM_USE_JPEGLS:BOOL=ON \
|
||||||
-DGDCM_USE_SYSTEM_POPPLER=OFF
|
-DGDCM_USE_SYSTEM_LIBXML2:BOOL=OFF \
|
||||||
|
-DGDCM_USE_SYSTEM_JSON:BOOL=OFF \
|
||||||
|
-DGDCM_USE_SYSTEM_POPPLER:BOOL=OFF
|
||||||
|
|
||||||
#Cannot build wrap_java:
|
#Cannot build wrap_java:
|
||||||
# -DGDCM_VTK_JAVA_JAR:PATH=/usr/share/java/vtk.jar no found!
|
# -DGDCM_VTK_JAVA_JAR:PATH=/usr/share/java/vtk.jar no found!
|
||||||
@ -264,6 +264,11 @@ make test -C %{_target_platform} || exit 0
|
|||||||
%{python3_sitearch}/*
|
%{python3_sitearch}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Oct 31 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 2.6.1-1
|
||||||
|
- Update to 2.6.1
|
||||||
|
- Remove obsolete patch to allow inplace build
|
||||||
|
- Drop dependency on PostgreSQL and MySQL
|
||||||
|
|
||||||
* Sat Aug 29 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 2.4.5-1
|
* Sat Aug 29 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 2.4.5-1
|
||||||
- Update to 2.4.5
|
- Update to 2.4.5
|
||||||
- Update patch to allow inplace build
|
- Update patch to allow inplace build
|
||||||
|
Loading…
Reference in New Issue
Block a user