From a70cfa4fabed3210fc792c5f121a788ae17165e7 Mon Sep 17 00:00:00 2001 From: Roy Rankin Date: Aug 15 2013 13:15:52 +0000 Subject: Fix issue caused by change in %doc macro, and create seperate doc sub-package --- diff --git a/gputils.spec b/gputils.spec index 4b9fbf0..79e5f6c 100644 --- a/gputils.spec +++ b/gputils.spec @@ -1,13 +1,13 @@ Name: gputils Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Development utilities for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Outils de développement pour les microcontrôleurs PIC (TM) de Microchip (TM) Group: Development/Languages License: GPLv2+ URL: http://gputils.sourceforge.net -Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: bundled(libiberty) @@ -24,6 +24,12 @@ gpdasm, gpstrip, gpvc, gpvo. Ce paquetage contient une collection d'outils de développement pour les microcontrôleurs PIC (TM) de Microchip (TM). +%package doc +Summary: Gputils documentation +Requires: gputils = %{version}-%{release} +%description doc +This package containes gputils documentation and HTML documentation for supported processors. + %prep %setup -q @@ -35,20 +41,33 @@ autoconf -f -i %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT +mkdir -p %{buildroot}/usr/share/doc/%{name}-doc +mv -f %{buildroot}/usr/share/doc/%{name}-%{version}/html %{buildroot}/usr/share/doc/%{name}-doc/html +cp -f doc/%{name}.p* %{buildroot}/usr/share/doc/%{name}-doc/ + %clean %{__rm} -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%doc doc/%{name}.pdf doc/%{name}.ps +%files +%doc AUTHORS ChangeLog COPYING README TODO +#%doc doc/%{name}.pdf doc/%{name}.ps %{_bindir}/* %{_datadir}/%{name}/ %{_mandir}/man1/* %{_mandir}/fr/man1/* +%files doc +%{_docdir}/%{name}-doc/ + + + %changelog +* Thu Aug 15 2013 Roy Rankin 1.2.0-2 +- Break out documentation into seperate sub-package. +- Fix issue caused by doc macro change. +- Correct Source URL + * Sat Aug 03 2013 Fedora Release Engineering - 1.2.0-1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild