[gdcm] Additional fixes for #1001298

sebp sebp at fedoraproject.org
Wed Dec 11 18:36:21 UTC 2013


commit 74a462fbe1192346d63102dbed9fcfe63c900932
Author: Mario Ceresa <mrceresa at gmail.com>
Date:   Wed Dec 11 18:50:33 2013 +0100

    Additional fixes for #1001298

 gdcm.spec |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/gdcm.spec b/gdcm.spec
index 9f434fc..c2125c9 100644
--- a/gdcm.spec
+++ b/gdcm.spec
@@ -6,7 +6,7 @@
 
 Name:		gdcm
 Version:	2.4.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Grassroots DiCoM is a C++ library to parse DICOM medical files
 Group:		Development/Libraries
 License:	BSD
@@ -223,13 +223,17 @@ popd
 make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 ## Rearranging directory layout and removing version from dir
-mv $RPM_BUILD_ROOT%{_libdir}/gdcm/*.cmake $RPM_BUILD_ROOT%{_datadir}/gdcm/
-rmdir $RPM_BUILD_ROOT%{_libdir}/gdcm
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/*.cmake $RPM_BUILD_ROOT%{_datadir}/%{name}/
+rmdir $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp %{_builddir}/%{?buildsubdir}/{AUTHORS,Copyright.txt,README.Copyright.txt,README.txt} $RPM_BUILD_ROOT%{_docdir}/%{name}/
 
 ## 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
 
+## Moving Example dir into _datadir
+cp -r %{_builddir}/%{?buildsubdir}/Examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
+
 %check
 # Making the tests informative only for now. Several failing tests (27/228):
 # 11,40,48,49,107-109,111-114,130-135,146,149,,151-154,157,194,216,219
@@ -241,22 +245,22 @@ make test -C %{_target_platform} || exit 0
 
 
 %files
-%doc %{_mandir}/man1/*.1*
-%doc AUTHORS Copyright.txt README.Copyright.txt README.txt
+%{_mandir}/man1/*.1*
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_datadir}/gdcm/XML/
+%{_datadir}/%{name}/XML/
 
 %files doc
-%{_docdir}/gdcm/html/
+%{_docdir}/%{name}/
 
 %files devel
-%{_includedir}/gdcm/
+%dir %{_datadir}/%{name}
+%{_includedir}/%{name}/
 %{_libdir}/*.so
-%{_datadir}/gdcm/*.cmake
+%{_datadir}/%{name}/*.cmake
 
 %files examples
-%doc Examples
+%{_datadir}/%{name}/Examples/
 
 %files python
 %{python2_sitearch}/*
@@ -265,6 +269,10 @@ make test -C %{_target_platform} || exit 0
 %{python3_sitearch}/*
 
 %changelog
+* Wed Dec 11 2013 Mario Ceresa <mrceresa AT fedoraproject DOT org> - 2.4.0-4
+- Fixes #1001298
+- Minor fixes on the spec
+
 * Tue Nov 19 2013 Sebastian Pölsterl <sebp at k-d-w.org> - 2.4.0-3
 - More duplicate documentation files fixes
 - Move examples to new subpackage


More information about the scm-commits mailing list