release-notes/devel about-gnome.desktop.in, NONE, 1.1 about-kde.desktop.in, NONE, 1.1 about-title.xsl, NONE, 1.1 Makefile, 1.44, 1.45 fedora-release-notes.spec, 1.23, 1.24

[Paul W. Frields (pfrields)]

Author: pfrields

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

Modified Files:
	Makefile fedora-release-notes.spec 
Added Files:
	about-gnome.desktop.in about-kde.desktop.in about-title.xsl 
Log Message:
Bump release, localize About Fedora menu item to the extent currently possible. There is a KDE .desktop.in here, but no work done on it yet.  Bugfix anyone?


--- NEW FILE about-gnome.desktop.in ---
[Desktop Entry]
Encoding=UTF-8
@NAME-L10N@
@COMMENT-L10N@
@EXEC-L10N@
Icon=fedora-logo-icon
Terminal=false
Type=Application
Categories=X-Fedora-About;
StartupNotify=true
OnlyShowIn=GNOME;


--- NEW FILE about-kde.desktop.in ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
#Name=About Fedora
#GenericName=About Fedora
#Comment=Learn more about Fedora
#Exec=khelpcenter
@NAME-L10N@
@GENERICNAME-L10N@
@COMMENT-L10N@
@EXEC-L10N@
Icon=
Path=
Terminal=false
Type=Application
DocPath=khelpcenter/plugins/about.html
Categories=Qt;KDE;Application;Core;
X-KDE-StartupNotify=true
OnlyShowIn=KDE;


--- NEW FILE about-title.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- Pull title from about-fedora.xml article -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:output omit-xml-declaration="yes" preserve-space="no" encoding="UTF-8"
    indent="no" method="text"/>
  <xsl:template match="*">
    <xsl:value-of select="/article/title"/>
  </xsl:template>
</xsl:stylesheet>


Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/devel/Makefile,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile	6 Oct 2006 21:51:02 -0000	1.44
+++ Makefile	8 Oct 2006 21:29:38 -0000	1.45
@@ -251,7 +251,7 @@
 txt-${1} text-${1}:: ${TXTEXTRAFILES-${1}}
 
 showvars::
-	echo "TXTEXTRAFILES-${1}=\"${TXTEXTRAFILES-${1}}\""
+	@echo "TXTEXTRAFILES-${1}=\"${TXTEXTRAFILES-${1}}\""
 
 endef
 
@@ -350,16 +350,40 @@
 
 $(foreach L,${LANGUAGES},$(eval $(call PKGTXT_template,${L})))
 
+
 define PKG_template
 .PHONY: release-pkg-${1}
 release-pkg-${1}:: ${PKGFILES-${1}}
+
+showvars::
+	@echo "PKGFILES-${1}=${PKGFILES-${1}}"
 endef
 
 $(foreach L,${LANGUAGES},$(eval $(call PKG_template,${L})))
 
+
+${PKGNAME}-${VERSION}/about-gnome.desktop:: about-gnome.desktop.in 	\
+				$(foreach LN,${OTHERS},${LN}/about-fedora.xml)
+	$(eval NAME_L10N=Name=$(shell ${XSLTPROC} 			\
+		about-title.xsl ${PRI_LANG}/about-fedora.xml))
+	$(eval COMMENT_L10N=Comment=$(shell ${XSLTPROC}			\
+		about-title.xsl ${PRI_LANG}/about-fedora.xml))
+	$(eval EXEC_L10N=Exec=yelp file:///usr/share/doc/${PKGNAME}-${VERSION}/about/C/about-fedora.xml)
+	$(foreach L,${LANGUAGES},$(eval					\
+		NAME_L10N+=\nName[${L}]=$(shell ${XSLTPROC}		\
+			about-title.xsl ${L}/about-fedora.xml)))
+	$(foreach L,${LANGUAGES},$(eval					\
+		COMMENT_L10N+=\nComment[${L}]=$(shell ${XSLTPROC}	\
+			about-title.xsl ${L}/about-fedora.xml)))
+	$(foreach L,${LANGUAGES},$(eval					\
+		EXEC_L10N+=\nExec[${L}]=yelp file:///usr/share/doc/${PKGNAME}-${VERSION}/about/${L}/about-fedora.xml))
+	sed -e 's!@NAME-L10N@!${NAME_L10N}!' -e 's!@COMMENT-L10N@!${COMMENT_L10N}!' -e 's!@EXEC-L10N@!${EXEC_L10N}!' $< > $@
+
+
 .PHONY: release-pkg
 release-pkg:: ${PKGNAME}-${VERSION}.tar.gz
-${PKGNAME}-${VERSION}.tar.gz:: $(foreach L,${LANGUAGES},${PKGFILES-${L}})
+${PKGNAME}-${VERSION}.tar.gz:: $(foreach L,${LANGUAGES},${PKGFILES-${L}}) \
+		${PKGNAME}-${VERSION}/about-gnome.desktop
 	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
@@ -367,7 +391,6 @@
 		$(shell mkdir -p ${PKGNAME}-${VERSION}/about/${LN})))
 	$(foreach LN,${OTHERS},$(eval \
 		$(shell cp ${LN}/about-fedora.xml ${PKGNAME}-${VERSION}/about/${LN})))
-	cp -a about-* ${PKGNAME}-${VERSION}
 	cp -a README-Accessibility ${PKGNAME}-${VERSION}
 	tar czf ${PKGNAME}-${VERSION}.tar.gz ${PKGNAME}-${VERSION}
 


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/docs/release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fedora-release-notes.spec	5 Oct 2006 19:25:25 -0000	1.23
+++ fedora-release-notes.spec	8 Oct 2006 21:29:38 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
 Version:	6
-Release:	1
+Release:	2
 Summary:	Release Notes for Fedora Core %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Paul W. Frields <stickster at gmail.com> - 6-2
+- Localize About Fedora menu item (somewhat)
+
 * Thu Oct 05 2006 Jesse Keating <jkeating at redhat.com> - 6-1
 - Build for FC6, lots of new translations