docs-common/packaging rpm-info.dtd,1.7,1.8
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2292/docs-common/packaging
Modified Files:
rpm-info.dtd
Log Message:
Add optional "othername" attribute to <worker>.
Use colophon to specify the copyright holder.
Allow optional translators and editors to be listed in any order
after the author specification.
Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpm-info.dtd 29 Dec 2005 17:32:16 -0000 1.7
+++ rpm-info.dtd 30 Dec 2005 02:45:07 -0000 1.8
@@ -1,4 +1,4 @@
-<!ELEMENT rpm-info (colophon,author+,translator*,editor*, license,copyright+,titles,changelog) >
+<!ELEMENT rpm-info (colophon,author+,(translator|editor)*, license,copyright+,titles,changelog) >
<!ELEMENT release EMPTY >
<!ATTLIST release rel CDATA #REQUIRED >
@@ -9,7 +9,8 @@
<!ELEMENT copyright (year,holder+) >
<!ELEMENT year (#PCDATA) >
-<!ELEMENT holder (#PCDATA) >
+<!ELEMENT holder EMPTY >
+<!ATTLIST holder worker IDREF #REQUIRED >
<!ELEMENT titles (translation+) >
@@ -37,6 +38,7 @@
<!ATTLIST worker surname CDATA #REQUIRED >
<!ATTLIST worker firstname CDATA #REQUIRED >
<!ATTLIST worker initials CDATA #REQUIRED >
+<!ATTLIST worker othername CDATA "" >
<!ELEMENT author EMPTY >
<!ATTLIST author worker IDREF #REQUIRED >
18 years, 4 months
example-tutorial rpm-info.xml,1.11,1.12
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2292/example-tutorial
Modified Files:
rpm-info.xml
Log Message:
Add optional "othername" attribute to <worker>.
Use colophon to specify the copyright holder.
Allow optional translators and editors to be listed in any order
after the author specification.
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpm-info.xml 29 Dec 2005 22:40:28 -0000 1.11
+++ rpm-info.xml 30 Dec 2005 02:45:01 -0000 1.12
@@ -18,7 +18,7 @@
<copyright>
<year>2003, 2004, 2005</year>
<!-- <holder>&FORMAL-RHI;</holder> -->
- <holder>Tammy Fox</holder>
+ <holder worker="tcf"/>
</copyright>
<titles>
<translation lang="en">
18 years, 4 months
docs-common Makefile.common,1.24,1.25
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181
Modified Files:
Makefile.common
Log Message:
Make sure FDPDIR gets set correctly, important for build processes
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.common 28 Dec 2005 18:32:22 -0000 1.24
+++ Makefile.common 30 Dec 2005 00:33:20 -0000 1.25
@@ -32,7 +32,7 @@
# Supply default values for the boilerplate files _unless_ the user has
# provided their own values.
ifeq (${FDPDIR},)
-FDPDIR = ..
+FDPDIR = $(PWD)/..
endif
ifeq (${FDPBIN},)
FDPBIN = ${FDPDIR}/docs-common/bin
18 years, 4 months
example-tutorial rpm-info.xml,1.10,1.11
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27582
Modified Files:
rpm-info.xml
Log Message:
Make rpm revisions date-compliant, add othername
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpm-info.xml 29 Dec 2005 17:35:43 -0000 1.10
+++ rpm-info.xml 29 Dec 2005 22:40:28 -0000 1.11
@@ -5,11 +5,12 @@
<rpm-info>
<colophon>
<worker email="me(a)home.net" firstname="Me" id="me" initials="I" surname="Myself" wholename="Me Myself"/>
- <worker email="stickster(a)gmail.com" firstname="Paul" id="stickster" initials="PWF" surname="Frields" wholename="Paul W. Frields"/>
+ <worker email="stickster(a)gmail.com" firstname="Paul" id="stickster" initials="PWF" surname="Frields" othername="W." wholename="Paul W. Frields"/>
<worker email="tcf(a)redhat.com" firstname="Tammy" id="tcf" initials="TCF" surname="Fox" wholename="Tammy Fox"/>
</colophon>
<author worker="tcf"/>
<editor worker="stickster"/>
+ <translator worker="me"/>
<license>
<rights>GNU FDL</rights>
<version>1.0</version>
@@ -30,11 +31,19 @@
</translation>
</titles>
<changelog order="newest-first">
+ <revision date="Thu Dec 29 2005" version="0.14" release="1" role="rpm">
+ <author worker="stickster"/>
+ <details>A matching RPM release</details>
+ </revision>
+ <revision date="2005-12-29" version="0.14" release="1" role="doc">
+ <author worker="stickster"/>
+ <details>Make sure version matches what's in DOCVERSION</details>
+ </revision>
<revision date="2005-12-28" version="0.13.1" release="1">
<author worker="stickster"/>
<details>Minor changes for testing purposes</details>
</revision>
- <revision date="Sat 26 Nov 2005" release="2" version="1.0.0" role="rpm">
+ <revision date="Sat Nov 26 2005" release="2" version="1.0.0" role="rpm">
<author worker="me"/>
<details>Some rpm-only changes</details>
</revision>
18 years, 4 months
example-tutorial Makefile,1.22,1.23
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27548
Modified Files:
Makefile
Log Message:
Show some improvement, and clean up a little
Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile 28 Dec 2005 22:19:04 -0000 1.22
+++ Makefile 29 Dec 2005 22:39:06 -0000 1.23
@@ -44,22 +44,16 @@
# Some packaging specific vars
# These are obviated by new standard
-#VERSION=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/<!ENTITY DOCID "[^0-9\.]\+//' | sed 's/ .\+//')
DATE=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/.\+(//' | sed 's/).\+//')
VERSION=$(shell grep " DOCVERSION" $(DOCBASE)-en.xml | sed 's/.\+"\([0-9\.]\+\)".\+/\1/' )
NOW=$(shell date +"%a %b %e %Y")
-#SPECIN=../docs-common/packaging/fedora-doc.spec.in.common
-#OMFIN=../docs-common/packaging/fedora-doc.omf.in.common
-#DESKTOPIN=../docs-common/packaging/fedora-doc.desktop.in.common
-#DOCSPEC=$(PWD)/$(DOCBASE).spec.in
-#DOCOMF=$(PWD)/fedora-doc-$(DOCBASE)-C.omf
-#DOCDESKTOP=$(PWD)/fedora-doc-$(DOCBASE).desktop
-#DOCSRCTAR=$(PWD)/$(DOCBASE)-$(VERSION).src.tar.gz
-#TITLE=$(shell ../docs-common/packaging/titlegrab.py $(DOCBASE)-en.xml | sed 's/^ \+//')
+
+XMLFORMAT=$(FDPDIR)/docs-common/bin/xmlformat
+XMLFOPTS=-f $(FDPDIR)/docs-common/bin/xmlformat-fdp.conf
######################################################
# Some RPM flags...
######################################################
-RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_specdir $(PWD)"
+RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_specdir $(PWD)"
######################################################
@@ -99,33 +93,44 @@
khelp.desktop::
- $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl > \
- fedora-doc-$(DOCBASE)-khelp.desktop
+ $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl \
+ rpm-info.xml > fedora-doc-$(DOCBASE)-khelp.desktop
+
+
+define omf_template
+omf-$(1)::
+ ${XSLTPROC} ../docs-common/packaging/omf.xsl rpm-info.xml | \
+ $(XMLFORMAT) $(XMLFOPTS) > fedora-doc-$(DOCBASE)-$(1).omf
+endef
+
+omf:: $(foreach LANG,${LANGUAGES},omf-$(LANG))
+# correct lang=en for scrollkeeper document
+ mv fedora-doc-$(DOCBASE)-en.omf fedora-doc-$(DOCBASE)-C.omf
+$(foreach LANG,${LANGUAGES},$(eval $(call omf_template,${LANG})))
-$(DOCBASE)-$(VERSION).src.tar.gz:: fdp-info
+$(DOCBASE)-$(VERSION).src.tar.gz:: clean fdp-info gnome.desktop kde.desktop khelp.desktop omf
mkdir $(DOCBASE)-$(VERSION)
- find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \
+ find . -maxdepth 1 -type f ! \( -name '*~' -o -name '#*' \
-o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \
| cpio -pamdv $(DOCBASE)-$(VERSION)
find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
-o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \
| cpio -pamdv $(DOCBASE)-$(VERSION)
-# ( cd $(DOCBASE)-$(VERSION) ; tar xzf ../$(DOCBASE)-*.tar.gz )
-# pwd
tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/
rm -rf $(DOCBASE)-$(VERSION)/
+src-tarball:: $(DOCBASE)-$(VERSION).src.tar.gz
+
-rpm:: clean $(DOCBASE)-$(VERSION).src.tar.gz spec gnome.desktop kde.desktop khelp.desktop
+rpm:: src-tarball spec
# depend on source tarball and lang-specific HTML tarball
# Make RPM build tree; don't rely on local user's setup
mkdir -p BUILD
- rpmbuild -bb $(RPMFLAGS) fedora-doc-$(DOCBASE).spec
- rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
-# rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-# rm -rf $(DOCBASE)-$(VERSION)
+ rpmbuild -ba $(RPMFLAGS) fedora-doc-$(DOCBASE).spec
+ rpmbuild --clean --rmsource $(RPMFLAGS) fedora-doc-$(DOCBASE).spec
+ rm -rf BUILD
showvars::
18 years, 4 months
docs-common/packaging templates.xsl, NONE, 1.1 bookinfo.xsl, 1.3, 1.4 gnome-desktop.xsl, 1.3, 1.4 kde-desktop.xsl, 1.1, 1.2 khelpcenter-plugin.xsl, 1.1, 1.2 spec.xsl, 1.8, 1.9
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27505/packaging
Modified Files:
bookinfo.xsl gnome-desktop.xsl kde-desktop.xsl
khelpcenter-plugin.xsl spec.xsl
Added Files:
templates.xsl
Log Message:
Reduce redundancy, and create new, stupider pet tricks
--- NEW FILE templates.xsl ---
<xsl:stylesheet version="1.0" xml:space="preserve" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:strip-space elements="*"/>
<!-- Print the translated title of a document for language $lang -->
<xsl:template name="get-title">
<xsl:for-each select="/rpm-info/titles/translation">
<xsl:choose>
<xsl:when test="@lang = $lang">
<xsl:value-of select="title"/>
</xsl:when>
</xsl:choose>
</xsl:for-each>
</xsl:template>
<!-- Print the translated description of a document for language $lang -->
<xsl:template name="get-desc">
<xsl:for-each select="/rpm-info/titles/translation">
<xsl:choose>
<xsl:when test="@lang = $lang">
<xsl:value-of select="desc"/>
</xsl:when>
</xsl:choose>
</xsl:for-each>
</xsl:template>
<!-- Print a hierarchical entry for a given worker with id $who -->
<xsl:template name="human">
<xsl:for-each select="/rpm-info/colophon/worker">
<xsl:if test="@id = $who">
<xsl:element name="surname">
<xsl:value-of select="@surname"/>
</xsl:element>
<xsl:element name="firstname">
<xsl:value-of select="@firstname"/>
</xsl:element>
<xsl:if test="@othername != ''">
<xsl:element name="othername">
<xsl:value-of select="@othername"/>
</xsl:element>
</xsl:if>
</xsl:if>
</xsl:for-each>
</xsl:template>
<!-- Print a full name for a given worker with id $who -->
<!-- DO NOT CHANGE SPACING! -->
<xsl:template name="personname"><xsl:for-each
select="/rpm-info/colophon/worker"><xsl:if test="@id = $who"><xsl:value-of
select="@firstname"/> <xsl:if test="@othername != ''"><xsl:value-of
select="@othername"/> </xsl:if><xsl:value-of
select="@surname"/></xsl:if></xsl:for-each></xsl:template>
<!-- Print a full name and email for a given worker with id $who -->
<!-- DO NOT CHANGE SPACING! -->
<xsl:template name="packager"><xsl:call-template
name="personname"><xsl:with-param name="who"
select="$who"/></xsl:call-template> <<xsl:for-each
select="/rpm-info/colophon/worker"><xsl:if test="@id = $who"><xsl:value-of
select="@email"/></xsl:if></xsl:for-each>></xsl:template>
</xsl:stylesheet>
Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bookinfo.xsl 24 Dec 2005 01:25:10 -0000 1.3
+++ bookinfo.xsl 29 Dec 2005 22:37:32 -0000 1.4
@@ -1,73 +1,69 @@
<!-- Transform rpm-info.xml into either "bookinfo" or "articleinfo" -->
<xsl:stylesheet version="1.0" xml:space="preserve" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output encoding="UTF-8" indent="yes" method="xml" omit-xml-declaration="yes" standalone="no" version="1.0"/>
- <xsl:param name="lang" select="'en'"/>
- <xsl:param name="doctype" select="'bookinfo'"/>
+ <xsl:output encoding="UTF-8" indent="yes" method="xml" omit-xml-declaration="yes" standalone="no" version="1.0"/>
- <xsl:template match="/">
- <xsl:element name="{$doctype}">
- <title>
- <xsl:call-template name="get-title"/>
- </title>
- <copyright>
- <xsl:for-each select="/rpm-info/copyright/year"><year>
- <xsl:value-of select="node()"/>
- </year></xsl:for-each>
- <xsl:for-each select="/rpm-info/copyright/holder">
- <holder>
- <xsl:value-of select="node()"/>
- </holder>
- </xsl:for-each>
- </copyright>
- <authorgroup>
- <xsl:for-each select="/rpm-info/author">
- <author>
- <xsl:call-template name="human"/>
- </author>
- </xsl:for-each>
- <xsl:for-each select="/rpm-info/translator">
- <othercredit>
- <xsl:call-template name="human"/>
- <personalblurb>Translator</personalblurb>
- </othercredit>
- </xsl:for-each>
- <xsl:for-each select="/rpm-info/editor">
- <editor>
- <xsl:call-template name="human"/>
- </editor>
- </xsl:for-each>
- </authorgroup>
- <xsl:text disable-output-escaping="yes">&LEGALNOTICE;</xsl:text>
- <revhistory>
- <xsl:for-each select="/rpm-info/changelog/revision[@role != 'rpm']">
- <revision>
- <revnumber><xsl:value-of select="@version"/></revnumber>
- <date><xsl:value-of select="@date"/></date>
- <authorinitials><xsl:value-of select="author/@initials"/></authorinitials>
- <revdescription>
- <para>
- <xsl:value-of select="details"/>
- </para>
- </revdescription>
- </revision>
- </xsl:for-each>
- </revhistory>
- </xsl:element>
- </xsl:template>
+ <xsl:param name="lang" select="'en'"/>
+ <xsl:param name="doctype" select="'bookinfo'"/>
+ <xsl:param name="who" select="''"/>
- <xsl:template name="get-title">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="title"/>
- </xsl:when>
- </xsl:choose>
+ <xsl:template match="/">
+ <xsl:element name="{$doctype}">
+ <xsl:element name="title">
+ <xsl:call-template name="get-title"/>
+ </xsl:element>
+ <xsl:element name="copyright">
+ <xsl:for-each select="/rpm-info/copyright/year"><xsl:element name="year">
+ <xsl:value-of select="node()"/>
+ </xsl:element></xsl:for-each>
+ <xsl:for-each select="/rpm-info/copyright/holder">
+ <xsl:element name="holder">
+ <xsl:value-of select="node()"/>
+ </xsl:element>
</xsl:for-each>
- </xsl:template>
+ </xsl:element>
+ <xsl:element name="authorgroup">
+ <xsl:for-each select="/rpm-info/author">
+ <xsl:element name="author">
+ <xsl:call-template name="human"><xsl:with-param name="who" select="@worker"/></xsl:call-template>
+ </xsl:element>
+ </xsl:for-each>
+ <xsl:for-each select="/rpm-info/editor">
+ <xsl:element name="editor">
+ <xsl:call-template name="human"><xsl:with-param name="who" select="@worker"/></xsl:call-template>
+ </xsl:element>
+ </xsl:for-each>
+ </xsl:element>
+ <xsl:for-each select="/rpm-info/translator">
+ <othercredit class="translator">
+ <xsl:call-template name="human"><xsl:with-param name="who"
+ select="@worker"/></xsl:call-template>
+ </othercredit>
+ </xsl:for-each>
+ <xsl:text disable-output-escaping="yes">&LEGALNOTICE;</xsl:text>
+ <xsl:element name="revhistory">
+ <xsl:for-each select="/rpm-info/changelog/revision[@role != 'rpm']">
+ <xsl:element name="revision">
+ <xsl:element name="revnumber">
+ <xsl:value-of select="@version"/>
+ </xsl:element>
+ <xsl:element name="date">
+ <xsl:value-of select="@date"/>
+ </xsl:element>
+ <xsl:element name="authorinitials">
+ <xsl:value-of select="author/@initials"/>
+ </xsl:element>
+ <xsl:element name="revdescription">
+ <xsl:element name="para">
+ <xsl:value-of select="details"/>
+ </xsl:element>
+ </xsl:element>
+ </xsl:element>
+ </xsl:for-each>
+ </xsl:element>
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:include href="templates.xsl"/>
- <xsl:template name="human">
- <surname><xsl:value-of select="@surname"/></surname>
- <firstname><xsl:value-of select="@firstname"/></firstname>
- </xsl:template>
</xsl:stylesheet>
Index: gnome-desktop.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/gnome-desktop.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-desktop.xsl 25 Dec 2005 19:26:10 -0000 1.3
+++ gnome-desktop.xsl 29 Dec 2005 22:37:32 -0000 1.4
@@ -35,24 +35,5 @@
OnlyShowIn=GNOME;
</xsl:template>
- <xsl:template name="get-title">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="title"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:template>
-
- <xsl:template name="get-desc">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="desc"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:template>
-
+ <xsl:include href="templates.xsl"/>
</xsl:stylesheet>
Index: kde-desktop.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/kde-desktop.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-desktop.xsl 25 Dec 2005 19:26:10 -0000 1.1
+++ kde-desktop.xsl 29 Dec 2005 22:37:32 -0000 1.2
@@ -29,6 +29,6 @@
OnlyShowIn=KDE;
</xsl:template>
-<xsl:template name="get-title"><xsl:for-each select="/rpm-info/titles/translation"><xsl:choose><xsl:when test="@lang = $lang"><xsl:value-of select="title"/></xsl:when></xsl:choose></xsl:for-each></xsl:template>
+<xsl:include href="templates.xsl"/>
</xsl:stylesheet>
Index: khelpcenter-plugin.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/khelpcenter-plugin.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- khelpcenter-plugin.xsl 24 Dec 2005 00:40:04 -0000 1.1
+++ khelpcenter-plugin.xsl 29 Dec 2005 22:37:32 -0000 1.2
@@ -1,13 +1,12 @@
<!-- Transform rpm-info.xml into a KHelpCenter .desktop File -->
<xsl:stylesheet version="1.0" xml:space="preserve" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output encoding="UTF-8" indent="no" method="text" omit-xml-declaration="no" standalone="no" version="1.0"/>
+ <xsl:output encoding="UTF-8" indent="no" method="text" omit-xml-declaration="yes" standalone="no" version="1.0"/>
<!-- Note: do not indent this file! Any whitespace here
will be reproduced in the output -->
<xsl:param name="lang" select="'en'" />
<xsl:param name="docbase" select="'example-tutorial'" />
- <xsl:param name="release" select="1"/>
<xsl:template match="/">[Desktop Entry]
DocPath=help:/<xsl:value-of select="$docbase"/>/index.html
@@ -19,14 +18,5 @@
X-DOC-Weight=-5000
</xsl:template>
- <xsl:template name="get-title">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="title"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:template>
-
+<xsl:include href="templates.xsl"/>
</xsl:stylesheet>
Index: spec.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- spec.xsl 28 Dec 2005 22:20:39 -0000 1.8
+++ spec.xsl 29 Dec 2005 22:37:32 -0000 1.9
@@ -46,13 +46,15 @@
<xsl:value-of select="desc"/></xsl:if></xsl:for-each>
%prep
-%setup -q -n %{docbase}-${version}
-for in in $RPM_BUILD_DIR/%{docbase}-%{version}/%{docbase}*.xml
+%setup -q -n %{docbase}-%{version}
+for i in $RPM_BUILD_DIR/%{docbase}-%{version}/{%{docbase}*.xml,Makefile}
do
- %{__sed} -i 's;../docs-common;../../docs-common;' "$i"
+ %{__sed} -i 's;../docs-common;../../../docs-common;' "$i"
done
+
%build
+make html
# /bin/rm -r $RPM_BUILD_ROOT
# /usr/bin/install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/omf/%{name}
@@ -71,19 +73,15 @@
</xsl:for-each>
%changelog
-<xsl:for-each select="/rpm-info/changelog/revision"><xsl:if test="@role='rpm'">* <xsl:value-of select="@date"/> - <xsl:value-of select="author/@wholename"/> <<xsl:value-of select="author/@email"/>> - <xsl:value-of select="@version"/>
+<xsl:for-each select="/rpm-info/changelog/revision"><xsl:if
+ test="@role='rpm'">* <xsl:value-of select="@date"/> - <xsl:call-template
+ name="packager"><xsl:with-param name="who"
+ select="author/@worker"/></xsl:call-template> - <xsl:value-of
+ select="@version"/>-<xsl:value-of select="@release"/>
- <xsl:value-of select="details"/>
+
</xsl:if></xsl:for-each>
</xsl:template>
- <xsl:template name="get-title">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="title"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:template>
-
+ <xsl:include href="templates.xsl"/>
</xsl:stylesheet>
18 years, 4 months
example-tutorial rpm-info.xml,1.9,1.10
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17874/example-tutorial
Modified Files:
rpm-info.xml
Log Message:
Oops, should not have committed the invalid XML: didn't check after the
preliminary sync update.
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpm-info.xml 29 Dec 2005 17:32:10 -0000 1.9
+++ rpm-info.xml 29 Dec 2005 17:35:43 -0000 1.10
@@ -31,8 +31,7 @@
</titles>
<changelog order="newest-first">
<revision date="2005-12-28" version="0.13.1" release="1">
- <author wholename="Paul W. Frields" email="stickster(a)gmail.com"
- surname="Frields" firstname="Paul" initials="PWF"/>
+ <author worker="stickster"/>
<details>Minor changes for testing purposes</details>
</revision>
<revision date="Sat 26 Nov 2005" release="2" version="1.0.0" role="rpm">
18 years, 4 months
docs-common/packaging rpm-info.dtd,1.6,1.7
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17831/docs-common/packaging
Modified Files:
rpm-info.dtd
Log Message:
Consolidate author, editor and such, information into a colophon that we
can access using the manditory ID attributes.
Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpm-info.dtd 28 Dec 2005 00:55:52 -0000 1.6
+++ rpm-info.dtd 29 Dec 2005 17:32:16 -0000 1.7
@@ -1,4 +1,4 @@
-<!ELEMENT rpm-info (author+,translator*,editor*, license,copyright+,titles,changelog) >
+<!ELEMENT rpm-info (colophon,author+,translator*,editor*, license,copyright+,titles,changelog) >
<!ELEMENT release EMPTY >
<!ATTLIST release rel CDATA #REQUIRED >
@@ -28,25 +28,25 @@
<!ATTLIST revision release CDATA #REQUIRED >
<!ATTLIST revision role (doc|rpm) "doc" >
-<!ELEMENT author EMPTY >
-<!ATTLIST author wholename CDATA #REQUIRED >
-<!ATTLIST author email CDATA #REQUIRED >
-<!ATTLIST author surname CDATA #REQUIRED >
-<!ATTLIST author firstname CDATA #REQUIRED >
-<!ATTLIST author initials CDATA #REQUIRED >
+<!ELEMENT colophon (worker+) >
+
+<!ELEMENT worker EMPTY >
+<!ATTLIST worker id ID #REQUIRED >
+<!ATTLIST worker wholename CDATA #REQUIRED >
+<!ATTLIST worker email CDATA #REQUIRED >
+<!ATTLIST worker surname CDATA #REQUIRED >
+<!ATTLIST worker firstname CDATA #REQUIRED >
+<!ATTLIST worker initials CDATA #REQUIRED >
+
+<!ELEMENT author EMPTY >
+<!ATTLIST author worker IDREF #REQUIRED >
<!ELEMENT editor EMPTY >
-<!ATTLIST editor wholename CDATA #REQUIRED >
-<!ATTLIST editor email CDATA #REQUIRED >
-<!ATTLIST editor surname CDATA #REQUIRED >
-<!ATTLIST editor firstname CDATA #REQUIRED >
+<!ATTLIST editor worker IDREF #REQUIRED >
<!ELEMENT translator EMPTY >
-<!ATTLIST translator wholename CDATA #REQUIRED >
-<!ATTLIST translator email CDATA #REQUIRED >
-<!ATTLIST translator surname CDATA #REQUIRED >
-<!ATTLIST translator firstname CDATA #REQUIRED >
+<!ATTLIST translator worker IDREF #REQUIRED >
<!ELEMENT details (#PCDATA) >
<!ATTLIST details lang CDATA "en" >
18 years, 4 months
example-tutorial rpm-info.xml,1.8,1.9
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17831/example-tutorial
Modified Files:
rpm-info.xml
Log Message:
Consolidate author, editor and such, information into a colophon that we
can access using the manditory ID attributes.
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpm-info.xml 29 Dec 2005 16:30:07 -0000 1.8
+++ rpm-info.xml 29 Dec 2005 17:32:10 -0000 1.9
@@ -3,8 +3,13 @@
<!-- Sample document description from which we build RPMs -->
<!DOCTYPE rpm-info SYSTEM "../docs-common/packaging/rpm-info.dtd">
<rpm-info>
- <author email="tcf(a)redhat.com" firstname="Tammy" initials="TCF" surname="Fox" wholename="Tammy Fox"/>
- <editor email="stickster(a)gmail.com" firstname="Paul" surname="Frields" wholename="Paul W. Frields"/>
+ <colophon>
+ <worker email="me(a)home.net" firstname="Me" id="me" initials="I" surname="Myself" wholename="Me Myself"/>
+ <worker email="stickster(a)gmail.com" firstname="Paul" id="stickster" initials="PWF" surname="Frields" wholename="Paul W. Frields"/>
+ <worker email="tcf(a)redhat.com" firstname="Tammy" id="tcf" initials="TCF" surname="Fox" wholename="Tammy Fox"/>
+ </colophon>
+ <author worker="tcf"/>
+ <editor worker="stickster"/>
<license>
<rights>GNU FDL</rights>
<version>1.0</version>
@@ -31,11 +36,11 @@
<details>Minor changes for testing purposes</details>
</revision>
<revision date="Sat 26 Nov 2005" release="2" version="1.0.0" role="rpm">
- <author email="me(a)home.net" firstname="Me" initials="I" surname="Myself" wholename="Me Myself"/>
+ <author worker="me"/>
<details>Some rpm-only changes</details>
</revision>
<revision date="2005-09-18" release="1" version="0.13">
- <author email="stickster(a)gmail.com" firstname="Paul" initials="PWF" surname="Frields" wholename="Paul W. Frields"/>
+ <author worker="stickster"/>
<details>Add revision history</details>
<details lang="de">addierte Neuausgabengeschichte</details>
</revision>
18 years, 4 months
example-tutorial rpm-info.xml,1.7,1.8
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15541
Modified Files:
rpm-info.xml
Log Message:
Minor changes for testing purposes
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpm-info.xml 26 Dec 2005 17:21:55 -0000 1.7
+++ rpm-info.xml 29 Dec 2005 16:30:07 -0000 1.8
@@ -25,6 +25,11 @@
</translation>
</titles>
<changelog order="newest-first">
+ <revision date="2005-12-28" version="0.13.1" release="1">
+ <author wholename="Paul W. Frields" email="stickster(a)gmail.com"
+ surname="Frields" firstname="Paul" initials="PWF"/>
+ <details>Minor changes for testing purposes</details>
+ </revision>
<revision date="Sat 26 Nov 2005" release="2" version="1.0.0" role="rpm">
<author email="me(a)home.net" firstname="Me" initials="I" surname="Myself" wholename="Me Myself"/>
<details>Some rpm-only changes</details>
18 years, 4 months