release-notes/devel Makefile, 1.64, 1.65 fedora-release-notes.spec, 1.40, 1.41

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17491

Modified Files:
	Makefile fedora-release-notes.spec 
Log Message:
Update release notes to use yelp's ghelp facility for F7 final release


Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/devel/Makefile,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Makefile	11 May 2007 16:07:24 -0000	1.64
+++ Makefile	22 May 2007 01:22:43 -0000	1.65
@@ -97,6 +97,17 @@
 
 $(foreach L,${LANGUAGES},$(eval $(call PKGHTML_NOCHUNKS_template,${L})))
 
+define PKGXML_template
+.PHONY: pkgxml-${1}
+pkgxml-${1}:: ${PKGNAME}-${VERSION}/ghelp/${1}/${DOCBASE}.xml
+$(eval PKGFILES-${1}+=${PKGNAME}-${VERSION}/ghelp/${1}/${DOCBASE}.xml)
+${PKGNAME}-${VERSION}/ghelp/${1}/${DOCBASE}.xml:: ${XMLFILES-${1}} \
+		${XMLDEPFILES-${1}}
+	mkdir -p ${PKGNAME}-${VERSION}/ghelp/${1}
+	${XMLLINT} ${XMLLINTOPT} ${1}/${DOCBASE}.xml > $$@
+endef
+
+$(foreach L,${LANGUAGES},$(eval $(call PKGXML_template,${L})))
 
 define PKGTXT_template
 .PHONY: pkgtxt-${1}


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/docs/release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- fedora-release-notes.spec	11 May 2007 16:13:16 -0000	1.40
+++ fedora-release-notes.spec	22 May 2007 01:22:43 -0000	1.41
@@ -66,6 +66,9 @@
 install -m 644 about-*omf $RPM_BUILD_ROOT%{_datadir}/omf/about-fedora/
 install -m 644 -D about-gnome.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
 popd
+pushd ghelp
+find -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_datadir}/gnome/help/fedora-release-notes/{} \;
+popd
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes
 install -m 644 fedora-release-notes-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/%{name}/
 
@@ -87,6 +90,7 @@
 %defattr(-,root,root,-)
 %{_defaultdocdir}/HTML
 %{_datadir}/gnome/help/about-fedora/
+%{_datadir}/gnome/help/fedora-release-notes/
 %{_datadir}/applications/about-fedora.desktop
 %{_datadir}/omf/fedora-release-notes/
 %{_datadir}/omf/about-fedora/
@@ -94,6 +98,7 @@
 
 %changelog
 * Thu May 10 2007 Paul W. Frields <stickster at gmail.com> - 7.0.0-1
+- Fix fedora-release-notes to use yelp ghelp facility
 - Build for F7
 
 * Fri Apr 27 2007 Paul W. Frields <stickster at gmail.com> - 6.93-3