[gspiceui] Fix path to manual when doc dir is unversioned (#993809).

Ville Skyttä scop at fedoraproject.org
Fri Dec 6 20:49:15 UTC 2013


commit 20f9df86a82362a629ac7ab48edc76f49c5b662e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Dec 6 22:49:12 2013 +0200

    Fix path to manual when doc dir is unversioned (#993809).
    
    - Fix bogus date in %changelog.

 gspiceui.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/gspiceui.spec b/gspiceui.spec
index d2dd2f0..e4d12f8 100644
--- a/gspiceui.spec
+++ b/gspiceui.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:          gspiceui
 Version:       0.9.98
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       A frontend to Spice circuit similators
 
 Group:         Applications/Engineering
@@ -38,7 +40,8 @@ sed -i 's/\r//' lib/*/*.mod
 chmod 0644 lib/*/*.mod
 chmod 0644 sch/*/*.sch
 
-sed -i "s|/share/gspiceui/html/gSpiceUI.html|/share/doc/%{name}-%{version}/gSpiceUI.html|g" src/main/HelpTasks.cpp
+reldocdir=$(echo %{_pkgdocdir} | sed -e 's|^%{_prefix}||')
+sed -i "s|/share/gspiceui/html/gSpiceUI\.html|$reldocdir/gSpiceUI.html|g" src/main/HelpTasks.cpp
 
 sed -i "s|/usr/X11R6/include|/usr/include/X11/|" src/Makefile
 
@@ -130,6 +133,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Dec  6 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.9.98-11
+- Fix path to manual when doc dir is unversioned (#993809).
+- Fix bogus date in %%changelog.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.98-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -193,7 +200,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Updated Release.
 - Built against WxGTK-2.6 libs.
 
-* Tue Jul 04 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.8.90-2
+* Wed Jul 04 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.8.90-2
 - Enabled the fix that make it honor RPM_OPT_FLAGS.
 
 * Wed Jul 04 2007 Xavier Lamien < lnxtnow[at]gmail.com > - 0.8.90-1


More information about the scm-commits mailing list