docs-common/packaging fedora-doc-common.spec,1.14,1.15
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1387/packaging
Modified Files:
fedora-doc-common.spec
Log Message:
Issue new fedora-doc-common revision to include all changes finally checked in today :-)
Index: fedora-doc-common.spec
===================================================================
RCS file: /cvs/docs/docs-common/packaging/fedora-doc-common.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fedora-doc-common.spec 23 Feb 2006 23:06:41 -0000 1.14
+++ fedora-doc-common.spec 11 Apr 2006 20:29:18 -0000 1.15
@@ -6,9 +6,9 @@
Summary: Fedora Documentation common files
Name: fedora-doc-common
# To be defined in Makefile
-Version: 0.3.2
+Version: 0.4.1
Release: 1
-License: OPL
+License: Distributable
Url: http://fedora.redhat.com/projects/docs/
Source0: fedora-doc-common-%version.src.tar.gz
Group: Documentation
@@ -44,8 +44,9 @@
install -m 644 bin/${i} \
%{docs_common}/bin/
done
-install -d -m 755 %{docs_common}/common/
+install -d -m 755 %{docs_common}/common/entities
install -m 644 common/*.{xml,ent} %{docs_common}/common/
+install -m 644 common/entities/* %{docs_common}/common/entities/
install -d -m 755 %{docs_common}/css/
install -m 644 css/* %{docs_common}/css/
install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications-merged/
@@ -74,10 +75,16 @@
%files
%defattr(-, root, root,-)
%{_datadir}/fedora/
-%{_datadir}/apps/khelpcenter/plugins/Fedora/
+%{_datadir}/apps/khelpcenter/
%{_sysconfdir}/xdg/menus/applications-merged/*
%changelog
+* Tue Apr 11 2006 Paul W. Frields <stickster(a)gmail.com> - 0.4.1-1
+- Fix building routines to accommodate new entity parsing functions
+
+* Sat Mar 11 2006 Paul W. Frields <stickster(a)gmail.com> - 0.4.0-1
+- Updated build processes for proper locale generation
+
* Tue Feb 14 2006 Paul W. Frields <stickster(a)gmail.com> - 0.3.2-1
- Accommodate users' local %_build_name_fmt
- Improve readability with macro in spec file
18 years
docs-common/packaging spec.xsl,1.20,1.21
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1363/packaging
Modified Files:
spec.xsl
Log Message:
Spec file changes to re-enable building. This works for just about everything I've tried, provided it has been fixed to support en_US locale notation. Encourage people to try this out to find breakage.
Index: spec.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- spec.xsl 26 Feb 2006 22:44:36 -0000 1.20
+++ spec.xsl 11 Apr 2006 20:26:59 -0000 1.21
@@ -5,7 +5,7 @@
<!-- Note: do not indent this file! Any whitespace here
will be reproduced in the output -->
- <xsl:param name="lang" select="'en'" />
+ <xsl:param name="lang" select="'en_US'" />
<xsl:param name="docbase" select="'example-tutorial'" />
<xsl:template match="/"># Fedora Documentation Specfile
@@ -25,7 +25,7 @@
Source3: %{name}-khelp.desktop
<xsl:for-each select="/rpm-info/titles/translation">Source<xsl:value-of
select="position()+3" />: %{name}-<xsl:choose><xsl:when
- test="@lang = 'en'">C</xsl:when><xsl:otherwise><xsl:value-of
+ test="@lang = 'en_US'">C</xsl:when><xsl:otherwise><xsl:value-of
select="@lang"/></xsl:otherwise></xsl:choose>.omf
</xsl:for-each>
Group: Documentation
@@ -39,40 +39,51 @@
%{?localbuild:%{expand:BuildRequires: fedora-doc-common}}
%description
-<xsl:value-of select="/rpm-info/titles/translation[@lang='en']/desc" />
+<xsl:value-of select="/rpm-info/titles/translation[@lang='en_US']/desc" />
-<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en'">%package <xsl:value-of select="@lang"/>
+<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en_US'">%package <xsl:value-of select="@lang"/>
Summary: Fedora Documentation - <xsl:value-of select="title"/>
Group: Documentation
%description <xsl:value-of select="@lang"/>
<xsl:value-of select="desc"/></xsl:if>
-
</xsl:for-each>
%prep
%setup -q -n %{docbase}-%{version}
-#export GLOBIGNORE=rpm-info.xml
+
+
+%build
+export FDPDIR=%{fdpdir}
+# Remove hard-coded FDPDIR locations from CVS docs
for i in $RPM_BUILD_DIR/%{docbase}-%{version}/{*.xml,*/*.xml,Makefile}
do
%{__sed} -i 's;\(\.\./\)\{1,\}docs-common;%{fdpdir}/docs-common;g' "$i"
done
-
-
-%build
-make html FDPDIR=%{fdpdir} %{!?localbuild:DRAFT="no"}
+eval `make showvars | grep '\(PRI_LANG\|OTHERS\|DOC_ENTITIES\)'`
+# Create entities (.ent files)
+mkdir po/CVS # This is to make the Makefile.common happy
+for i in $PRI_LANG $OTHERS ; do
+ make set-locale-$i
+ for j in $DOC_ENTITIES ; do
+ make ${i}/${j}.ent
+ done
+done
<xsl:for-each select="/rpm-info/titles/translation">
-mkdir kde-<xsl:value-of select="@lang"/>
-meinproc --output kde-<xsl:value-of select="@lang"/>/index.docbook \
- --cache kde-<xsl:value-of select="@lang"/>/index.cache.bz2 \
- <xsl:value-of select="@lang"/>/%{docbase}.xml
+LANG=<xsl:value-of select="@lang"/>.UTF-8 xmllint --xinclude <xsl:value-of select="@lang"/>/%{docbase}.xml > <xsl:value-of select="@lang"/>/%{docbase}.xml-parsed || :
+# After XInclude, may need to scour FDPDIR misdirections again
+%{__sed} 's;\(\.\./\)\{1,\}docs-common;%{fdpdir}/docs-common;g' <xsl:value-of select="@lang"/>/%{docbase}.xml-parsed > <xsl:value-of select="@lang"/>/%{docbase}.xml
+LANG=<xsl:value-of select="@lang"/>.UTF-8 xmlto -o %{docbase}-<xsl:value-of select="@lang"/> \
+ -x %{fdpdir}/docs-common/xsl/main-html.xsl html \
+ <xsl:value-of select="@lang"/>/%{docbase}.xml
+make khelp
</xsl:for-each>
%install
for DIR in $RPM_BUILD_ROOT%{_datadir}/applications/kde \
$RPM_BUILD_ROOT%{_datadir}/apps/khelpcenter/plugins/Fedora \
$RPM_BUILD_ROOT%{_datadir}/omf/fedora-doc-%{docbase} \
- <xsl:for-each select="/rpm-info/titles/translation">$RPM_BUILD_ROOT%{_docdir}/HTML/<xsl:value-of select="@lang"/>/fedora-doc-%{docbase} \
- $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:choose><xsl:when test="@lang = 'en'">C</xsl:when><xsl:otherwise><xsl:value-of select="@lang"/></xsl:otherwise></xsl:choose> \
+ <xsl:for-each select="/rpm-info/titles/translation">$RPM_BUILD_ROOT%{_docdir}/HTML/<xsl:choose><xsl:when test="@lang='en_US'">en</xsl:when><xsl:otherwise><xsl:value-of select="@lang"/></xsl:otherwise></xsl:choose>/fedora-doc-%{docbase} \
+ $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:choose><xsl:when test="@lang = 'en_US'">C</xsl:when><xsl:otherwise><xsl:value-of select="@lang"/></xsl:otherwise></xsl:choose> \
</xsl:for-each>; do
install -d -m 755 "$DIR"
done
@@ -83,14 +94,14 @@
%{SOURCE1}
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/kde
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/apps/khelpcenter/plugins/Fedora
-install -m 644 en/*.xml $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/C
-<xsl:for-each select="/rpm-info/titles/translation">install -m 644 %{SOURCE<xsl:value-of select="position()+3"/>} $RPM_BUILD_ROOT%{_datadir}/omf/fedora-doc-%{docbase}
-<xsl:if test="@lang != 'en'">install -m 644 <xsl:value-of select="@lang"/>/*-<xsl:value-of select="@lang"/>.xml $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:value-of select="@lang"/></xsl:if>
+<xsl:for-each select="/rpm-info/titles/translation">install -m 644 <xsl:value-of select="@lang"/>/*.{xml,ent} $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:choose><xsl:when test="@lang='en_US'">C</xsl:when><xsl:otherwise><xsl:value-of select="@lang"/></xsl:otherwise></xsl:choose>
+install -m 644 %{SOURCE<xsl:value-of select="position()+3"/>} $RPM_BUILD_ROOT%{_datadir}/omf/fedora-doc-%{docbase}
+<xsl:if test="@lang != 'en_US'">install -m 644 <xsl:value-of select="@lang"/>/*.{xml,ent} $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:value-of select="@lang"/></xsl:if>
pushd %{docbase}-<xsl:value-of select="@lang"/>
find . -type d | xargs -i \
- install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/HTML/<xsl:value-of select="@lang"/>/fedora-doc-%{docbase}/{}
-find . -type f | xargs -i \
- install -D -m 644 {} $RPM_BUILD_ROOT%{_docdir}/HTML/<xsl:value-of select="@lang"/>/fedora-doc-%{docbase}/{}
+ install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/HTML/<xsl:choose><xsl:when test="@lang='en_US'">en</xsl:when><xsl:otherwise><xsl:value-of select="@lang"/></xsl:otherwise></xsl:choose>/fedora-doc-%{docbase}/{}
+find -L . -type f | xargs -i \
+ install -D -m 644 {} $RPM_BUILD_ROOT%{_docdir}/HTML/<xsl:choose><xsl:when test="@lang='en_US'">en</xsl:when><xsl:otherwise><xsl:value-of select="@lang"/></xsl:otherwise></xsl:choose>/fedora-doc-%{docbase}/{}
popd
</xsl:for-each>
@@ -98,32 +109,29 @@
/bin/rm -rf $RPM_BUILD_ROOT
<xsl:for-each select="/rpm-info/titles/translation">
-%post <xsl:if test="@lang != 'en'"><xsl:value-of select="@lang"/></xsl:if>
+%post <xsl:if test="@lang != 'en_US'"><xsl:value-of select="@lang"/></xsl:if>
/usr/bin/scrollkeeper-update || true
-%postun <xsl:if test="@lang != 'en'"><xsl:value-of select="@lang"/></xsl:if>
+%postun <xsl:if test="@lang != 'en_US'"><xsl:value-of select="@lang"/></xsl:if>
/usr/bin/scrollkeeper-update || true
</xsl:for-each>
%files
%defattr(-, root, root, -)
-%dir %{_datadir}/fedora/doc/fedora-doc-%{docbase}
-%dir %{_datadir}/fedora/doc/fedora-doc-%{docbase}/C
-%{_datadir}/fedora/doc/fedora-doc-%{docbase}/C/*
+%{_datadir}/fedora/doc/fedora-doc-%{docbase}/
%{_datadir}/applications/*.desktop
%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/khelpcenter/plugins/Fedora/*.desktop
-%dir %{_datadir}/omf/fedora-doc-%{docbase}
-%{_datadir}/omf/fedora-doc-%{docbase}/fedora-doc-%{docbase}-C.omf
-%{_docdir}/HTML/en/fedora-doc-%{docbase}/*
+%{_datadir}/apps/khelpcenter/
+%{_datadir}/omf/fedora-doc-%{docbase}/
+%{_docdir}/HTML/en/fedora-doc-%{docbase}/
-<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en'">
+<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en_US'">
%files <xsl:value-of select="@lang"/>
%defattr(-, root, root, -)
%dir %{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:value-of select="@lang"/>
%{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:value-of select="@lang"/>/*
%{_datadir}/omf/fedora-doc-%{docbase}/fedora-doc-%{docbase}-<xsl:value-of select="@lang"/>.omf
-%{_docdir}/HTML/<xsl:value-of select="@lang"/>/fedora-doc-%{docbase}/*
+%{_docdir}/HTML/<xsl:choose><xsl:when test="@lang='en_US'">en</xsl:when><xsl:otherwise><xsl:value-of select="@lang"/></xsl:otherwise></xsl:choose>/fedora-doc-%{docbase}/*
</xsl:if></xsl:for-each>
%changelog
18 years
docs-common/packaging khelpcenter-fdp.directory,1.2,1.3
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1339/packaging
Modified Files:
khelpcenter-fdp.directory
Log Message:
Use a good icon, and change the name slightly to attract project attention
Index: khelpcenter-fdp.directory
===================================================================
RCS file: /cvs/docs/docs-common/packaging/khelpcenter-fdp.directory,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- khelpcenter-fdp.directory 4 Feb 2006 01:32:16 -0000 1.2
+++ khelpcenter-fdp.directory 11 Apr 2006 20:26:05 -0000 1.3
@@ -1,7 +1,7 @@
# Fedora Documentation for KHelpCenter
[KDE Desktop Entry]
-Name=Fedora
-Comment=Official Fedora Documentation
+Name=Fedora Documentation
DocPath=
+Icon=kmenu
X-DOC-Weight=-1500
18 years
docs-common/packaging omf.xsl,1.7,1.8
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1268/packaging
Modified Files:
omf.xsl
Log Message:
Fix locale to proper en_US notation, and correct filename
Index: omf.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/omf.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- omf.xsl 23 Feb 2006 23:06:41 -0000 1.7
+++ omf.xsl 11 Apr 2006 20:24:26 -0000 1.8
@@ -5,7 +5,7 @@
<!-- Note: do not indent this file! Any whitespace here
will be reproduced in the output -->
- <xsl:param name="lang" select="'en'" />
+ <xsl:param name="lang" select="'en_US'" />
<xsl:param name="docbase" select="'example-tutorial'" />
<xsl:template match="/">
@@ -34,15 +34,15 @@
</type>
<format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.2//EN"/>
<xsl:choose>
- <xsl:when test="$lang='en'">
- <identifier url="file:/usr/share/fedora/doc/fedora-doc-{$docbase}/C/{$docbase}-{$lang}.xml"/>
+ <xsl:when test="$lang='en_US'">
+ <identifier url="file:/usr/share/fedora/doc/fedora-doc-{$docbase}/C/{$docbase}.xml"/>
</xsl:when>
<xsl:otherwise>
- <identifier url="file:/usr/share/fedora/doc/fedora-doc-{$docbase}/{$lang}/{$docbase}-{$lang}.xml"/>
+ <identifier url="file:/usr/share/fedora/doc/fedora-doc-{$docbase}/{$lang}/{$docbase}.xml"/>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
- <xsl:when test="$lang='en'"><language code="C"/></xsl:when>
+ <xsl:when test="$lang='en_US'"><language code="C"/></xsl:when>
<xsl:otherwise><language code="$lang"/></xsl:otherwise>
</xsl:choose>
<relation seriesid="7a5d3ea2-2a1e-11da-86a3-8ea47a4bb227"/>
18 years
docs-common/packaging khelpcenter-plugin.xsl,1.3,1.4
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1199/packaging
Modified Files:
khelpcenter-plugin.xsl
Log Message:
Fix locale to proper en_US notation
Index: khelpcenter-plugin.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/khelpcenter-plugin.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- khelpcenter-plugin.xsl 30 Dec 2005 07:11:22 -0000 1.3
+++ khelpcenter-plugin.xsl 11 Apr 2006 20:23:39 -0000 1.4
@@ -5,12 +5,12 @@
<!-- Note: do not indent this file! Any whitespace here
will be reproduced in the output -->
- <xsl:param name="lang" select="'en'" />
+ <xsl:param name="lang" select="'en_US'" />
<xsl:param name="docbase" select="'example-tutorial'" />
<xsl:template match="/">[Desktop Entry]
DocPath=help:/fedora-doc-<xsl:value-of select="$docbase"/>/index.html
-Name=<xsl:value-of select="/rpm-info/titles/translation[@lang='en']/title"/>
+Name=<xsl:value-of select="/rpm-info/titles/translation[@lang='en_US']/title"/>
<xsl:for-each select="/rpm-info/titles/translation">Name[<xsl:value-of
select="@lang"/>]=<xsl:value-of select="title"/>
18 years
docs-common/packaging kde-desktop.xsl,1.2,1.3
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1130/packaging
Modified Files:
kde-desktop.xsl
Log Message:
Fix locale to proper en_US notation
Index: kde-desktop.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/kde-desktop.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-desktop.xsl 29 Dec 2005 22:37:32 -0000 1.2
+++ kde-desktop.xsl 11 Apr 2006 20:22:53 -0000 1.3
@@ -5,22 +5,22 @@
<!-- Note: do not indent this file! Any whitespace here
will be reproduced in the output -->
- <xsl:param name="lang" select="'en'" />
+ <xsl:param name="lang" select="'en_US'" />
<xsl:param name="docbase" select="'example-tutorial'" />
<xsl:template match="/">[Desktop Entry]
Encoding=UTF-8
Categories=X-Fedora-Documentation;
-Name=<xsl:value-of select="/rpm-info/titles/translation[@lang='en']/title"/>
+Name=<xsl:value-of select="/rpm-info/titles/translation[@lang='en_US']/title"/>
Exec=khelpcenter help:/fedora-doc-<xsl:value-of
select="$docbase"/>/index.html
-<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en'">Name[<xsl:value-of
+<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en_US'">Name[<xsl:value-of
select="@lang"/>]=<xsl:apply-templates
select="title"/></xsl:if></xsl:for-each>
<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang !=
- 'en'">Comment[<xsl:value-of select="@lang"/>]=<xsl:apply-templates
+ 'en_US'">Comment[<xsl:value-of select="@lang"/>]=<xsl:apply-templates
select="desc"/></xsl:if></xsl:for-each>
Icon=icon-documentation.png
18 years
docs-common/packaging gnome-desktop.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-serv1013/packaging
Modified Files:
gnome-desktop.xsl
Log Message:
Fix locale and one minor filename issue
Index: gnome-desktop.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/gnome-desktop.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-desktop.xsl 29 Dec 2005 22:37:32 -0000 1.4
+++ gnome-desktop.xsl 11 Apr 2006 20:21:13 -0000 1.5
@@ -5,29 +5,28 @@
<!-- Note: do not indent this file! Any whitespace here
will be reproduced in the output -->
- <xsl:param name="lang" select="'en'" />
+ <xsl:param name="lang" select="'en_US'" />
<xsl:param name="docbase" select="'example-tutorial'" />
<xsl:template match="/">[Desktop Entry]
Encoding=UTF-8
Categories=X-Fedora-Documentation;
-Name=<xsl:value-of select="/rpm-info/titles/translation[@lang='en']/title"/>
-GenericName=<xsl:value-of select="/rpm-info/titles/translation[@lang='en']/title"/>
+Name=<xsl:value-of select="/rpm-info/titles/translation[@lang='en_US']/title"/>
+GenericName=<xsl:value-of select="/rpm-info/titles/translation[@lang='en_US']/title"/>
Exec=gnome-help file:///usr/share/fedora/doc/fedora-doc-<xsl:value-of
- select="$docbase"/>/C/<xsl:value-of select="$docbase"/>-en.xml
-Comment=<xsl:value-of select="/rpm-info/titles/translation[@lang='en']/desc"/>
+ select="$docbase"/>/C/<xsl:value-of select="$docbase"/>.xml
+Comment=<xsl:value-of select="/rpm-info/titles/translation[@lang='en_US']/desc"/>
-<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en'">Name[<xsl:value-of
+<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en_US'">Name[<xsl:value-of
select="@lang"/>]=<xsl:apply-templates select="title"/></xsl:if></xsl:for-each>
<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang !=
- 'en'">Exec[<xsl:value-of select="@lang"/>]=gnome-help file:///usr/share/fedora/doc/fedora-doc-<xsl:value-of
+ 'en_US'">Exec[<xsl:value-of select="@lang"/>]=gnome-help file:///usr/share/fedora/doc/fedora-doc-<xsl:value-of
select="$docbase"/>/<xsl:value-of select="@lang"/>/<xsl:value-of
- select="$docbase"/>-<xsl:value-of
- select="@lang"/>.xml</xsl:if></xsl:for-each>
+ select="$docbase"/>.xml</xsl:if></xsl:for-each>
<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang !=
- 'en'">Comment[<xsl:value-of select="@lang"/>]=<xsl:apply-templates select="desc"/></xsl:if></xsl:for-each>
+ 'en_US'">Comment[<xsl:value-of select="@lang"/>]=<xsl:apply-templates select="desc"/></xsl:if></xsl:for-each>
Icon=icon-documentation.png
Terminal=false
18 years
docs-common/packaging bookinfo.xsl,1.21,1.22
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv883/packaging
Modified Files:
bookinfo.xsl
Log Message:
Fix locale to proper en_US notation
Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bookinfo.xsl 8 Mar 2006 02:56:33 -0000 1.21
+++ bookinfo.xsl 11 Apr 2006 20:19:26 -0000 1.22
@@ -66,8 +66,8 @@
</xsl:element>
</xsl:for-each>
</xsl:when>
- <xsl:when test="details[@lang = 'en']">
- <xsl:for-each select="details[@lang = 'en']">
+ <xsl:when test="details[@lang = 'en_US']">
+ <xsl:for-each select="details[@lang = 'en_US']">
<xsl:element name="para">
<xsl:apply-templates/>
</xsl:element>
18 years
docs-common Makefile,1.10,1.11
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv811
Modified Files:
Makefile
Log Message:
Don't forget the entities files now that we have them
Index: Makefile
===================================================================
RCS file: /cvs/docs/docs-common/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile 14 Feb 2006 22:50:42 -0000 1.10
+++ Makefile 11 Apr 2006 20:18:36 -0000 1.11
@@ -52,6 +52,7 @@
-name '*.svg' -o -name '*.eps' \) | \
cpio -pamdv $(DOCBASE)-$(VERSION)
find . -maxdepth 2 -type d \
+ -name 'entities' -o \
-name '2001' | xargs -i \
find {} -maxdepth 1 -type f | \
cpio -pamdv $(DOCBASE)-$(VERSION)
18 years
docs-common Makefile.common,1.109,1.110
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv756
Modified Files:
Makefile.common
Log Message:
Use fedora-doc-common location for all RPM building... it's just a good idea for now.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Makefile.common 11 Apr 2006 20:07:44 -0000 1.109
+++ Makefile.common 11 Apr 2006 20:18:03 -0000 1.110
@@ -129,7 +129,7 @@
#########################################################################
RPMFLAGS=--define "docbase $(DOCBASE)" \
--define "_topdir $(PWD)/rpm" \
- --define "fdpdir $(FDPDIR)"
+ --define "fdpdir /usr/share/fedora/doc"
SPECFILE=fedora-doc-$(DOCBASE).spec
18 years