release-notes/devel Makefile, 1.40, 1.41 fedora-release-notes.spec, 1.21, 1.22 - docs-commits - Fedora mailing-lists

30 Sep 2006

Author: pfrields
Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7800
Modified Files:
    Makefile fedora-release-notes.spec 
Log Message:
Add splash page materials to build, including supporting graphics, XSL, and CSS
Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/devel/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41

--- Makefile	26 Sep 2006 03:06:58 -0000	1.40
+++ Makefile	30 Sep 2006 15:23:44 -0000	1.41
@@ -189,6 +189,28 @@
+define HACK_HTML_template
+.PHONY: homepage-${1}
+$(eval HOMEPAGEDIR=homepage)
+$(eval HTMLEXTRAFILES-${1}=${HOMEPAGEDIR}/index-${1}.html)
+$(eval HOMEPAGE_CSS=${HOMEPAGEDIR}/homepage.css)
+$(eval HOMEPAGE_XSL=${HOMEPAGEDIR}/homepage.xsl)
+
+homepage-${1}:: ${HOMEPAGEDIR}/index-${1}.html
+
+${HOMEPAGEDIR}/index-${1}.html:: ${1}/homepage.xml ${XMLDEPFILES-${1}}
+# Can we get away with just the above?  Let's see...
+	LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -m ${HOMEPAGE_XSL} $(1)/homepage.xml
+	move-if-change index.html ${HOMEPAGEDIR}/index-${1}.html
+	mkdir -p stylesheet-images/
+	cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images
+
+clean::
+	rm -rf ${HOMEPAGEDIR}/index-${1}.html stylesheet-images/
+
+endef
+$(foreach L,${LANGUAGES},$(eval $(call HACK_HTML_template,${L})))
+
define HACK_TXT_template
 .PHONY: readme-${1} readme-isoburn-${1}
@@ -299,6 +321,17 @@
$(foreach L,${LANGUAGES},$(eval $(call PKGHTML_NOCHUNKS_template,${L})))
+define PKGHTML_HOMEPAGE_template
+.PHONY: pkghtml-homepage-${1}
+pkghtml-homepage-${1}:: ${PKGNAME}-${VERSION}/${HOMEPAGEDIR}/index-${1}.html
+$(eval PKGFILES-${1}+=${PKGNAME}-${VERSION}/${HOMEPAGEDIR}/index-${1}.html)
+${PKGNAME}-${VERSION}/${HOMEPAGEDIR}/index-${1}.html:: ${HOMEPAGEDIR}/index-${1}.html
+	mkdir -p ${PKGNAME}-${VERSION}/${HOMEPAGEDIR}
+	cp ${HOMEPAGEDIR}/index-${1}.html $$@
+endef
+
+$(foreach L,${LANGUAGES},$(eval $(call PKGHTML_HOMEPAGE_template,${L})))
+
 define PKGTXT_template
 .PHONY: pkgtxt-${1}
 pkgtxt-${1}:: ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt	${PKGNAME}-${VERSION}/README-${1}.txt ${PKGNAME}-${VERSION}/README-BURNING-ISOS-${1}.txt
@@ -327,7 +360,7 @@
 .PHONY: release-pkg
 release-pkg:: ${PKGNAME}-${VERSION}.tar.gz
 ${PKGNAME}-${VERSION}.tar.gz:: $(foreach L,${LANGUAGES},${PKGFILES-${L}})
-	cp -a --parents css/*css fedora.css img/*png stylesheet-images/*png ${PKGNAME}-${VERSION}
+	cp -a --parents css/*css fedora.css ${HOMEPAGE_CSS} img/*png stylesheet-images/*png ${PKGNAME}-${VERSION}
    mkdir -p ${PKGNAME}-${VERSION}/about/C && \
    	cp ${PRI_LANG}/about-fedora.xml ${PKGNAME}-${VERSION}/about/C
    $(foreach LN,${OTHERS},$(eval \
Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/docs/release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fedora-release-notes.spec	26 Sep 2006 03:10:33 -0000	1.21
+++ fedora-release-notes.spec	30 Sep 2006 15:23:44 -0000	1.22
@@ -1,14 +1,14 @@
 Name:		fedora-release-notes
 Version:	5.92
-Release:	6
+Release:	7
 Summary:	Release Notes for Fedora Core %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
Group:		System Environment/Base
 License:	Distributable
 Source0:	fedora-release-notes-%{version}.tar.gz
-Source1:	indexhtml-head
-Source2:	indexhtml-foot
+#Source1:	indexhtml-head
+#Source2:	indexhtml-foot
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
@@ -28,17 +28,19 @@
%build
-cat %{SOURCE1} > index.html
-sed 's/.*<div class="article"/<div class="article"/g' \
-	RELEASE-NOTES-en_US.html >> index.html
-cat %{SOURCE2} >> index.html
+#cat %{SOURCE1} > index.html
+#sed 's/.*<div class="article"/<div class="article"/g' \
+#	RELEASE-NOTES-en_US.html >> index.html
+#cat %{SOURCE2} >> index.html
 sed -i 's/@RELEASE@/%{version}/g' about-gnome.desktop
%install
 rm -rf $RPM_BUILD_ROOT
 install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-install -m 644 index.html fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+install -m 644 fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+install -m 644 homepage/* $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+install -m 644 homepage/index-en_US.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/index.html
 install -m 644 README-Accessibility $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
 install -m 644 README-BURNING-ISOS*.txt $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
 for DIR in css img stylesheet-images ; do
@@ -79,6 +81,9 @@
%changelog
+* Sat Sep 30 2006 Paul W. Frields stickster@gmail.com - 5.92-7
+- Include new i18n browser home page
+
 * Mon Sep 25 2006 Jesse Keating jkeating@redhat.com - 5.92-6
 - Bump for lang fixes

    