use pkgdocdir variable when available (#993727)

This commit is contained in:
Ondřej Vašík 2013-08-06 14:09:26 +02:00
parent f34ba0a7f1
commit ba6014bfce

View File

@ -1,9 +1,10 @@
%define openjadever 1.3.2 %global openjadever 1.3.2
%define version_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}" %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 Name: docbook-dtds
Version: 1.0 Version: 1.0
Release: 60%{?dist} Release: 61%{?dist}
Group: Applications/Text Group: Applications/Text
Summary: SGML and XML document type definitions for DocBook 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+ #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 for i in */*.txt */ChangeLog */README
do do
cp -pr --parents $i $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ cp -pr --parents $i $RPM_BUILD_ROOT%{_pkgdocdir}
done done
%clean %clean
@ -224,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr (0644,root,root,0755) %defattr (0644,root,root,0755)
#in upstream tarballs there is a lot of files with 0755 permissions #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 #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-* /usr/share/sgml/docbook/*ml-dtd-*
%config(noreplace) /etc/sgml/*ml-docbook.cat %config(noreplace) /etc/sgml/*ml-docbook.cat
%ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat %ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat
@ -411,6 +412,9 @@ do
done done
%changelog %changelog
* Tue Aug 06 2013 Ondrej Vasik <ovasik@redhat.com> - 1.0-61
- use pkgdocdir variable when available (#993727)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-60 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-60
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild