From e9e185551f9fb7b131c75bac68dde3b599c1af73 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Sun, 15 Sep 2013 21:08:04 +0530 Subject: [PATCH] Fix powerpc-utils doc dir Update spec file to install package specific documentation to an unversioned subdir under /usr/share/doc. Signed-off-by: Mark Hamzy Signed-off-by: Vasant Hegde --- powerpc-utils.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/powerpc-utils.spec b/powerpc-utils.spec index 8c6062e..a9113cb 100644 --- a/powerpc-utils.spec +++ b/powerpc-utils.spec @@ -1,6 +1,6 @@ Name: powerpc-utils Version: 1.2.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities for PowerPC platforms Group: System Environment/Base @@ -48,10 +48,12 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT FILES= RCSCRIPTS= install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/nvsetenv -%define pkgdocdir %{_datadir}/doc/%{name}-%{version} +#%define pkgdocdir %{_datadir}/doc/%{name}-%{version} +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + # move doc files -mkdir -p $RPM_BUILD_ROOT%{pkgdocdir} -install $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils/* -t $RPM_BUILD_ROOT%{pkgdocdir} +mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir} +install $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils/* -t $RPM_BUILD_ROOT%{_pkgdocdir} rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils # remove init script and perl script. They are deprecated @@ -125,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog +* Sun Sep 15 2013 Vasant Hegde - 1.2.17-2 +- Fix docdir (#998579) + * Tue Aug 20 2013 Vasant Hegde - 1.2.17 - Update to latest upstream 1.2.17