docs-common Makefile.common,1.129,1.130
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17952/docs-common
Modified Files:
Makefile.common
Log Message:
This change temporarily breaks building but will improve translation
overall. The rpm-info.xml should no longer contain any translations,
and should now be stored in the original language directory. It will
still be used to generate fdp-info.xml, and we will probably also
strip RPM information out of the DTD since we intend to use a standard
specfile for this purpose from here on out.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- Makefile.common 4 Aug 2006 02:57:12 -0000 1.129
+++ Makefile.common 5 Aug 2006 03:50:51 -0000 1.130
@@ -102,7 +102,7 @@
PRI_LANG= en
endif
ifeq "${RPMINFO}" ""
-RPMINFO = ${PWD}/rpm-info.xml
+RPMINFO = rpm-info.xml
endif
ifeq "${RPMPREP}" ""
RPMPREP=yes
@@ -684,12 +684,38 @@
#########################################################################
#########################################################################
+# The "${LANG}/rpm-info.xml" file contains the revision information for
+# the original DocBook source. We use it to generate the "fdp-info.xml"
+# file discussed in the next section.
+#
+define rpm-info_template
+${1}/${RPMINFO}:: po/${1}.po ${PRI_LANG}/${RPMINFO}
+ mkdir -p ${1}
+ ${XML2PO} ${XML2POFLAGS} -p po/${1}.po \
+ ${PRI_LANG}/${RPMINFO} >$$@
+
+clean::
+ ${RM} ${1}/${RPMINFO}
+
+help::
+ @printf ${TFMT} '${1}/${RPMINFO}' 'Make translated document revision info'
+endef
+
+# ${PRI_LANG}/${RPMINFO} must exist, only generate for OTHERS
+$(foreach L,${OTHERS},$(eval $(call rpm-info_template,${L})))
+# Make sure rpm-info is part of the document PO template
+$(foreach L,${LANGUAGES},$(eval XMLFILES-${L}+=${L}/${RPMINFO}))
+#
+#########################################################################
+
+
+#########################################################################
# The "${LANG}/fdp-info.xml" file contains the <articleinfo> or
# <bookinfo> stanza. It is automatically generated from data in the
# "rpm-info.xml" file whenever that file changes.
#
define fdp-info_template
-$(1)/fdp-info.xml:: $(RPMINFO)
+$(1)/fdp-info.xml:: ${1}/$(RPMINFO)
mkdir -p ${1}
LANG=$(1).UTF-8 ${XSLTPROC} --stringparam lang $(1) \
--stringparam fdpdir $(FDPDIR) \
@@ -697,7 +723,7 @@
doctype ${PRI_LANG}/$(DOCBASE).xml) \
--stringparam legalbase ${LEGALNOTICEBASE} \
${FDPDIR}/docs-common/packaging/bookinfo.xsl \
- $(RPMINFO) | \
+ ${1}/$(RPMINFO) | \
$(XMLFORMAT) $(XMLFOPTS) >$$@
clean::
17 years, 9 months
example-tutorial rpm-info.xml,1.24,NONE
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17952/example-tutorial
Removed Files:
rpm-info.xml
Log Message:
This change temporarily breaks building but will improve translation
overall. The rpm-info.xml should no longer contain any translations,
and should now be stored in the original language directory. It will
still be used to generate fdp-info.xml, and we will probably also
strip RPM information out of the DTD since we intend to use a standard
specfile for this purpose from here on out.
--- rpm-info.xml DELETED ---
17 years, 9 months
example-tutorial/en_US rpm-info.xml,NONE,1.1
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial/en_US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17952/example-tutorial/en_US
Added Files:
rpm-info.xml
Log Message:
This change temporarily breaks building but will improve translation
overall. The rpm-info.xml should no longer contain any translations,
and should now be stored in the original language directory. It will
still be used to generate fdp-info.xml, and we will probably also
strip RPM information out of the DTD since we intend to use a standard
specfile for this purpose from here on out.
--- NEW FILE rpm-info.xml ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE rpm-info SYSTEM "../../docs-common/packaging/rpm-info.dtd">
<rpm-info>
<colophon>
<worker email="Tommy.Reynolds(a)MegaCoder.com" firstname="Tommy" id="megacoder" initials="JTR" surname="Reynolds" wholename="Tommy Reynolds"/>
<worker email="info(a)thomasgier.de" firstname="Thomas" id="tomg" initials="TG" surname="Gier" wholename="Thomas Gier"/>
<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"/>
<worker firstname="Dimitris" surname="Glezos" email="dimitris(a)glezos.com" wholename="Dimitris Glezos" id="DimitrisGlezos" initials="DG"/>
</colophon>
<author worker="tcf"/>
<editor worker="stickster"/>
<translator worker="tomg"/>
<translator worker="DimitrisGlezos"/>
<license>
<rights>OPL</rights>
<version>1.0</version>
</license>
<copyright>
<year>2004</year>
<year>2005</year>
<year>2006</year>
<holder>Tommy Reynolds</holder>
<holder>Paul W. Frields</holder>
<holder>Dimitris Glezos</holder>
</copyright>
<title>Example Tutorial</title>
<desc>This is quite a feat.</desc>
<changelog order="newest-first">
<revision date="2006-03-02" number="0.14.2" role="doc">
<author worker="stickster"/>
<details>Moved per-doc entities, added offboard snippet to test entity inclusion across the board, and moved license to OPL.</details>
</revision>
<revision date="2006-01-21" number="0.14.1" role="doc">
<author worker="stickster"/>
<details>A shameless bump to test prettyprinting</details>
</revision>
<revision date="Fri Jan 6 2006" number="2" role="rpm">
<author worker="stickster"/>
<details>A later RPM release</details>
</revision>
<revision date="Thu Dec 29 2005" number="1" role="rpm">
<author worker="stickster"/>
<details>A matching RPM release</details>
</revision>
<revision date="2005-12-29" number="0.14" role="doc">
<author worker="stickster"/>
<details>Make sure version matches what's in DOCVERSION</details>
</revision>
<revision date="2005-12-28" number="0.13.1" role="doc">
<author worker="stickster"/>
<details>Minor changes for testing purposes</details>
</revision>
<revision date="Sat Nov 26 2005" number="2" role="rpm">
<author worker="megacoder"/>
<details>Some rpm-only changes</details>
</revision>
<revision date="Fri Nov 25 2005" number="1" role="rpm">
<author worker="stickster"/>
<details>Initial RPM version</details>
</revision>
<revision date="2005-09-18" number="0.13" role="doc">
<author worker="stickster"/>
<details>Add revision history</details>
</revision>
</changelog>
</rpm-info>
17 years, 9 months
release-notes/devel README.fedora-release,1.2,1.3
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14668
Modified Files:
README.fedora-release
Log Message:
Remove bad advice.
Index: README.fedora-release
===================================================================
RCS file: /cvs/docs/release-notes/devel/README.fedora-release,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.fedora-release 1 Aug 2006 23:54:28 -0000 1.2
+++ README.fedora-release 5 Aug 2006 02:05:05 -0000 1.3
@@ -9,10 +9,8 @@
module -- also in Docs CVS -- in the same location.
2. Edit the fedora-release-notes.spec file and edit the "Release" tag
-and make a new entry in the %changelog. *DO NOT FORGET* to put
-%{?dist} at the end of the EVR (Epoch/Version/Release) on your
-%changelog entry's first line. (We don't define %dist in Docs CVS,
-but it *is* in the specfile, so the Core system should use it.)
+and make a new entry in the %changelog. There is no need to use
+%{?dist} since this is a single-release package.
3. Run 'make release-srpm' to build the SRPM. The contents of the
source tarball -- the ones not already in the top-level directory --
17 years, 9 months
release-notes/devel rpm-info.xml,1.5,1.6
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3476
Modified Files:
rpm-info.xml
Log Message:
Where did that goofy spacing come from? Oh well.
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/release-notes/devel/rpm-info.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpm-info.xml 16 Jul 2006 02:14:36 -0000 1.5
+++ rpm-info.xml 4 Aug 2006 22:39:36 -0000 1.6
@@ -4,9 +4,9 @@
<rpm-info>
<colophon>
- <worker id="fdp" wholename="Fedora Documentation Project" email="fedora-docs-list(a)redhat.com" surname="Project" firstname="Fedora Documentation" initials="fdp"/>
+ <worker id="fdp" wholename="Fedora Documentation Project" email="fedora-docs-list(a)redhat.com" surname="Project" firstname="Fedora Documentation" initials="fdp"/>
<worker id="quaid" wholename="Karsten Wade" email="kwade(a)redhat.com" surname="Wade" firstname="Karsten" initials="quaid"/>
- <worker email="Tommy.Reynolds(a)MegaCoder.com" firstname="Tommy" id="megacoder" initials="JTR" surname="Reynolds" wholename="Tommy Reynolds"/>
+ <worker email="Tommy.Reynolds(a)MegaCoder.com" firstname="Tommy" id="megacoder" initials="JTR" surname="Reynolds" wholename="Tommy Reynolds"/>
<worker id="PaulWFrields" wholename="Paul W. Frields" email="stickster(a)gmail.com" surname="Frields" firstname="Paul" othername="W." initials="PWF"/>
</colophon>
<author worker="fdp"/>
17 years, 9 months
release-notes/devel/xmlbeats files-map.txt,NONE,1.1
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/devel/xmlbeats
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3402/xmlbeats
Added Files:
files-map.txt
Log Message:
Move one more beat-related file that was hanging on for dear life
--- NEW FILE files-map.txt ---
# map of how XML files in the release-notes module interact
RELEASE-NOTES-*.xml
fdp-info-*.xml
../../docs-common/common/legalnotice-relnotes-*.xml
Welcome-*.xml
OverView-*.xml
../../docs-common/common/legalnotice-*.xml
Feedback-*.xml
Introduction-*.xml
Installer-*.xml
ArchSpecific-*.xml
ArchSpecificPPC-*.xml
ArchSpecificx86-*.xml
ArchSpecificx86_64-*.xml
Networking-*.xml
PackageNotes-*.xml
ServerTools-*.xml
PackageNotesJava-*.xml
Kernel-*.xml
Security-*.xml
SecuritySELinux-*.xml
DevelopmentTools-*.xml
DevelopmentToolsJava-*.xml
DevelopmentToolsGCC-*.xml
I18n-*.xml
Printing-*.xml
DatabaseServers-*.xml
Multimedia-*.xml
WebServers-*.xml
Samba-*.xml
Xorg-*.xml
Entertainment-*.xml
Legacy-*.xml
PackageChanges-*.xml
ProjectOverview-*.xml
Colophon-*.xml
# Unused, but maybe we should use/
BackwardsCompatibility-*.xml
Desktop-*.xml
FileSystems-*.xml
FileServers-*.xml
SystemDaemons-*.xml
17 years, 9 months
release-notes/devel files-map.txt,1.1,NONE
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3402
Removed Files:
files-map.txt
Log Message:
Move one more beat-related file that was hanging on for dear life
--- files-map.txt DELETED ---
17 years, 9 months
release-notes/devel fedora-release-notes.spec,1.13,1.14
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058
Modified Files:
fedora-release-notes.spec
Log Message:
Make changelog accurate
Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/docs/release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-release-notes.spec 4 Aug 2006 18:21:14 -0000 1.13
+++ fedora-release-notes.spec 4 Aug 2006 18:24:54 -0000 1.14
@@ -76,7 +76,7 @@
%changelog
* Fri Aug 4 2006 Paul W. Frields <stickster(a)gmail.com> - 5.91-7
-- Put rendered HTML in proper directory
+- Put About document in proper directory
* Wed Aug 2 2006 Jesse Keating <jkeating(a)redhat.com> - 5.91-6
- bump
17 years, 9 months
release-notes/devel fedora-release-notes.spec, 1.12, 1.13 about-fedora.omf, 1.2, 1.3
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21938
Modified Files:
fedora-release-notes.spec about-fedora.omf
Log Message:
Put rendered HTML in its own directory, and fix OMF accordingly. Push new 5.91-7
Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/docs/release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fedora-release-notes.spec 2 Aug 2006 18:28:42 -0000 1.12
+++ fedora-release-notes.spec 4 Aug 2006 18:21:14 -0000 1.13
@@ -1,6 +1,6 @@
Name: fedora-release-notes
Version: 5.91
-Release: 6
+Release: 7
Summary: Release Notes for Fedora Core %{version}
URL: http://fedoraproject.org/wiki/Docs/Beats
@@ -48,7 +48,7 @@
for F in RELEASE-NOTES-*.html; do
install -m 755 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$F
done
-find about/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_defaultdocdir}/fedora-release-%{version}/{} \;
+find about/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_defaultdocdir}/fedora-release-notes-%{version}/{} \;
install -m 644 -D about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes/about-fedora.omf
install -m 644 -D about-gnome.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
@@ -69,12 +69,15 @@
%files
%defattr(-,root,root,-)
%{_defaultdocdir}/HTML
-%{_defaultdocdir}/fedora-release-%{version}/about
+%{_defaultdocdir}/fedora-release-notes-%{version}/about
%{_datadir}/applications/about-fedora.desktop
%{_datadir}/omf/fedora-release-notes/about-fedora.omf
%changelog
+* Fri Aug 4 2006 Paul W. Frields <stickster(a)gmail.com> - 5.91-7
+- Put rendered HTML in proper directory
+
* Wed Aug 2 2006 Jesse Keating <jkeating(a)redhat.com> - 5.91-6
- bump
Index: about-fedora.omf
===================================================================
RCS file: /cvs/docs/release-notes/devel/about-fedora.omf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- about-fedora.omf 16 Jul 2006 21:10:09 -0000 1.2
+++ about-fedora.omf 4 Aug 2006 18:21:14 -0000 1.3
@@ -14,9 +14,9 @@
About Fedora
</title>
<date>
- 2006-02-14
+ @DATE@
</date>
- <version identifier="5.91" date="@DATE@" description="Fedora Core @RELEASE@"/>
+ <version identifier="@RELEASE@" date="@DATE@" description="Fedora Core @RELEASE@"/>
<subject category="General|Linux|Distributions|Other"/>
<description>
Describes Fedora Core, the Fedora Project, and how you can help.
@@ -25,7 +25,7 @@
About
</type>
<format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.4//EN"/>
- <identifier url="file:///usr/share/doc/fedora-release-@RELEASE@/about/C/about-fedora.xml"/>
+ <identifier url="file:///usr/share/doc/fedora-release-notes-@RELEASE@/about/C/about-fedora.xml"/>
<language code="C"/>
<relation seriesid="7a5d3ea2-2a1e-11da-86a3-8ea47a4bb227"/>
<rights type="OPL" license="http://opencontent.org/openpub/" license.version="1.0"/>
17 years, 9 months
docs-common Makefile.common,1.128,1.129
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4554
Modified Files:
Makefile.common
Log Message:
Need to make sure that tags are valid! Plus, showvars is useful here
for troubleshooting.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- Makefile.common 4 Aug 2006 02:43:57 -0000 1.128
+++ Makefile.common 4 Aug 2006 02:57:12 -0000 1.129
@@ -212,13 +212,22 @@
# will prevent repetitive tagging without the user making use of
# TAG_OPTS. I'd say that encourages people to Do The Right Thing by
# changing version numbers where necessary. (PWF)
-TAG?=${DOCBASE}-$(shell version doc)
+TAG_NAME ?= $(shell echo ${DOCBASE} | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
+TAG_VERSION ?= $(shell version doc | sed s/\\\./_/g)
+TAG?=${TAG_NAME}-${TAG_VERSION}
tag::
cvs tag ${TAG_OPTS} -c ${TAG}
@echo "Tagged with: ${TAG}"
@echo
+showvars::
+ @echo "TAG_NAME=${TAG_NAME}"
+ @echo "TAG_VERSION=${TAG_VERSION}"
+ @echo "TAG_RELEASE=${TAG_RELEASE}"
+ @echo "TAG=${TAG}"
+ @echo "### (Tag vars do not necessarily reflect CVS status)"
+
help::
@printf ${TFMT} 'tag' 'Tag this directory with the packaging NVR'
17 years, 9 months