[piklab] Fix path to docs in %description when doc dir is unversioned (#994041).

Ville Skyttä scop at fedoraproject.org
Fri Dec 13 22:24:59 UTC 2013


commit 7d4255c604c64153f129238de8ff11a3405364c6
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Dec 14 00:25:02 2013 +0200

    Fix path to docs in %description when doc dir is unversioned (#994041).

 piklab.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/piklab.spec b/piklab.spec
index bb11e4c..3e75475 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -1,8 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %define unstable 1
 
 Name:       piklab
 Version:    0.16.1
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
 
@@ -54,8 +55,8 @@ Piklab is a graphic development environment for PIC and dsPIC microcontrollers.
 It interfaces with various toolchains for compiling and assembling and it
 supports several Microchip and direct programmers.
 
-WARNING: Administrator have to see the README.Fedora file locate
-in the %{_docdir}/%{name}-%{version} directory
+WARNING: Administrator have to see the README.Fedora file located
+in the %{_pkgdocdir} directory
 to complete full feature installation.
 
 %description -l fr
@@ -65,7 +66,7 @@ pour la compilation et l'assemblage et gère plusieurs programmateurs y compris
 ceux de Microchip.
 
 ATTENTION : l'installateur du paquetage doit lire le fichier LISEZMOI.Fedora,
-situé dans le répertoire %{_docdir}/%{name}-%{version}, afin de voir
+situé dans le répertoire %{_pkgdocdir}, afin de voir
 comment finir l'installation.
 
 %prep
@@ -177,6 +178,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_udevrulesdir}/26-microchip.rules
 
 %changelog
+* Fri Dec 13 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-7
+- Fix path to docs in %%description when doc dir is unversioned (#994041).
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list