[openlmi-providers] fixed build of documentation

Michal Minar miminar at fedoraproject.org
Wed Aug 28 08:48:43 UTC 2013


commit b35e55dd2f9209132502c4936e278463e18ea49e
Author: Michal Minar <miminar at redhat.com>
Date:   Wed Aug 28 10:47:44 2013 +0200

    fixed build of documentation

 openlmi-doc-class2rst.patch |   14 ++++++++++++++
 openlmi-providers.spec      |    9 +++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/openlmi-doc-class2rst.patch b/openlmi-doc-class2rst.patch
new file mode 100644
index 0000000..04bab1e
--- /dev/null
+++ b/openlmi-doc-class2rst.patch
@@ -0,0 +1,14 @@
+diff --git a/src/account/doc/source/mof/Makefile b/src/account/doc/source/mof/Makefile
+index f68864d..e1dd720 100644
+--- a/src/account/doc/source/mof/Makefile
++++ b/src/account/doc/source/mof/Makefile
+@@ -7,4 +7,8 @@ clean:
+ 	rm -f *.rst
+ 
+ index.rst: $(MOFS)
+-	openlmi-doc-class2rst -H header.txt -M `echo $(MOFS) | sed 's/ / -M /g'` -S /usr/share/mof/cim-current/CIM_Schema.mof -S /usr/share/openlmi-providers/05_LMI_Qualifiers.mof -S /usr/share/openlmi-providers/30_LMI_Jobs.mof `cat $(MOFS) | grep "^class" | cut -d ' ' -f 2 | sed 's/://'`
++	openlmi-doc-class2rst -H header.txt -M `echo $(MOFS) | sed 's/ / -M /g'` \
++	    -S /usr/share/mof/cim-current/CIM_Schema.mof \
++	    -S $(TOPDIR)/mof/05_LMI_Qualifiers.mof \
++	    -S $(TOPDIR)/mof/30_LMI_Jobs.mof \
++	    `cat $(MOFS) | grep "^class" | cut -d ' ' -f 2 | sed 's/://'`
diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 03bec53..a7a70d1 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -3,12 +3,13 @@
 
 Name:           openlmi-providers
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Set of basic CIM providers
 
 License:        LGPLv2+
 URL:            http://fedorahosted.org/openlmi/
 Source0:        http://fedorahosted.org/released/openlmi-providers/%{name}-%{version}.tar.gz
+Patch0:         openlmi-doc-class2rst.patch
 
 # Upstream name has been changed from cura-providers to openlmi-providers
 Provides:       cura-providers%{?_isa} = %{version}-%{release}
@@ -223,6 +224,7 @@ into strings on demand.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -244,7 +246,7 @@ pushd src/pcp
 popd
 
 # documentation
-PATH="$PATH:$RPM_BUILD_DIR/tools" make -C src/account/doc html
+PATH="$PATH:`pwd`/tools" make -C src/account/doc html
 
 %install
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
@@ -717,6 +719,9 @@ if [ "$1" -eq 0 ]; then
 fi >> %logfile 2>&1
 
 %changelog
+* Wed Aug 28 2013 Michal Minar <miminar at redhat.com> 0.2.0-2
+- Fixed build of account documentation.
+
 * Tue Aug 27 2013 Michal Minar <miminar at redhat.com> 0.2.0-1
 - Version 0.2.0
 - Enhancement in software api.


More information about the scm-commits mailing list