[dcmtk] - General spec cleanup - Move libs into _lib and remove ldd config file - Fixes versioned doc dir as

[mrceresa]

commit eb5ebe1b36ec3015e899dc661f857f8383357df8
Author: Mario Ceresa <mrceresa at gmail.com>
Date:   Tue Aug 6 15:32:54 2013 +0200

    - General spec cleanup
    - Move libs into _lib and remove ldd config file
    - Fixes versioned doc dir as per BZ993719

 dcmtk.spec |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/dcmtk.spec b/dcmtk.spec
index 376fdb1..486e025 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -6,7 +6,6 @@ License: BSD
 Group: Development/Libraries
 Source: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-3.6.0.tar.gz
 URL: http://dicom.offis.de/dcmtk.php.en
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch1: dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch
 Patch2: dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch
@@ -68,7 +67,7 @@ rm -rf dcmjpls/libcharls/
 
 %build
 
-%cmake -DCMAKE_BUILD_TYPE:STRING="Release"\
+%cmake -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo"\
 	-DBUILD_SHARED_LIBS:BOOL=ON \
 	-DDCMTK_WITH_OPENSSL:BOOL=ON\
 	-DDCMTK_WITH_PNG:BOOL=ON\
@@ -85,38 +84,34 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #move libraries from lib64 to lib64/${name}
-mv $RPM_BUILD_ROOT/usr/%{_lib} $RPM_BUILD_ROOT/tmp_lib
-mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}
-mv $RPM_BUILD_ROOT/tmp_lib $RPM_BUILD_ROOT/usr/%{_lib}/%{name}
+#mv $RPM_BUILD_ROOT/usr/%{_lib} $RPM_BUILD_ROOT/tmp_lib
+#mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}
+#mv $RPM_BUILD_ROOT/tmp_lib $RPM_BUILD_ROOT/usr/%{_lib}/%{name}
 
 #Move configuration file from /usr/etc to /etc/
 mv $RPM_BUILD_ROOT/usr/etc $RPM_BUILD_ROOT
 
 #Move doc files from /usr/share/doc to /usr/share/doc/dcmtk-name-version/
-mv $RPM_BUILD_ROOT/usr/share/doc $RPM_BUILD_ROOT/usr/share/%{name}-%{version}
-mkdir $RPM_BUILD_ROOT/usr/share/doc
-mv $RPM_BUILD_ROOT/usr/share/%{name}-%{version} $RPM_BUILD_ROOT/usr/share/doc/
+#mv $RPM_BUILD_ROOT/usr/share/doc $RPM_BUILD_ROOT/usr/share/%{name}
+#mkdir $RPM_BUILD_ROOT/usr/share/doc
+#mv $RPM_BUILD_ROOT/usr/share/%{name}-%{version} $RPM_BUILD_ROOT/usr/share/doc/
 
 # Remove zero-lenght file
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/wlistdb/OFFIS/lockfile
 
 # Install ldd config file
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo %{_libdir}/%{name} > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+#mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+#echo %{_libdir}/%{name} > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
 
 %files
-%defattr(-,root,root)
 %dir %{_sysconfdir}/%{name}/
-%dir %{_libdir}/%{name}/
+#%dir %{_libdir}/%{name}/
 %dir %{_datarootdir}/%{name}
-%dir %{_docdir}/%{name}-%{version}/
-%docdir %{_docdir}/%{name}-%{version}/
-%{_docdir}/%{name}-%{version}/*
+%dir %{_docdir}/%{name}/
+%docdir %{_docdir}/%{name}/
+%{_docdir}/%{name}/*
 %{_bindir}/*
-%{_libdir}/%{name}/*.so.*
+%{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/%{name}/dcmpstat.cfg
 %config(noreplace) %{_sysconfdir}/%{name}/dcmqrscp.cfg
 %config(noreplace) %{_sysconfdir}/%{name}/printers.cfg
@@ -125,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/%{name}/filelog.cfg
 %config(noreplace) %{_sysconfdir}/%{name}/logger.cfg
 #In order to recognize /usr/lib64/dcmtk we need to ship a proper file for /etc/ld.so.conf.d/
-%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
+#%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
 %{_datadir}/%{name}/*
 %{_mandir}/man1/*
 
@@ -133,12 +128,17 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
-%{_libdir}/%{name}/*.so
+%{_libdir}/*.so
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Aug 06 2013 Mario Ceresa <mrceresa AT fedoraproject DOT org> - 3.6.0-16
+- General spec cleanup
+- Move libs into _lib and remove ldd config file
+- Fixes versioned doc dir as per BZ993719
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild