[gtkwave] Move to unversioned documentation directories

Paul Howarth pghmcfc at fedoraproject.org
Sun Jul 28 10:31:36 UTC 2013


commit 9af43dfc62e83591bf19a9fc76d874eb94b07689
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Jul 28 11:30:41 2013 +0100

    Move to unversioned documentation directories

 gtkwave.spec |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/gtkwave.spec b/gtkwave.spec
index 0fea43f..963da1a 100644
--- a/gtkwave.spec
+++ b/gtkwave.spec
@@ -6,7 +6,7 @@
 Summary:	Waveform Viewer
 Name:		gtkwave
 Version:	3.3.47
-Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
+Release:	%{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
@@ -28,6 +28,10 @@ Requires(post): desktop-file-utils, shared-mime-info
 Requires(postun): desktop-file-utils, shared-mime-info
 %endif
 
+# Move to unversioned documentation directories from F-20
+# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%global gtkwave_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+
 %description
 GTKWave is a waveform viewer that can view VCD files produced by most Verilog
 simulation tools, as well as LXT files produced by certain Verilog simulation
@@ -47,7 +51,7 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install \
 	DESTDIR=%{buildroot} \
-	pkgdatadir=%{_docdir}/gtkwave-%{version} \
+	pkgdatadir=%{gtkwave_docdir} \
 	INSTALL="install -p"
 
 # Icons and desktop entry
@@ -65,7 +69,7 @@ for extradoc in \
 	MIT.TXT \
 	SYSTEMVERILOG_README.TXT
 do
-	install -p -m 644 ${extradoc} %{buildroot}%{_docdir}/gtkwave-%{version}/
+	install -p -m 644 ${extradoc} %{buildroot}%{gtkwave_docdir}/
 done
 
 %clean
@@ -97,7 +101,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/gtkwave-%{version}/
+%doc %{gtkwave_docdir}/
 %{_bindir}/evcd2vcd
 %{_bindir}/fst2vcd
 %{_bindir}/fstminer
@@ -189,6 +193,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Sun Jul 28 2013 Paul Howarth <paul at city-fan.org> 3.3.47-2
+- install docs to %%{_pkgdocdir} where available
+
 * Wed Jun 12 2013 Paul Howarth <paul at city-fan.org> 3.3.47-1
 - update to 3.3.47
   - deprecated loader


More information about the scm-commits mailing list