[docbook-dtds] workaround incompatible change in rpm (causing FTBFS)

Ondrej Vasik ovasik at fedoraproject.org
Thu Feb 21 13:40:03 UTC 2013


commit 4189b7bd0f0ba3769f11393d4f004d2803ec3506
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Thu Feb 21 14:39:58 2013 +0100

    workaround incompatible change in rpm (causing FTBFS)

 docbook-dtds.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/docbook-dtds.spec b/docbook-dtds.spec
index 7212068..8388c12 100644
--- a/docbook-dtds.spec
+++ b/docbook-dtds.spec
@@ -3,7 +3,7 @@
 
 Name: docbook-dtds
 Version: 1.0
-Release: 58%{?dist}
+Release: 59%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -209,6 +209,13 @@ do
 done
 
 
+#workaround the missing support for --parents hack in rpm 4.11+
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+for i in */*.txt */ChangeLog */README
+do
+  cp -pr --parents $i $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -217,7 +224,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
-%doc --parents 3.1-sgml/ChangeLog 4.1-sgml/ChangeLog */*.txt
+%{_docdir}/%{name}-%{version}
 /usr/share/sgml/docbook/*ml-dtd-*
 %config(noreplace) /etc/sgml/*ml-docbook.cat
 %ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat
@@ -404,6 +411,9 @@ do
 done
 
 %changelog
+* Thu Feb 21 2013 Ondrej Vasik <ovasik at redhat.com> - 1.0-59
+- workaround incompatible change in rpm (causing FTBFS)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-58
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list