Attachment 836964 Details for Bug 1001298 – proposed spec changes/fixes

[patch] proposed spec changes/fixes

gdcm.spec.diff (text/plain), 3.54 KB, created by Michael Schwendt on 2013-12-15 14:49:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Schwendt

Created: 2013-12-15 14:49:43 UTC

Size: 3.54 KB

patch

obsolete

>diff --git a/gdcm.spec b/gdcm.spec
>index 1ff0005..e8436e0 100644
>--- a/gdcm.spec
>+++ b/gdcm.spec
>@@ -6,9 +6,9 @@
> 
> Name:		gdcm
> Version:	2.4.1
>-Release:	1%{?dist}
>+Release:	2%{?dist}
> Summary:	Grassroots DiCoM is a C++ library to parse DICOM medical files
>-Group:		Development/Libraries
>+Group:		System Environment/Libraries
> License:	BSD
> URL:		http://gdcm.sourceforge.net/wiki/index.php/Main_Page
> Source0:	http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2
>@@ -62,18 +62,16 @@ Group:         Documentation
> BuildArch:     noarch
> 
> %description doc
>-
> You should install the gdcm-doc package if you would like to
>-access upstream documentation for gdcm
>+access upstream documentation for gdcm.
> 
> 
> %package	devel
> Summary:	Libraries and headers for GDCM
> Group:		Development/Libraries
>-Requires:	%{name} = %{version}-%{release}
>+Requires:	%{name}%{?_isa} = %{version}-%{release}
> 
> %description devel
>-
> You should install the gdcm-devel package if you would like to
> compile applications based on gdcm
> 
>@@ -88,20 +86,18 @@ GDCM examples
> %package	python
> Summary:	Python binding for GDCM
> Group:		Development/Libraries
>-Requires:	%{name} = %{version}-%{release}
>+Requires:	%{name}%{?_isa} = %{version}-%{release}
> 
> %description python
>-
> You should install the gdcm-python package if you would like to
> used this library with python
> 
> %package -n	python3-gdcm
> Summary:	Python binding for GDCM
> Group:		Development/Libraries
>-Requires:	%{name} = %{version}-%{release}
>+Requires:	%{name}%{?_isa} = %{version}-%{release}
> 
> %description -n python3-gdcm
>-
> You should install the python3-gdcm package if you would like to
> used this library with python
> 
>@@ -212,8 +208,6 @@ popd
> make %{?_smp_mflags} -C %{_target_platform}
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>-
> # install python3 build
> pushd %{py3dir}
> make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
>@@ -225,7 +219,11 @@ make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
> ## Rearranging directory layout and removing version from dir
> 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}/
>+
>+# adding to installed docs in order to avoid using %%doc magic
>+for f in AUTHORS Copyright.txt README.Copyright.txt README.txt ; do
>+    cp -p $f ${RPM_BUILD_ROOT}%{_docdir}/%{name}/${f}
>+done
> 
> ## Cleaning Example dir from cmake cache files + remove 0-length files
> find %{_builddir}/%{?buildsubdir}/Examples -depth -name CMakeFiles | xargs rm -rf
>@@ -245,16 +243,18 @@ make test -C %{_target_platform} || exit 0
> 
> 
> %files
>+%dir %{_docdir}/%{name}
>+%{_docdir}/%{name}/Copyright.txt
> %{_mandir}/man1/*.1*
> %{_bindir}/*
> %{_libdir}/*.so.*
>+%dir %{_datadir}/%{name}
> %{_datadir}/%{name}/XML/
> 
> %files doc
> %{_docdir}/%{name}/
> 
> %files devel
>-%dir %{_datadir}/%{name}
> %{_includedir}/%{name}/
> %{_libdir}/*.so
> %{_datadir}/%{name}/*.cmake
>@@ -269,6 +269,14 @@ make test -C %{_target_platform} || exit 0
> %{python3_sitearch}/*
> 
> %changelog
>+* Sun Dec 15 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 2.4.1-2
>+- Include license file and a few doc files in base package
>+- Include directory /usr/share/gdcm in base package
>+- Remove obsolete cleaning of buildroot
>+- Add %%?_isa to base package deps
>+- Remove empty lines at beginning of %%descriptions
>+- Fix base package Group tag to "System Environment/Libraries"
>+
> * Wed Dec 11 2013 Sebastian PÃ¶lsterl <sebp@k-d-w.org> - 2.4.1-1
> - Update to 2.4.1
>

Actions: View | Diff

Attachments on bug 1001298: 836964