Add missing docbook_4 dependency and fix path to xmlcatalog in spec to fix package...

Change-id: I3ff16b83138bc7d70987e304d9c4589aef12f3a4

diff --git a/packaging/sgml-common.changes b/packaging/sgml-common.changes
index 617a17f..40de422 100644 (file)
--- a/packaging/sgml-common.changes
+++ b/packaging/sgml-common.changes
@@ -1,3 +1,6 @@
+* Fri Jun 21 02:52:06 UTC 2013 - tracy.graydon@intel.com
+- Add missing docbook_4 dependency and fix path to xmlcatalog files in spec to fix package build 
+
 * Tue Jun 12 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> - 0.6.3
 - Initial package import, required for building systemd man pages.
 

diff --git a/packaging/sgml-common.spec b/packaging/sgml-common.spec
index 4b904b4..8295a12 100644 (file)
--- a/packaging/sgml-common.spec
+++ b/packaging/sgml-common.spec
@@ -19,7 +19,8 @@ Patch0:    sgml-common-umask.patch
 Patch1:    sgml-common-xmldir.patch
 BuildArch: noarch
 BuildRequires: libxml2 >= 2.4.8-2
-BuildRequires: automake >= 1.11
+BuildRequires: automake >= 1.12
+BuildRequires: config(docbook_4)
 
 %description
 The sgml-common package contains a collection of entities and DTDs
@@ -47,7 +48,7 @@ but that don't need to be included in main package.
 # replace bogus links with files
 for file in COPYING INSTALL install-sh missing mkinstalldirs; do 
    rm $file
-   cp -p %{_datadir}/automake-1.11/$file .
+   cp -p %{_datadir}/automake-1.12/$file .
 done
 
 %build
@@ -62,28 +63,28 @@ XMLCATALOG=%{buildroot}%{_sysconfdir}/xml/catalog
 %{_bindir}/xmlcatalog --noout --create $XMLCATALOG
 # Now put the common DocBook entries in it
 %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
-       "-//OASIS//ENTITIES DocBook XML" \
-       "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
-       "-//OASIS//DTD DocBook XML" \
-       "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+    "-//OASIS//DTD DocBook XML" \
+    "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
-       "ISO 8879:1986" \
-       "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+    "ISO 8879:1986" \
+    "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 %{_bindir}/xmlcatalog --noout --add "delegateSystem" \
-       "http://www.oasis-open.org/docbook/" \
-       "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+    "http://www.oasis-open.org/docbook/" \
+    "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 %{_bindir}/xmlcatalog --noout --add "delegateURI" \
-       "http://www.oasis-open.org/docbook/" \
-       "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+    "http://www.oasis-open.org/docbook/" \
+    "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 # Also create the common DocBook catalog
 %{_bindir}/xmlcatalog --noout --create \
-       %{buildroot}%{_datadir}/sgml/docbook/xmlcatalog
+    %{buildroot}%{_datadir}/sgml/docbook/xmlcatalog
 
 rm -f %{buildroot}%{_datadir}/sgml/xml.dcl
 
 install -p -m0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
-       %{buildroot}%{_datadir}/sgml
+    %{buildroot}%{_datadir}/sgml
 
 rm -rf %{buildroot}%{_datadir}/xml/*
 rm -f %{buildroot}%{_datadir}/doc/*.html