diff --git a/docbook-dtds.spec b/docbook-dtds.spec index 1c59238..74bd38c 100644 --- a/docbook-dtds.spec +++ b/docbook-dtds.spec @@ -1,9 +1,10 @@ -%define openjadever 1.3.2 -%define version_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}" +%global openjadever 1.3.2 +%global version_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}" +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: docbook-dtds Version: 1.0 -Release: 60%{?dist} +Release: 61%{?dist} Group: Applications/Text Summary: SGML and XML document type definitions for DocBook @@ -210,10 +211,10 @@ done #workaround the missing support for --parents hack in rpm 4.11+ -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ +mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir} for i in */*.txt */ChangeLog */README do - cp -pr --parents $i $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ + cp -pr --parents $i $RPM_BUILD_ROOT%{_pkgdocdir} done %clean @@ -224,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT %defattr (0644,root,root,0755) #in upstream tarballs there is a lot of files with 0755 permissions #but they don't need to be, 0644 is enough for every file in tarball -%{_docdir}/%{name}-%{version} +%{_pkgdocdir} /usr/share/sgml/docbook/*ml-dtd-* %config(noreplace) /etc/sgml/*ml-docbook.cat %ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat @@ -411,6 +412,9 @@ do done %changelog +* Tue Aug 06 2013 Ondrej Vasik - 1.0-61 +- use pkgdocdir variable when available (#993727) + * Sat Aug 03 2013 Fedora Release Engineering - 1.0-60 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild