docs-commits December 2005

docs-commits@lists.fedoraproject.org

1 participants
125 discussions

example-tutorial Makefile,1.24,1.25
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29842/example-tutorial Modified Files: Makefile Log Message: Rebuilding docs offline from SRPM now works too Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile 30 Dec 2005 07:10:10 -0000 1.24 +++ Makefile 30 Dec 2005 16:56:39 -0000 1.25 @@ -54,6 +54,11 @@ # 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 "_srcrpmdir $(PWD)" --define "_specdir $(PWD)" --define "fdpdir $(FDPDIR)" + +SPECFILE=$(PWD)/fedora-doc-$(DOCBASE).spec +ifeq (${RPMDEBUG},1) +RPMDFLAG = -vv +endif ###################################################### @@ -61,7 +66,7 @@ ${RM} -rf fedora-doc-$(DOCBASE)*.rpm ${RM} -rf $(DOCBASE)-$(VERSION)*.src.tar.gz ${RM} -rf BUILD/ $(DOCBASE)-$(VERSION)/ - ${RM} -f *omf *desktop *spec + ${RM} -f *omf *desktop $(SPECFILE) ${RM} -f fdp-info-*.xml sed -i 's@^$ *[^<]*&FDP-INFO;.*$@\<!-- \1 - DO NOT REMOVE THIS COMMENT --\>@g' $(DOCBASE)-*.xml @@ -83,7 +88,7 @@ spec:: $(XSLTPROC) ../docs-common/packaging/spec.xsl rpm-info.xml > \ - fedora-doc-$(DOCBASE).spec + $(SPECFILE) gnome.desktop:: @@ -134,13 +139,18 @@ src-tarball:: $(DOCBASE)-$(VERSION).src.tar.gz -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 +package-prep:: +# This keeps things tidier when looking at results mkdir -p BUILD - rpmbuild -ba $(RPMFLAGS) fedora-doc-$(DOCBASE).spec - rpmbuild --clean --rmsource $(RPMFLAGS) fedora-doc-$(DOCBASE).spec - rm -rf BUILD + +i386 ppc x86_64 noarch:: src-tarball package-prep spec +# Capture all arch since package is noarch anyway + rpmbuild -bb $(RPMDFLAG) $(RPMFLAGS) $(SPECFILE) + +srpm:: src-tarball package-prep spec + rpmbuild -bs $(RPMDFLAG) $(RPMFLAGS) $(SPECFILE) + +rpm:: src-tarball package-prep spec noarch srpm showvars::

1 0

docs-common/packaging spec.xsl,1.11,1.12
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29842/docs-common/packaging Modified Files: spec.xsl Log Message: Rebuilding docs offline from SRPM now works too Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- spec.xsl 30 Dec 2005 16:26:33 -0000 1.11 +++ spec.xsl 30 Dec 2005 16:56:33 -0000 1.12 @@ -8,10 +8,10 @@ <xsl:param name="lang" select="'en'" /> <xsl:param name="docbase" select="'example-tutorial'" /> -<xsl:template match="/"> -# Fedora Documentation Specfile +<xsl:template match="/"># Fedora Documentation Specfile %define docbase <xsl:value-of select="$docbase"/> -%{!?fdpdir:%{expand:%%define localbuild 1;%%define fdpdir %{_datadir}/fedora/doc}} +%{!?fdpdir:%define localbuild 1} +%{!?fdpdir:%define fdpdir %{_datadir}/fedora/doc} Summary: Fedora Documentation: %{docbase} Name: fedora-doc-%{docbase} @@ -59,7 +59,7 @@ %build -make html FDPDIR=%{fdpdir} HTMLCSSEXTRA="" +make html FDPDIR=%{fdpdir} %{!?localbuild:HTMLCSSEXTRA=""} <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 \

1 0

docs-common/packaging spec.xsl,1.10,1.11
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29222/docs-common/packaging Modified Files: spec.xsl Log Message: A little remaining cleanup Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- spec.xsl 30 Dec 2005 07:11:22 -0000 1.10 +++ spec.xsl 30 Dec 2005 16:26:33 -0000 1.11 @@ -59,7 +59,7 @@ %build -make html FDPDIR=%{fdpdir} +make html FDPDIR=%{fdpdir} HTMLCSSEXTRA="" <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 \

1 0

docs-common Makefile,1.4,1.5
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: pfrields Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29222/docs-common Modified Files: Makefile Log Message: A little remaining cleanup Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 28 Dec 2005 20:02:13 -0000 1.4 +++ Makefile 30 Dec 2005 16:26:27 -0000 1.5 @@ -31,6 +31,7 @@ clean: rm -rf $(DOCBASE)*.rpm + rm -rf $(PWD)/rpmbuild update: clean cvs update @@ -40,10 +41,13 @@ # Make RPM-compliant tarball of source XML and other stuff mkdir $(DOCBASE)-$(RELEASE) find . -maxdepth 1 -type d $ \ + -name 'bin' -o \ -name 'common' -o \ -name 'css' -o \ + -name 'images' -o \ -name 'packaging' -o \ - -name 'stylesheet-images' $ | xargs -i \ + -name 'stylesheet-images' -o \ + -name 'xsl' \) | xargs -i \ find {} -maxdepth 1 -type f ! $ \ -name '.*' -o -name '*~' -o \ -name '*.svg' -o -name '*.eps' $ | \

1 0

docs-common/packaging rpm-info.dtd,1.9,1.10
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: jtr Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23476/docs-common/packaging Modified Files: rpm-info.dtd Log Message: Revert <holder> change to #PCDATA, to accomodate corporate ownership of copyright. Index: rpm-info.dtd =================================================================== RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rpm-info.dtd 30 Dec 2005 06:04:39 -0000 1.9 +++ rpm-info.dtd 30 Dec 2005 13:39:02 -0000 1.10 @@ -9,8 +9,7 @@ <!ELEMENT copyright (year,holder+) > <!ELEMENT year (#PCDATA) > -<!ELEMENT holder EMPTY > -<!ATTLIST holder worker IDREF #REQUIRED > +<!ELEMENT holder (#PCDATA) > <!ELEMENT titles (translation+) >

1 0

example-tutorial rpm-info.xml,1.12,1.13
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: jtr Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23476/example-tutorial Modified Files: rpm-info.xml Log Message: Revert <holder> change to #PCDATA, to accomodate corporate ownership of copyright. Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rpm-info.xml 30 Dec 2005 02:45:01 -0000 1.12 +++ rpm-info.xml 30 Dec 2005 13:38:56 -0000 1.13 @@ -18,7 +18,7 @@ <copyright> <year>2003, 2004, 2005</year>  - <holder worker="tcf"/> + <holder>Tammy Fox</holder> </copyright> <titles> <translation lang="en">

1 0

docs-common/packaging fedora-doc-common.spec, 1.4, 1.5 khelpcenter-plugin.xsl, 1.2, 1.3 spec.xsl, 1.9, 1.10
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11891/packaging Modified Files: fedora-doc-common.spec khelpcenter-plugin.xsl spec.xsl Log Message: Holy smoke, it REALLY works! Index: fedora-doc-common.spec =================================================================== RCS file: /cvs/docs/docs-common/packaging/fedora-doc-common.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-doc-common.spec 28 Dec 2005 20:02:21 -0000 1.4 +++ fedora-doc-common.spec 30 Dec 2005 07:11:22 -0000 1.5 @@ -31,6 +31,17 @@ %install rm -rf $RPM_BUILD_ROOT +install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/ +for i in xmlformat xmldiff copy-figs bulkbuild tidy-bowl +do + install -m 755 $RPM_BUILD_DIR/%{name}-%{release}/bin/${i} \ + $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/ +done +for i in xmlformat-fdp.conf xmldiff.pl active +do + install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/bin/${i} \ + $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/ +done install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/common/ install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/common/*.{xml,ent} \ $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/common/ @@ -47,6 +58,12 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/ install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/packaging/*.{xsl,dtd} \ $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/ +install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/xsl/ +install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/xsl/* \ + $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/xsl/ +install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/images/ +install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/images/* \ + $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/images/ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/packaging/khelpcenter-fdp.directory $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/Makefile.common \ @@ -61,10 +78,13 @@ %defattr(-, root, root,-) %docdir %{_datadir}/fedora/doc/docs-common/common/ %{_datadir}/fedora/doc/docs-common/Makefile.common +%{_datadir}/fedora/doc/docs-common/bin/* %{_datadir}/fedora/doc/docs-common/common/* %{_datadir}/fedora/doc/docs-common/css/* +%{_datadir}/fedora/doc/docs-common/images/* %{_datadir}/fedora/doc/docs-common/packaging/* %{_datadir}/fedora/doc/docs-common/stylesheet-images/* +%{_datadir}/fedora/doc/docs-common/xsl/* %{_datadir}/apps/khelpcenter/plugins/Fedora/.directory %{_sysconfdir}/xdg/menus/applications-merged/* Index: khelpcenter-plugin.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/khelpcenter-plugin.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- khelpcenter-plugin.xsl 29 Dec 2005 22:37:32 -0000 1.2 +++ khelpcenter-plugin.xsl 30 Dec 2005 07:11:22 -0000 1.3 @@ -9,7 +9,7 @@ <xsl:param name="docbase" select="'example-tutorial'" /> <xsl:template match="/">[Desktop Entry] -DocPath=help:/<xsl:value-of select="$docbase"/>/index.html +DocPath=help:/fedora-doc-<xsl:value-of select="$docbase"/>/index.html Name=<xsl:value-of select="/rpm-info/titles/translation[@lang='en']/title"/> <xsl:for-each select="/rpm-info/titles/translation">Name[<xsl:value-of Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- spec.xsl 29 Dec 2005 22:37:32 -0000 1.9 +++ spec.xsl 30 Dec 2005 07:11:22 -0000 1.10 @@ -11,6 +11,7 @@ <xsl:template match="/"> # Fedora Documentation Specfile %define docbase <xsl:value-of select="$docbase"/> +%{!?fdpdir:%{expand:%%define localbuild 1;%%define fdpdir %{_datadir}/fedora/doc}} Summary: Fedora Documentation: %{docbase} Name: fedora-doc-%{docbase} @@ -33,7 +34,10 @@ Requires: scrollkeeper >= 0.3.11 Requires: fedora-doc-common BuildRequires: xmlto -BuildRequires: kdelibs +BuildRequires: kdelibs +# Used if builder does not specify common files locally +%{?localbuild:%{expand:BuildRequires: fedora-doc-common}} + %description <xsl:value-of select="/rpm-info/titles/translation[@lang='en']/desc" /> @@ -47,30 +51,81 @@ %prep %setup -q -n %{docbase}-%{version} -for i in $RPM_BUILD_DIR/%{docbase}-%{version}/{%{docbase}*.xml,Makefile} +#export GLOBIGNORE=rpm-info.xml +for i in $RPM_BUILD_DIR/%{docbase}-%{version}/{*.xml,Makefile} do - %{__sed} -i 's;../docs-common;../../../docs-common;' "$i" + %{__sed} -i 's;\.\./docs-common;%{fdpdir}/docs-common;g' "$i" done %build -make html -# /bin/rm -r $RPM_BUILD_ROOT -# /usr/bin/install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/omf/%{name} +make html FDPDIR=%{fdpdir} +<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 \ + %{docbase}-<xsl:value-of select="@lang"/>.xml +</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>; do + install -d -m 755 "$DIR" +done +export GLOBIGNORE=rpm-info.xml +desktop-file-install --vendor fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora \ + %{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"/>.xml $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}/{} +popd +</xsl:for-each> + %clean /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> /usr/bin/scrollkeeper-update || true %postun <xsl:if test="@lang != 'en'"><xsl:value-of select="@lang"/></xsl:if> /usr/bin/scrollkeeper-update || true +</xsl:for-each> -%files <xsl:if test="@lang != 'en'"><xsl:value-of select="@lang"/></xsl:if> +%files %defattr(-, root, root, -) -</xsl:for-each> +%{_datadir}/fedora/doc/fedora-doc-%{docbase}/C/* +%{_datadir}/applications/*.desktop +%{_datadir}/applications/kde/*.desktop +%{_datadir}/apps/khelpcenter/plugins/Fedora/*.desktop +%{_datadir}/omf/fedora-doc-%{docbase}/fedora-doc-%{docbase}-C.omf +%{_docdir}/HTML/en/fedora-doc-%{docbase}/* + + +<xsl:for-each select="/rpm-info/titles/translation"><xsl:if test="@lang != 'en'"> +%files <xsl:value-of select="@lang"/> +%defattr(-, root, root, -) +%{_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}/* +</xsl:if></xsl:for-each> + %changelog <xsl:for-each select="/rpm-info/changelog/revision"><xsl:if

1 0

example-tutorial Makefile,1.23,1.24
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11841 Modified Files: Makefile Log Message: Holy smoke, it finally works! Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile 29 Dec 2005 22:39:06 -0000 1.23 +++ Makefile 30 Dec 2005 07:10:10 -0000 1.24 @@ -53,7 +53,7 @@ ###################################################### # 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 "_srcrpmdir $(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)" --define "fdpdir $(FDPDIR)" ###################################################### @@ -68,7 +68,11 @@ define fdp-info_template fdp-info-$(1).xml:: - ${XSLTPROC} --stringparam doctype $(shell ${XSLTPROC} ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) --stringparam lang $(1) ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > fdp-info-$(1).xml + ${XSLTPROC} --stringparam doctype $(shell ${XSLTPROC} \ + ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) \ + --stringparam lang $(1) ../docs-common/packaging/bookinfo.xsl \ + rpm-info.xml | exec $(XMLFORMAT) $(XMLFOPTS) > \ + fdp-info-$(1).xml sed -i 's@@\&FDP-INFO;@g' $(DOCBASE)-$(1).xml endef @@ -99,6 +103,7 @@ define omf_template omf-$(1):: +# xmllint is part of libxml2 ${XSLTPROC} ../docs-common/packaging/omf.xsl rpm-info.xml | \ $(XMLFORMAT) $(XMLFOPTS) > fedora-doc-$(DOCBASE)-$(1).omf endef @@ -112,14 +117,19 @@ $(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 '#*' \ - -o -name '$(DOCBASE)*.tar.gz' -o -name '.*' $ \ + 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)*' $ \ + -o -name 'CVS' \ + -o -name '*~' \ + -o -name '$(DOCBASE)*' \) \ | cpio -pamdv $(DOCBASE)-$(VERSION) tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/ rm -rf $(DOCBASE)-$(VERSION)/ + sed -i 's@^$ *[^<]*&FDP-INFO;.*$@\<!-- \1 - DO NOT REMOVE THIS COMMENT --\>@g' $(DOCBASE)-*.xml src-tarball:: $(DOCBASE)-$(VERSION).src.tar.gz

1 0

docs-common/packaging bookinfo.xsl,1.4,1.5
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10063/docs-common/packaging Modified Files: bookinfo.xsl Log Message: Properly process langified revision details Index: bookinfo.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bookinfo.xsl 29 Dec 2005 22:37:32 -0000 1.4 +++ bookinfo.xsl 30 Dec 2005 06:11:20 -0000 1.5 @@ -54,9 +54,11 @@ <xsl:value-of select="author/@initials"/> </xsl:element> <xsl:element name="revdescription"> - <xsl:element name="para"> - <xsl:value-of select="details"/> - </xsl:element> + <xsl:for-each select="details[@lang = $lang]"> + <xsl:element name="para"> + <xsl:apply-templates/> + </xsl:element> + </xsl:for-each> </xsl:element> </xsl:element> </xsl:for-each>

1 0

docs-common/packaging rpm-info.dtd,1.8,1.9
by fedora-docs-commits＠redhat.com 30 Dec '05

30 Dec '05

Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10007/docs-common/packaging Modified Files: rpm-info.dtd Log Message: I know there's a word for this somewhere... Index: rpm-info.dtd =================================================================== RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rpm-info.dtd 30 Dec 2005 02:45:07 -0000 1.8 +++ rpm-info.dtd 30 Dec 2005 06:04:39 -0000 1.9 @@ -37,8 +37,8 @@ <!ATTLIST worker email CDATA #REQUIRED > <!ATTLIST worker surname CDATA #REQUIRED > <!ATTLIST worker firstname CDATA #REQUIRED > +<!ATTLIST worker othername CDATA #IMPLIED > <!ATTLIST worker initials CDATA #REQUIRED > -<!ATTLIST worker othername CDATA "" > <!ELEMENT author EMPTY > <!ATTLIST author worker IDREF #REQUIRED > @@ -46,7 +46,6 @@ <!ELEMENT editor EMPTY > <!ATTLIST editor worker IDREF #REQUIRED > - <!ELEMENT translator EMPTY > <!ATTLIST translator worker IDREF #REQUIRED >

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

docs-commits December 2005