From 542fbc4aedfd69cf2bec20f272238110e12279a3 Mon Sep 17 00:00:00 2001
From: Martin Milata <mmilata@redhat.com>
Date: Tue, 13 Aug 2013 11:21:33 +0200
Subject: [PATCH] Unversioned doc directories

Change docs location to conform with
https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
---
 linuxdoc-tools.spec | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/linuxdoc-tools.spec b/linuxdoc-tools.spec
index f2b1f61..4ebb8db 100644
--- a/linuxdoc-tools.spec
+++ b/linuxdoc-tools.spec
@@ -1,10 +1,11 @@
 %{!?tetex:%global tetex 1}
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global _vendorperllibdir %{_datadir}/perl5/vendor_perl
 
 Summary: A text formatting package based on SGML
 Name: linuxdoc-tools
 Version: 0.9.68
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Copyright only
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
@@ -58,17 +59,18 @@ perl -pi -e 's,\$main::prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_vendorperllibdir}
 make install DESTDIR=$RPM_BUILD_ROOT perl5libdir=%{_vendorperllibdir}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+[ $RPM_BUILD_ROOT%{_docdir}/%{name} = $RPM_BUILD_ROOT%{_pkgdocdir} ] \
+           || mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_pkgdocdir}
 perl -pi -e 's,/usr/share/sgml/iso-entities-8879.1986/iso-entities.cat,\$main::prefix/share/sgml/sgml-iso-entities-8879.1986/catalog,' \
            $RPM_BUILD_ROOT%{_vendorperllibdir}/LinuxDocTools.pm
 #Copy license files for parts into docdir
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sgmls-1.1
-cp -p sgmls-1.1/LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sgmls-1.1/LICENSE
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/iso-entities
-cp -p iso-entities/COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/iso-entities/COPYING
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/entity-map
-cp -p entity-map/COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/entity-map/COPYING
-cp -p COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/sgmls-1.1
+cp -p sgmls-1.1/LICENSE $RPM_BUILD_ROOT%{_pkgdocdir}/sgmls-1.1/LICENSE
+mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/iso-entities
+cp -p iso-entities/COPYING $RPM_BUILD_ROOT%{_pkgdocdir}/iso-entities/COPYING
+mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/entity-map
+cp -p entity-map/COPYING $RPM_BUILD_ROOT%{_pkgdocdir}/entity-map/COPYING
+cp -p COPYING $RPM_BUILD_ROOT%{_pkgdocdir}/
 
 
 # Some files need moving around.
@@ -91,7 +93,7 @@ exit 0
 
 %files
 %defattr (-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}
+%doc %{_pkgdocdir}
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/entity-map
@@ -104,6 +106,10 @@ exit 0
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug 13 2013 Martin Milata <mmilata@redhat.com> - 0.9.68-6
+- Change docs location to conform with
+  https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.68-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild