docs-common Makefile.common,1.22,1.23
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1566/docs-common
Modified Files:
Makefile.common
Log Message:
Define macro for xsltproc
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.common 15 Dec 2005 06:00:02 -0000 1.22
+++ Makefile.common 28 Dec 2005 01:03:47 -0000 1.23
@@ -56,6 +56,8 @@
# Define a macro to locate xmlto(1) so we can choose a specific version
# by "make XMLTO=/path/to/xmlto", if we so desire.
XMLTO =xmlto
+# Let's also do this for xsltproc(1).
+XSLTPROC=xsltproc
#########################################################################
# PUT NO TARGETS BEFORE THIS ONE, not even in your base Makefile
# In a properly-constructed Makefile, this will be the default target
18 years, 4 months
docs-common/packaging rpm-info.dtd,1.5,1.6
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32405/docs-common/packaging
Modified Files:
rpm-info.dtd
Log Message:
Langifying means optionally more than one details entry
Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpm-info.dtd 26 Dec 2005 04:05:54 -0000 1.5
+++ rpm-info.dtd 28 Dec 2005 00:55:52 -0000 1.6
@@ -22,7 +22,7 @@
<!ELEMENT changelog (revision+) >
<!ATTLIST changelog order (newest-first) #REQUIRED >
-<!ELEMENT revision (author+,editor*,details) >
+<!ELEMENT revision (author+,editor*,details+) >
<!ATTLIST revision date CDATA #REQUIRED >
<!ATTLIST revision version CDATA #REQUIRED >
<!ATTLIST revision release CDATA #REQUIRED >
18 years, 4 months
example-tutorial Makefile, 1.20, 1.21 example-tutorial-de.xml, 1.3, 1.4
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32347
Modified Files:
Makefile example-tutorial-de.xml
Log Message:
Update to use new entity standards
Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile 1 Dec 2005 21:10:41 -0000 1.20
+++ Makefile 28 Dec 2005 00:43:25 -0000 1.21
@@ -18,10 +18,10 @@
DOCBASE = example-tutorial
#
DOCTITLE-en = Example Tutorial
-XMLEXTRAFILES-en=article-info-en.xml
+XMLEXTRAFILES-en= fdp-info-en.xml
#
DOCTITLE-de = Beispiel Tutorial
-XMLEXTRAFILES-de=
+XMLEXTRAFILES-de= fdp-info-de.xml
#
######################################################
include ../docs-common/Makefile.common
@@ -38,20 +38,15 @@
######################################################
#
-article-info-en.xml:: rpm-info.xml
- xsltproc --stringparam doctype articleinfo ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > $@
-
-clean::
- ${RM} bookinfo.xml
######################################################
######################################################
# Some packaging specific vars
# These are obviated by new standard
-#VERSION=$(shell grep BOOKID $(DOCBASE)-en.xml | sed 's/<!ENTITY BOOKID "[^0-9\.]\+//' | sed 's/ .\+//')
-DATE=$(shell grep BOOKID $(DOCBASE)-en.xml | sed 's/.\+(//' | sed 's/).\+//')
-VERSION=$(shell grep " BOOKVERSION" $(DOCBASE)-en.xml | sed 's/.\+"\([0-9\.]\+\)".\+/\1/' )
+#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
@@ -64,13 +59,13 @@
######################################################
# Some RPM flags...
######################################################
-RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "lang $(1)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-$(1)-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_specdir $(PWD)"
+RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "lang $(1)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-$(1)-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_specdir $(PWD)" --define "lang $(LANG)"
######################################################
$(DOCBASE)-$(VERSION).src.tar.gz:: tarball
mkdir $(DOCBASE)-$(VERSION)
find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \
- -o -name '$(DOCBASE)*.tar.gz' \) \
+ -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)*' \) \
@@ -87,10 +82,29 @@
${RM} -rf $(DOCBASE)-$(VERSION)*.src.tar.gz
${RM} -rf BUILD/ $(DOCBASE)-$(VERSION)/
${RM} -f *omf *desktop *spec.in
+ ${RM} -f fdp-info-*.xml
+
+define fdp-info_template
+fdp-info-$(1).xml:: rpm-info.xml
+ xsltproc --stringparam doctype $(shell xsltproc ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > $@
+endef
+
+fdp-info.xml:: $(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG})))
+spec:: rpm-info.xml
+ $(XSLTPROC) ../docs-common/packaging/spec.xsl rpm-info.xml > ${DOCBASE}.spec
+
+gnome-desktop-file:: rpm-info.xml
+ $(XSLTPROC) ../docs-common/packaging/gnome-desktop.xsl rpm-info.xml > ${DOCBASE}-gnome.desktop
+
+kde-desktop-file:: rpm-info.xml
+ $(XSLTPROC) ../docs-common/packaging/kde-desktop.xsl rpm-info.xml > ${DOCBASE}-kde.desktop
+
+khelpcenter-file:: rpm-info.xml
+ $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl > ${DOCBASE}-khelpcenter.desktop
define rpm_template
-rpm-$(1):: clean $(DOCBASE)-$(VERSION).src.tar.gz
+rpm-$(1):: clean $(DOCBASE)-$(1).src.tar.gz
# depend on source tarball and lang-specific HTML tarball
# Make RPM build tree; don't rely on local user's setup
mkdir -p BUILD
@@ -98,24 +112,26 @@
# Make rpmlint happy with a changelog entry
# FIXME: Maybe more magic would make this stickier; pity
# I'm no magician...
- sed 's/\(%changelog\)/\1\n* $(NOW) Fedora Docs Project <fedora-docs-list(a)redhat.com> - $(VERSION)-1\n- Update to version $(VERSION)\n/' \
- $(SPECIN) > $(DOCSPEC)
+# sed 's/\(%changelog\)/\1\n* $(NOW) Fedora Docs Project <fedora-docs-list(a)redhat.com> - $(VERSION)-1\n- Update to version $(VERSION)\n/' \
+# $(SPECIN) > $(DOCSPEC)
+
#
# Fill in files
# FIXME: Needs to be multiplexed for LANGUAGES (see above)
- cp $(OMFIN) $(DOCOMF)
- cp $(DESKTOPIN) $(DOCDESKTOP)
- sed -i 's/@VERSION@/$(VERSION)/g' $(DOCOMF)
- sed -i 's/@DATE@/$(DATE)/g' $(DOCOMF)
- sed -i 's/@TITLE@/$(TITLE)/g' $(DOCOMF)
- sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCOMF)
- sed -i 's/@VERSION@/$(VERSION)/g' $(DOCDESKTOP)
- sed -i 's/@DATE@/$(DATE)/g' $(DOCDESKTOP)
- sed -i 's/@TITLE@/$(TITLE)/g' $(DOCDESKTOP)
- sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCDESKTOP)
+# cp $(OMFIN) $(DOCOMF)
+# cp $(DESKTOPIN) $(DOCDESKTOP)
+# sed -i 's/@VERSION@/$(VERSION)/g' $(DOCOMF)
+# sed -i 's/@DATE@/$(DATE)/g' $(DOCOMF)
+# sed -i 's/@TITLE@/$(TITLE)/g' $(DOCOMF)
+# sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCOMF)
+# sed -i 's/@VERSION@/$(VERSION)/g' $(DOCDESKTOP)
+# sed -i 's/@DATE@/$(DATE)/g' $(DOCDESKTOP)
+# sed -i 's/@TITLE@/$(TITLE)/g' $(DOCDESKTOP)
+# sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCDESKTOP)
#
# Do the build...
#
+
rpmbuild -bb $(RPMFLAGS) \
$(DOCSPEC)
rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
Index: example-tutorial-de.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/example-tutorial-de.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- example-tutorial-de.xml 24 Dec 2005 16:43:05 -0000 1.3
+++ example-tutorial-de.xml 28 Dec 2005 00:43:25 -0000 1.4
@@ -5,10 +5,10 @@
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
-<!ENTITY BOOKNAME "example-tutorial">
-<!ENTITY BOOKVERSION "0.14"> <!-- change version here -->
-<!ENTITY BOOKDATE "2005-09-18"> <!-- change revision date here -->
-<!ENTITY BOOKID "&BOOKNAME;-&BOOKVERSION; (&BOOKDATE;)">
+<!ENTITY DOCNAME "example-tutorial">
+<!ENTITY DOCVERSION "0.14"> <!-- change version here -->
+<!ENTITY DOCDATE "2005-09-18"> <!-- change revision date here -->
+<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
<!ENTITY BUG-NUM "000000"> <!-- use this only while in draft stage -->
]>
18 years, 4 months
documentation-guide docs-tutorial-en.xml, 1.7, 1.8 docs-tutorial-zh_CN.xml, 1.2, 1.3 documentation-guide-en.xml, 1.22, 1.23 documentation-guide-zh_CN.xml, 1.2, 1.3
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32316
Modified Files:
docs-tutorial-en.xml docs-tutorial-zh_CN.xml
documentation-guide-en.xml documentation-guide-zh_CN.xml
Log Message:
Update to use new entity standards
Index: docs-tutorial-en.xml
===================================================================
RCS file: /cvs/docs/documentation-guide/docs-tutorial-en.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- docs-tutorial-en.xml 31 Aug 2004 15:45:53 -0000 1.7
+++ docs-tutorial-en.xml 28 Dec 2005 00:40:27 -0000 1.8
@@ -27,7 +27,7 @@
<!ENTITY VERSION "0.1"> <!-- change version of tutorial here -->
-<!ENTITY BOOKID "example-tutorial-&VERSION; (2003-07-07)"> <!-- change last modified date here -->
+<!ENTITY DOCID "example-tutorial-&VERSION; (2003-07-07)"> <!-- change last modified date here -->
<!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml">
Index: docs-tutorial-zh_CN.xml
===================================================================
RCS file: /cvs/docs/documentation-guide/docs-tutorial-zh_CN.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docs-tutorial-zh_CN.xml 17 Dec 2005 13:28:38 -0000 1.2
+++ docs-tutorial-zh_CN.xml 28 Dec 2005 00:40:27 -0000 1.3
@@ -15,7 +15,7 @@
<!ENTITY VERSION "0.1"> <!-- change version of tutorial here -->
-<!ENTITY BOOKID "example-tutorial-&VERSION; (2003-07-07)"> <!-- change last modified date here -->
+<!ENTITY DOCID "example-tutorial-&VERSION; (2003-07-07)"> <!-- change last modified date here -->
<!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml">
Index: documentation-guide-en.xml
===================================================================
RCS file: /cvs/docs/documentation-guide/documentation-guide-en.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- documentation-guide-en.xml 13 Dec 2005 21:56:24 -0000 1.22
+++ documentation-guide-en.xml 28 Dec 2005 00:40:27 -0000 1.23
@@ -9,7 +9,7 @@
<!ENTITY VERSION "0.2.6.3"> <!-- version for this document -->
-<!ENTITY BOOKID "documentation-guide-&VERSION; (2005-09-18)"> <!-- change date here and VERSION entity everytime a change is made-->
+<!ENTITY DOCID "documentation-guide-&VERSION; (2005-09-18)"> <!-- change date here and VERSION entity everytime a change is made-->
<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
Index: documentation-guide-zh_CN.xml
===================================================================
RCS file: /cvs/docs/documentation-guide/documentation-guide-zh_CN.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- documentation-guide-zh_CN.xml 17 Dec 2005 13:28:38 -0000 1.2
+++ documentation-guide-zh_CN.xml 28 Dec 2005 00:40:27 -0000 1.3
@@ -4,7 +4,7 @@
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-zh_CN.ent">
%FEDORA-ENTITIES-EN;
<!ENTITY VERSION "0.2.6.3">
-<!ENTITY BOOKID "documentation-guide-&VERSION; (2005-09-18)">
+<!ENTITY DOCID "documentation-guide-&VERSION; (2005-09-18)">
<!ENTITY INTRODUCTION SYSTEM "docs-intro-zh_CN.xml" >
<!ENTITY GETTINGFILES SYSTEM "docs-getting-files-zh_CN.xml" >
<!ENTITY GUIDELINES SYSTEM "docs-rh-guidelines-zh_CN.xml" >
18 years, 4 months
docs-common/common bugreporting-en.xml, 1.1, 1.2 bugreporting-it.xml, 1.1, 1.2 bugreporting-zh_CN.xml, 1.1, 1.2 legalnotice-content-en.xml, 1.2, 1.3 legalnotice-content-it.xml, 1.2, 1.3 legalnotice-content-ru.xml, 1.1, 1.2
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32277
Modified Files:
bugreporting-en.xml bugreporting-it.xml bugreporting-zh_CN.xml
legalnotice-content-en.xml legalnotice-content-it.xml
legalnotice-content-ru.xml
Log Message:
Use new entity nomenclature properly
Index: bugreporting-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/bugreporting-en.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bugreporting-en.xml 21 Aug 2005 13:27:00 -0000 1.1
+++ bugreporting-en.xml 28 Dec 2005 00:36:35 -0000 1.2
@@ -6,7 +6,7 @@
at &BZ-URL;. When you file your bug, select "&BZ-PROD;" as the
<systemitem>Product</systemitem>, and select the title of this document as
the <systemitem>Component</systemitem>. The version of this document is
- &BOOKID;.
+ &DOCID;.
</para>
<para>
Index: bugreporting-it.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/bugreporting-it.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bugreporting-it.xml 19 Nov 2005 20:22:35 -0000 1.1
+++ bugreporting-it.xml 28 Dec 2005 00:36:35 -0000 1.2
@@ -6,7 +6,7 @@
su &BZ-URL;. Quando invii il tuo errore, seleziona "&BZ-PROD;" come
<systemitem>Product</systemitem>, e seleziona il titolo di questo documento come
<systemitem>Component</systemitem>. La versione di questo documento ��
- &BOOKID;.
+ &DOCID;.
</para>
<para>
Index: bugreporting-zh_CN.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/bugreporting-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bugreporting-zh_CN.xml 10 Dec 2005 12:56:34 -0000 1.1
+++ bugreporting-zh_CN.xml 28 Dec 2005 00:36:35 -0000 1.2
@@ -2,7 +2,7 @@
<title>������������������</title>
<para>
- ������������������������������������������������ &BZ-URL; ������ &BZ; ��������������������������������������������������������������� "&BZ-PROD;" ������ <systemitem>Product</systemitem>(������)������������������������������������ <systemitem>Component</systemitem>(������)������������������������ &BOOKID;���
+ ������������������������������������������������ &BZ-URL; ������ &BZ; ��������������������������������������������������������������� "&BZ-PROD;" ������ <systemitem>Product</systemitem>(������)������������������������������������ <systemitem>Component</systemitem>(������)������������������������ &DOCID;���
</para>
<para>
Index: legalnotice-content-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- legalnotice-content-en.xml 31 Oct 2005 15:43:23 -0000 1.2
+++ legalnotice-content-en.xml 28 Dec 2005 00:36:35 -0000 1.3
@@ -25,7 +25,7 @@
</para>
<para>
- &BOOKID;
+ &DOCID;
</para>
<para>
Index: legalnotice-content-it.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-it.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- legalnotice-content-it.xml 24 Dec 2005 12:44:32 -0000 1.2
+++ legalnotice-content-it.xml 28 Dec 2005 00:36:35 -0000 1.3
@@ -25,7 +25,7 @@
</para>
<para>
- &BOOKID;
+ &DOCID;
</para>
<para>
Index: legalnotice-content-ru.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-ru.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- legalnotice-content-ru.xml 27 Nov 2005 13:12:01 -0000 1.1
+++ legalnotice-content-ru.xml 28 Dec 2005 00:36:35 -0000 1.2
@@ -53,7 +53,7 @@
</para>
<para>
- &BOOKID;
+ &DOCID;
</para>
<!-- Andrew Martynov 27-Nov-2005
18 years, 4 months
docs-common/packaging spec.xsl,1.5,1.6
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20371
Modified Files:
spec.xsl
Log Message:
Additional spec improvements
Index: spec.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spec.xsl 27 Dec 2005 14:23:19 -0000 1.5
+++ spec.xsl 27 Dec 2005 18:14:37 -0000 1.6
@@ -54,13 +54,13 @@
/bin/rm -rf $RPM_BUILD_ROOT
<xsl:for-each select="/rpm-info/titles/translation">
-%post <xsl:value-of select="@lang"/>
+%post <xsl:if test="@lang != 'en'"><xsl:value-of select="@lang"/></xsl:if>
/usr/bin/scrollkeeper-update || true
-%postun <xsl:value-of select="@lang"/>
+%postun <xsl:if test="@lang != 'en'"><xsl:value-of select="@lang"/></xsl:if>
/usr/bin/scrollkeeper-update || true
-%files <xsl:value-of select="@lang"/>
+%files <xsl:if test="@lang != 'en'"><xsl:value-of select="@lang"/></xsl:if>
%defattr(-, root, root, -)
</xsl:for-each>
18 years, 4 months
docs-common/packaging spec.xsl,1.4,1.5
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13189
Modified Files:
spec.xsl
Log Message:
Some improvements to make nicer, more Fedora compliant spec
Index: spec.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spec.xsl 26 Nov 2005 21:44:24 -0000 1.4
+++ spec.xsl 27 Dec 2005 14:23:19 -0000 1.5
@@ -20,22 +20,24 @@
Url: http://fedora.redhat.com/projects/docs
Source0: %{docbase}-%{version}.src.tar.gz
Source1: %{name}.desktop
-<xsl:for-each select="/rpm-info/titles/translation">
-Source<xsl:value-of select="position()+1" />: %{name}-<xsl:value-of select="@lang"/>.omf</xsl:for-each>
+<xsl:for-each select="/rpm-info/titles/translation">Source<xsl:value-of
+ select="position()+1" />: %{name}-<xsl:choose><xsl:when
+ test="@lang = 'en'">C</xsl:when><xsl:otherwise><xsl:value-of
+ select="@lang"/></xsl:otherwise></xsl:choose>.omf
+</xsl:for-each>
Group: Documentation
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: scrollkeeper >= 0.3.11
Requires: fedora-doc-common
BuildRequires: xmlto
+BuildRequires: kdelibs
%description
<xsl:value-of select="/rpm-info/titles/translation[@lang='en']/desc" />
-<xsl:for-each select="/rpm-info/titles/translation">
-%description <xsl:value-of select="@lang"/>
-<xsl:value-of select="desc"/>
-</xsl:for-each>
+<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en'">%description <xsl:value-of select="@lang"/>
+<xsl:value-of select="desc"/></xsl:if></xsl:for-each>
%prep
%setup -q -n %{docbase}-${version}
@@ -63,10 +65,9 @@
</xsl:for-each>
%changelog
-<xsl:for-each select="/rpm-info/changelog/revision">
-* <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:value-of select="author/@wholename"/> <<xsl:value-of select="author/@email"/>> - <xsl:value-of select="@version"/>
- <xsl:value-of select="details"/>
-</xsl:for-each>
+</xsl:if></xsl:for-each>
</xsl:template>
<xsl:template name="get-title">
18 years, 4 months
example-tutorial example-tutorial-en.xml, 1.17, 1.18 rpm-info.xml, 1.6, 1.7
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5368
Modified Files:
example-tutorial-en.xml rpm-info.xml
Log Message:
Adjust XML file to be consistent with new standards. Wow, I really need to get to updating the DocGuide soon. Also, fix an error I made in rpm-info.xml yesterday.
Index: example-tutorial-en.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/example-tutorial-en.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- example-tutorial-en.xml 27 Nov 2005 13:55:30 -0000 1.17
+++ example-tutorial-en.xml 26 Dec 2005 17:21:55 -0000 1.18
@@ -6,10 +6,10 @@
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
-<!ENTITY BOOKNAME "example-tutorial">
-<!ENTITY BOOKVERSION "0.14"> <!-- change version here -->
-<!ENTITY BOOKDATE "2005-09-18"> <!-- change revision date here -->
-<!ENTITY BOOKID "&BOOKNAME;-&BOOKVERSION; (&BOOKDATE;)">
+<!ENTITY DOCNAME "example-tutorial">
+<!ENTITY DOCVERSION "0.14"> <!-- change version here -->
+<!ENTITY DOCDATE "2005-09-18"> <!-- change revision date here -->
+<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
<!ENTITY BUG-NUM "000000"> <!-- use this only while in draft stage -->
<!ENTITY ARTICLE-INFO-EN SYSTEM "article-info-en.xml" >
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpm-info.xml 26 Dec 2005 04:04:53 -0000 1.6
+++ rpm-info.xml 26 Dec 2005 17:21:55 -0000 1.7
@@ -32,6 +32,7 @@
<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"/>
<details>Add revision history</details>
- <details lang="de">addierte Neuausgabengeschichte</revision>
+ <details lang="de">addierte Neuausgabengeschichte</details>
+ </revision>
</changelog>
</rpm-info>
18 years, 4 months
docs-common/packaging rpm-info.dtd,1.4,1.5
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13609/docs-common/packaging
Modified Files:
rpm-info.dtd
Log Message:
Need to provide function for langifying revision history
Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-info.dtd 27 Nov 2005 23:27:58 -0000 1.4
+++ rpm-info.dtd 26 Dec 2005 04:05:54 -0000 1.5
@@ -49,3 +49,4 @@
<!ATTLIST translator firstname CDATA #REQUIRED >
<!ELEMENT details (#PCDATA) >
+<!ATTLIST details lang CDATA "en" >
18 years, 4 months
example-tutorial rpm-info.xml,1.5,1.6
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13609/d
Modified Files:
rpm-info.xml
Log Message:
Need to provide function for langifying revision history
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpm-info.xml 24 Dec 2005 01:07:52 -0000 1.5
+++ rpm-info.xml 26 Dec 2005 04:04:53 -0000 1.6
@@ -32,6 +32,6 @@
<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"/>
<details>Add revision history</details>
- </revision>
+ <details lang="de">addierte Neuausgabengeschichte</revision>
</changelog>
</rpm-info>
18 years, 4 months