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

Ville Skyttä scop at fedoraproject.org
Fri Dec 13 22:21:16 UTC 2013


commit af71c002822244403c1d0cabedd6a14869f5f84b
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Dec 14 00:21:19 2013 +0200

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

 pikdev.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/pikdev.spec b/pikdev.spec
index 293aa2c..ec96d92 100644
--- a/pikdev.spec
+++ b/pikdev.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		pikdev
 Version:	0.9.2
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	IDE for development of PICmicro based application (under Linux/KDE)
 Summary(fr):	EDI pour le développement d'applications à base de microcontrôleurs PIC
 
@@ -31,8 +33,8 @@ Features:
  - Support for parallel and serial port programmers
  - KDE compliant look-and-feel
 
-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
@@ -48,7 +50,7 @@ Fonctionnalités :
  - Conformité de l'aspect et de la convivialité de KDE
 
 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
@@ -109,6 +111,9 @@ desktop-file-install \
 %{_datadir}/icons/*
 
 %changelog
+* Fri Dec 13 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.9.2-17
+- Fix path to docs in %%description when doc dir is unversioned (#994040).
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list