From 89330c9c081f80e58ec5650810badf829fc92537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20P=C3=B6lsterl?= Date: Tue, 19 Nov 2013 22:42:40 +0100 Subject: [PATCH] More duplicate documentation files fixes Examples have been moved to new subpackage --- gdcm.spec | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/gdcm.spec b/gdcm.spec index 96b2b3a..9f434fc 100644 --- a/gdcm.spec +++ b/gdcm.spec @@ -6,7 +6,7 @@ Name: gdcm Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files Group: Development/Libraries License: BSD @@ -77,6 +77,14 @@ Requires: %{name} = %{version}-%{release} You should install the gdcm-devel package if you would like to compile applications based on gdcm +%package examples +Summary: CSharp, C++, Java, PHP and Python example programs for GDCM +Group: Development/Languages +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description examples +GDCM examples + %package python Summary: Python binding for GDCM Group: Development/Libraries @@ -139,10 +147,10 @@ pushd %{_target_platform} %cmake .. \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DGDCM_BUILD_TESTING=ON \ + -DGDCM_BUILD_TESTING=OFF \ -DGDCM_DATA_ROOT=../gdcmData/ \ - -DGDCM_BUILD_EXAMPLES:BOOL=ON \ - -DGDCM_DOCUMENTATION:BOOL=ON \ + -DGDCM_BUILD_EXAMPLES:BOOL=OFF \ + -DGDCM_DOCUMENTATION:BOOL=OFF \ -DGDCM_PDF_DOCUMENTATION:BOOL=OFF \ -DGDCM_WRAP_PYTHON:BOOL=ON \ -DPYTHON_EXECUTABLE=%{__python3} \ @@ -195,7 +203,7 @@ pushd %{_target_platform} -DGDCM_USE_JPEGLS=ON \ -DGDCM_USE_SYSTEM_POPPLER=OFF -#Cannot build wrap_java: +#Cannot build wrap_java: # -DGDCM_VTK_JAVA_JAR:PATH=/usr/share/java/vtk.jar no found! # yum provides */vtk.jar -> No results found @@ -204,12 +212,12 @@ popd make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT # install python3 build pushd %{py3dir} make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} -install -d %{buildroot}%{python3_sitearch} +install -d $RPM_BUILD_ROOT%{python3_sitearch} popd make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} @@ -218,7 +226,7 @@ make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} mv $RPM_BUILD_ROOT%{_libdir}/gdcm/*.cmake $RPM_BUILD_ROOT%{_datadir}/gdcm/ rmdir $RPM_BUILD_ROOT%{_libdir}/gdcm -## Cleaning Example dir from cmake cache files + remove 0-lenght files +## Cleaning Example dir from cmake cache files + remove 0-length files find %{_builddir}/%{?buildsubdir}/Examples -depth -name CMakeFiles | xargs rm -rf find %{_builddir}/%{?buildsubdir}/Examples -depth -size 0 | xargs rm -rf @@ -235,22 +243,21 @@ make test -C %{_target_platform} || exit 0 %files %doc %{_mandir}/man1/*.1* %doc AUTHORS Copyright.txt README.Copyright.txt README.txt -%dir %{_datadir}/gdcm/ %{_bindir}/* %{_libdir}/*.so.* -%{_datadir}/gdcm/XML +%{_datadir}/gdcm/XML/ %files doc -%dir %{_docdir}/%{name}/html -%{_docdir}/%{name}/html/* +%{_docdir}/gdcm/html/ %files devel -%dir %{_includedir}/gdcm/ -%doc Examples -%{_includedir}/gdcm/* +%{_includedir}/gdcm/ %{_libdir}/*.so %{_datadir}/gdcm/*.cmake +%files examples +%doc Examples + %files python %{python2_sitearch}/* @@ -258,6 +265,10 @@ make test -C %{_target_platform} || exit 0 %{python3_sitearch}/* %changelog +* Tue Nov 19 2013 Sebastian Pölsterl - 2.4.0-3 +- More duplicate documentation files fixes +- Move examples to new subpackage + * Tue Nov 19 2013 Sebastian Pölsterl - 2.4.0-2 - Fixed duplicate documentation files: https://bugzilla.redhat.com/show_bug.cgi?id=1001298