[bluefish] Move to unversioned documentation directories

[Paul Howarth]

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

    Move to unversioned documentation directories

 bluefish.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/bluefish.spec b/bluefish.spec
index 06b02ed..3ba1bc4 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,6 +1,6 @@
 %global pkgver 2.2.4
 #global prerel rc1
-%global rpmrel 1
+%global rpmrel 2
 
 Name:		bluefish
 Version:	%{pkgver}
@@ -45,6 +45,10 @@ Requires(postun): /usr/bin/xmlcatalog, xml-common
 %filter_setup
 }
 
+# Move to unversioned documentation directories from F-20
+# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%global bluefish_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+
 %description
 Bluefish is a powerful editor for experienced web designers and programmers.
 Bluefish supports many programming and markup languages, but it focuses on
@@ -77,7 +81,7 @@ sed -i -e 's/\r$//' data/jsmin.py
 		--disable-static \
 		--disable-update-databases \
 		--disable-xml-catalog-update \
-		--docdir=%{_defaultdocdir}/%{name}-%{version}
+		--docdir=%{bluefish_docdir}
 make %{?_smp_mflags}
 
 %install
@@ -105,9 +109,9 @@ desktop-file-validate \
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # Manually install docs so that they go into
-# %%{_defaultdocdir}/%%{name}-%%{version} even though we put them in the
+# %%{bluefish_docdir} even though we put them in the
 # shared-data subpackage
-install -m 644 -p -t %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ \
+install -m 644 -p -t %{buildroot}%{bluefish_docdir}/ \
 	AUTHORS ChangeLog COPYING NEWS README TODO
 
 # Unpackaged files
@@ -140,6 +144,7 @@ fi
 
 %files shared-data -f %{name}.lang
 %defattr(-,root,root,-)
+%doc %{bluefish_docdir}/
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
@@ -150,10 +155,12 @@ fi
 %{_datadir}/pixmaps/application-x-bluefish-project.png
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/xml/%{name}/
-%{_defaultdocdir}/%{name}-%{version}/
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Jul 28 2013 Paul Howarth <paul at city-fan.org> - 2.2.4-2
+- Install docs to %%{_pkgdocdir} where available
+
 * Wed Feb  6 2013 Paul Howarth <paul at city-fan.org> - 2.2.4-1
 - Update to 2.2.4 (mostly a minor bugfix release)
   - Includes various fixes for: