Renumbered patches. Dropped cmake version

This commit is contained in:
Mario Ceresa 2013-05-01 10:59:09 +02:00
parent d9bdd313e8
commit e71ceb116c
1 changed files with 9 additions and 12 deletions

View File

@ -16,18 +16,17 @@ Source0: http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20%{version}
# There is a bug in doxygen preventing compilation on:
ExcludeArch: ppc ppc64
Patch1: gdcm-2.0.14-inplacebuild.patch
Patch1: gdcm-2.0.14-inplacebuild.patch
Patch2: gdcm-2.0.14-usecopyright.patch
#Patch3: gdcm-2.0.18-charls.patch
Patch6: gdcm-2.0.17-install2libarch.patch
Patch10: gdcm-2.0.17-no_versioned_dir.patch
Patch3: gdcm-2.0.17-install2libarch.patch
Patch4: gdcm-2.0.17-no_versioned_dir.patch
BuildRequires: CharLS-devel >= 1.0
BuildRequires: cmake >= 2.6.0
BuildRequires: cmake
BuildRequires: doxygen-latex
BuildRequires: expat-devel
BuildRequires: fontconfig-devel
BuildRequires: graphviz
#BuildRequires: graphviz
BuildRequires: gl2ps-devel
BuildRequires: libogg-devel
BuildRequires: libtheora-devel
@ -37,8 +36,8 @@ BuildRequires: mysql-libs
BuildRequires: mysql-devel
BuildRequires: openssl-devel
BuildRequires: openjpeg-devel
BuildRequires: /usr/bin/pdflatex
BuildRequires: poppler-devel
#BuildRequires: /usr/bin/pdflatex
#BuildRequires: poppler-devel
BuildRequires: python2-devel
BuildRequires: postgresql-devel
BuildRequires: swig
@ -90,9 +89,8 @@ used this library with python
%setup -q
%patch1
%patch2
#%patch3 -p 1 -b .charls
%patch6 -p 1
%patch10 -p 1
%patch3 -p 1
%patch4 -p 1
# Remove bundled utilities (we use Fedora's ones)
@ -112,7 +110,6 @@ rm -rf Utilities/wxWidgets
%build
%cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_SKIP_RPATH:BOOL=YES \
-DGDCM_BUILD_TESTING=OFF \
-DGDCM_BUILD_EXAMPLES:BOOL=ON \
-DGDCM_DOCUMENTATION:BOOL=ON \