From 9f061b3da84706e34837f5bb459a648f796e7bcb Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Aug 12 2013 08:48:41 +0000
Subject: Install docs to %{_pkgdocdir} where available (#993883).


---

diff --git a/xmlbeans.spec b/xmlbeans.spec
index b968ff5..aabccf5 100644
--- a/xmlbeans.spec
+++ b/xmlbeans.spec
@@ -29,10 +29,11 @@
 #
 
 %bcond_with bootstrap
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           xmlbeans
 Version:        2.6.0
-Release:        5%{?dist}%{?with_bootstrap:.boot}
+Release:        6%{?dist}%{?with_bootstrap:.boot}
 Summary:        XML-Java binding tool
 URL:            http://xmlbeans.apache.org/
 Source0:        http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz
@@ -129,7 +130,7 @@ ln -sf $(build-classpath saxon) external/lib/saxon9.jar
 ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar
 
 # Fix CRLF
-sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css
+sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css docs/guide/tools.html
 
 # Build
 ant -Djavac.source=1.5 -Djavac.target=1.5 default docs
@@ -170,29 +171,33 @@ cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf build/docs/reference
 
 # manual
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-# fix line endings
-cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r > tmp
-mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html
-
+install -d -m 755 $RPM_BUILD_ROOT%{_pkgdocdir}
+cp -pr build/docs/* LICENSE.txt NOTICE.txt README.txt $RPM_BUILD_ROOT%{_pkgdocdir}
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt  README.txt
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/LICENSE.txt
+%doc %{_pkgdocdir}/NOTICE.txt
+%doc %{_pkgdocdir}/README.txt
 
 %files javadoc
-%doc LICENSE.txt NOTICE.txt  README.txt
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/LICENSE.txt
+%doc %{_pkgdocdir}/NOTICE.txt
+%doc %{_pkgdocdir}/README.txt
 %doc %{_javadocdir}/%{name}
 
 %files manual
-%doc LICENSE.txt NOTICE.txt  README.txt
-%{_docdir}/%{name}-%{version}
+%{_pkgdocdir}
 
 %files scripts
 %attr(0755,root,root) %{_bindir}/*
 
 
 %changelog
+* Mon Aug 12 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.6.0-6
+- Install docs to %%{_pkgdocdir} where available (#993883).
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild