[gdcm] Rebuild for cmake Clean up spec to match current guidelines

Rahul Sundaram sundaram at fedoraproject.org
Mon Jul 25 19:30:39 UTC 2011


commit c398420bdf75d419dda9c04f20df1a83d5544c85
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Tue Jul 26 00:56:26 2011 +0530

    Rebuild for cmake
    Clean up spec to match current guidelines

 gdcm.spec |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/gdcm.spec b/gdcm.spec
index 19b3ccb..184a9c1 100644
--- a/gdcm.spec
+++ b/gdcm.spec
@@ -4,14 +4,9 @@
 %filter_setup
 }
 
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-
 Name:		gdcm
 Version:	2.0.17
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Grassroots DiCoM is a C++ library to parse DICOM medical files
 Group:		Development/Libraries
 License:	BSD
@@ -19,7 +14,6 @@ URL:		http://sourceforge.net/apps/mediawiki/gdcm/index.php?title=Main_Page
 Source0:	http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%202.0.17/gdcm-2.0.17.tar.bz2
 #Source1:	http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.bz2
 Source2:	FindCharLS.cmake
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # There is a bug in doxygen preventing compilation on:
 ExcludeArch:	ppc ppc64
 
@@ -86,8 +80,6 @@ Requires:	%{name} = %{version}-%{release}
 You should install the gdcm-python package if you would like to
 used this library with python
 
-
-
 %prep
 %setup -q
 %patch1
@@ -149,7 +141,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{python_sitelib}/
@@ -166,11 +157,7 @@ rmdir $RPM_BUILD_ROOT%{_libdir}/gdcm
 find %{_builddir}/%{?buildsubdir}/Examples -depth -name CMakeFiles | xargs rm -rf
 find %{_builddir}/%{?buildsubdir}/Examples -depth -size 0 | xargs rm -rf
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc %{_mandir}/man1/*.1*
 %doc AUTHORS Copyright.txt README.Copyright.txt README.txt
 %dir %{_datadir}/gdcm/
@@ -187,7 +174,6 @@ ctest .
 %postun -p /sbin/ldconfig
 
 %files devel
-%defattr(-,root,root)
 %dir %{_includedir}/gdcm/
 %doc Examples
 %{_includedir}/gdcm/*
@@ -195,10 +181,13 @@ ctest .
 %{_datadir}/gdcm/*.cmake
 
 %files python
-%defattr(-,root,root,-)
 %{python_sitelib}/*
 
 %changelog
+* Mon Jul 25 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 2.0.17-5
+- Rebuild for cmake
+- Clean up spec to match current guidelines
+
 * Fri Jul 15 2011 Marek Kasik <mkasik at redhat.com> - 2.0.17-4
 - Rebuild (poppler-0.17.0)
 


More information about the scm-commits mailing list