example-tutorial Makefile,1.35,1.36
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15723
Modified Files:
Makefile
Log Message:
Include pt translation that has been added
Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile 23 Jul 2006 00:20:59 -0000 1.35
+++ Makefile 5 Aug 2006 13:22:22 -0000 1.36
@@ -17,7 +17,7 @@
#
DOCBASE = example-tutorial
PRI_LANG = en_US
-OTHERS = de el
+OTHERS = de el pt
# If ${DOC_ENTITIES} is defined, ${PRI_LANG}/${DOC_ENTITIES}.xml
# must contain a complete XML file conforming to the DTD located
# in the "docs-common/common/entities/entities.dtd" file. Do NOT
17 years, 10 months
example-tutorial/po example-tutorial.pot,1.6,1.7
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15683/po
Modified Files:
example-tutorial.pot
Log Message:
Update POT with new rpm-info content
Index: example-tutorial.pot
===================================================================
RCS file: /cvs/docs/example-tutorial/po/example-tutorial.pot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- example-tutorial.pot 2 Mar 2006 22:33:40 -0000 1.6
+++ example-tutorial.pot 5 Aug 2006 13:20:46 -0000 1.7
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-02 16:22-0600\n"
+"POT-Creation-Date: 2006-08-05 09:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -61,156 +61,274 @@
msgid "000000"
msgstr ""
+#: en_US/rpm-info.xml:18(rights)
+msgid "OPL"
+msgstr ""
+
+#: en_US/rpm-info.xml:19(version)
+msgid "1.0"
+msgstr ""
+
+#: en_US/rpm-info.xml:22(year)
+msgid "2003"
+msgstr ""
+
+#: en_US/rpm-info.xml:23(year)
+msgid "2004"
+msgstr ""
+
+#: en_US/rpm-info.xml:24(year)
+msgid "2005"
+msgstr ""
+
+#: en_US/rpm-info.xml:25(year)
+msgid "2006"
+msgstr ""
+
+#: en_US/rpm-info.xml:26(holder)
+msgid "Tammy Fox"
+msgstr ""
+
+#: en_US/rpm-info.xml:27(holder)
+msgid "Tommy Reynolds"
+msgstr ""
+
+#: en_US/rpm-info.xml:28(holder)
+msgid "Paul W. Frields"
+msgstr ""
+
+#: en_US/rpm-info.xml:29(holder)
+msgid "Dimitris Glezos"
+msgstr ""
+
+#: en_US/rpm-info.xml:30(holder)
+msgid "Red Hat, Inc."
+msgstr ""
+
+#: en_US/rpm-info.xml:32(title)
+msgid "Example Tutorial"
+msgstr ""
+
+#: en_US/rpm-info.xml:33(desc)
+msgid "This is quite a feat."
+msgstr ""
+
+#: en_US/rpm-info.xml:37(details)
+msgid "Moved per-doc entities, added offboard snippet to test entity inclusion across the board, and moved license to OPL."
+msgstr ""
+
+#: en_US/rpm-info.xml:41(details)
+msgid "A shameless bump to test prettyprinting"
+msgstr ""
+
+#: en_US/rpm-info.xml:45(details)
+msgid "A later RPM release"
+msgstr ""
+
+#: en_US/rpm-info.xml:49(details)
+msgid "A matching RPM release"
+msgstr ""
+
+#: en_US/rpm-info.xml:53(details)
+msgid "Make sure version matches what's in DOCVERSION"
+msgstr ""
+
+#: en_US/rpm-info.xml:57(details)
+msgid "Minor changes for testing purposes"
+msgstr ""
+
+#: en_US/rpm-info.xml:61(details)
+msgid "Some rpm-only changes"
+msgstr ""
+
+#: en_US/rpm-info.xml:65(details)
+msgid "Initial RPM version"
+msgstr ""
+
+#: en_US/rpm-info.xml:69(details)
+msgid "Add revision history"
+msgstr ""
+
#: en_US/para.xml:10(para)
msgid "This paragraph was obtained via an <wordasword><xi:include></wordasword> element, just for an example."
msgstr ""
-#: en_US/example-tutorial.xml:16(fallback)
-msgid "WHERE IS MY FDP-INFO, DUDE"
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: en_US/example-tutorial.xml:180(None)
+msgid "@@image: '../figs/fedora-logo-sprite.png'; md5=d02ed4e1f993f92761c79ab23f69708f"
msgstr ""
-#: en_US/example-tutorial.xml:19(para)
-msgid "This phrase uses the local entity ."
+#: en_US/example-tutorial.xml:16(fallback)
+msgid "WHERE IS MY FDP-INFO, DUDE"
msgstr ""
-#: en_US/example-tutorial.xml:24(title)
+#: en_US/example-tutorial.xml:20(title)
msgid "Some Section"
msgstr ""
-#: en_US/example-tutorial.xml:26(primary)
+#: en_US/example-tutorial.xml:22(primary)
msgid "Index term"
msgstr ""
-#: en_US/example-tutorial.xml:28(para)
+#: en_US/example-tutorial.xml:24(para)
msgid "This is an example section. You should not use sect1, sect2, etc., since those tags will make sections less modular, i.e., harder to relocate without changing a lot of other markup."
msgstr ""
-#: en_US/example-tutorial.xml:35(para)
-msgid "Could not find the <filename>para-en.xml</filename> file"
+#: en_US/example-tutorial.xml:31(para)
+msgid "Could not find the <filename>para.xml</filename> file for this locale."
+msgstr ""
+
+#: en_US/example-tutorial.xml:37(para)
+msgid "This is how we can use an <filename>doc_entities.xml</filename> file to define document-specific entities that can be referenced from any XML file of the document using a <wordasword>&LOCAL-ENT;</wordasword>: \"Per-document Entity\"."
msgstr ""
-#: en_US/example-tutorial.xml:40(para)
+#: en_US/example-tutorial.xml:44(para)
msgid "Keep text within the <command>title</command> tags on the same line as the tags. Nesting the title on a separate line from the enclosing tags results in extra spaces in HTML rendering."
msgstr ""
-#: en_US/example-tutorial.xml:47(title)
+#: en_US/example-tutorial.xml:51(title)
msgid "Warning"
msgstr ""
-#: en_US/example-tutorial.xml:49(para)
+#: en_US/example-tutorial.xml:53(para)
msgid "Example of an admonition."
msgstr ""
-#: en_US/example-tutorial.xml:54(para)
+#: en_US/example-tutorial.xml:2(title)
+msgid "Reporting Document Errors"
+msgstr ""
+
+#: en_US/example-tutorial.xml:4(para)
+msgid "To report an error or omission in this document, file a bug report in Bugzilla at <ulink url=\"http://bugzilla.redhat.com\"/>. When you file your bug, select \"Fedora Documentation\" as the <systemitem>Product</systemitem>, and select the title of this document as the <systemitem>Component</systemitem>. The version of this document is example-tutorial-0.14.2 (2006-03-02)."
+msgstr ""
+
+#: en_US/example-tutorial.xml:12(para)
+msgid "The maintainers of this document will automatically receive your bug report. On behalf of the entire Fedora community, thank you for helping us make improvements."
+msgstr ""
+
+#: en_US/example-tutorial.xml:58(para)
msgid "This paragraph illustrates the use of command syntax to accomplish a task. Note that specific filenames denoting versions should be avoided. To install any RPM package, use the following syntax:"
msgstr ""
-#: en_US/example-tutorial.xml:60(replaceable)
+#: en_US/example-tutorial.xml:64(replaceable)
msgid "pkgname"
msgstr ""
-#: en_US/example-tutorial.xml:60(replaceable)
+#: en_US/example-tutorial.xml:64(replaceable)
msgid "version"
msgstr ""
-#: en_US/example-tutorial.xml:60(replaceable)
+#: en_US/example-tutorial.xml:64(replaceable)
msgid "arch"
msgstr ""
-#: en_US/example-tutorial.xml:60(command)
+#: en_US/example-tutorial.xml:64(command)
msgid "rpm -ivh <placeholder-1/>-<placeholder-2/>.<placeholder-3/>.rpm"
msgstr ""
-#: en_US/example-tutorial.xml:63(para)
+#: en_US/example-tutorial.xml:67(para)
msgid "Notice that the <command>screen</command> section is entirely left-justified with no preceding indent. This is necessary to ensure proper rendering in PDFs. Also notice that the entire <command>command</command> has been surrounded by <command>userinput</command> since the user types this command. Computer output would be enclosed in <command>computeroutput</command> tags, as in the following sample."
msgstr ""
-#: en_US/example-tutorial.xml:74(command)
+#: en_US/example-tutorial.xml:78(command)
msgid "grep snmptrap /etc/services"
msgstr ""
-#: en_US/example-tutorial.xml:76(computeroutput)
+#: en_US/example-tutorial.xml:80(computeroutput)
#, no-wrap
msgid "snmptrap 162/udp snmp-trap # Traps for SNMP"
msgstr ""
-#: en_US/example-tutorial.xml:78(para)
+#: en_US/example-tutorial.xml:82(para)
msgid "Lines should be broken <emphasis>exactly</emphasis> as they are on-screen. Also, note that spaces inside <command>screen</command> tags are automatically treated as non-breaking."
msgstr ""
-#: en_US/example-tutorial.xml:84(title)
+#: en_US/example-tutorial.xml:88(title)
msgid "Fill modes and <command>screen</command> tags"
msgstr ""
-#: en_US/example-tutorial.xml:85(para)
+#: en_US/example-tutorial.xml:89(para)
msgid "Using automatic or manual fill commands in Emacs/PSGML will sometimes mangle <command>screen</command> sections. Use care when performing fill operations, and check the results."
msgstr ""
-#: en_US/example-tutorial.xml:94(title)
+#: en_US/example-tutorial.xml:98(title)
msgid "Callout Example"
msgstr ""
-#: en_US/example-tutorial.xml:95(programlisting)
+#: en_US/example-tutorial.xml:99(programlisting)
#, no-wrap
msgid "\nLine 1 <co id=\"pl-callout-L1\"></co>\nLine 2\nLine 3\nLine 4 <co id=\"pl-callout-L4\"></co>\n"
msgstr ""
-#: en_US/example-tutorial.xml:103(para)
+#: en_US/example-tutorial.xml:107(para)
msgid "Here is a callout."
msgstr ""
-#: en_US/example-tutorial.xml:108(para)
+#: en_US/example-tutorial.xml:112(para)
msgid "The second callout."
msgstr ""
-#: en_US/example-tutorial.xml:116(title)
+#: en_US/example-tutorial.xml:120(title)
msgid "Deeply nested sections"
msgstr ""
-#: en_US/example-tutorial.xml:118(para)
+#: en_US/example-tutorial.xml:122(para)
msgid "Early to bed, early to rise"
msgstr ""
-#: en_US/example-tutorial.xml:123(title)
+#: en_US/example-tutorial.xml:127(title)
msgid "Second Level"
msgstr ""
-#: en_US/example-tutorial.xml:125(para)
+#: en_US/example-tutorial.xml:129(para)
msgid "Is the curse of the working class"
msgstr ""
-#: en_US/example-tutorial.xml:130(title)
+#: en_US/example-tutorial.xml:134(title)
msgid "Third Level"
msgstr ""
-#: en_US/example-tutorial.xml:132(para)
+#: en_US/example-tutorial.xml:136(para)
msgid "He who can, does"
msgstr ""
-#: en_US/example-tutorial.xml:137(title)
+#: en_US/example-tutorial.xml:141(title)
msgid "Fourth Level"
msgstr ""
-#: en_US/example-tutorial.xml:139(para)
+#: en_US/example-tutorial.xml:143(para)
msgid "He who cannot, manages."
msgstr ""
-#: en_US/example-tutorial.xml:148(title)
+#: en_US/example-tutorial.xml:152(title)
msgid "Procedure Test"
msgstr ""
-#: en_US/example-tutorial.xml:151(para)
+#: en_US/example-tutorial.xml:155(para)
msgid "First step"
msgstr ""
-#: en_US/example-tutorial.xml:156(para)
+#: en_US/example-tutorial.xml:160(para)
msgid "Second step"
msgstr ""
-#: en_US/example-tutorial.xml:161(para)
+#: en_US/example-tutorial.xml:165(para)
msgid "Third step"
msgstr ""
+#: en_US/example-tutorial.xml:173(title)
+msgid "Using images"
+msgstr ""
+
+#: en_US/example-tutorial.xml:175(para) en_US/example-tutorial.xml:186(para)
+msgid "FIXME"
+msgstr ""
+
+#: en_US/example-tutorial.xml:183(phrase)
+msgid "FDP Logo"
+msgstr ""
+
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
#: en_US/example-tutorial.xml:0(None)
msgid "translator-credits"
17 years, 10 months
release-notes/devel/po RELEASE-NOTES.pot,1.7,1.8
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/devel/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15654/po
Modified Files:
RELEASE-NOTES.pot
Log Message:
Update POT with new information from rpm-info file
Index: RELEASE-NOTES.pot
===================================================================
RCS file: /cvs/docs/release-notes/devel/po/RELEASE-NOTES.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RELEASE-NOTES.pot 2 Aug 2006 18:28:43 -0000 1.7
+++ RELEASE-NOTES.pot 5 Aug 2006 13:20:14 -0000 1.8
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-08-02 14:27-0400\n"
+"POT-Creation-Date: 2006-08-05 09:19-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -9,14 +9,54 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: en_US/README.xml:23(title)
-msgid "Fedora Core 6 test2 README"
+#: en_US/rpm-info.xml:14(rights)
+msgid "OPL"
+msgstr ""
+
+#: en_US/rpm-info.xml:15(version)
+msgid "1.0"
msgstr ""
-#: en_US/README.xml:25(year) en_US/about-fedora.xml:17(year)
+#: en_US/rpm-info.xml:18(year) en_US/README.xml:25(year) en_US/about-fedora.xml:17(year)
msgid "2006"
msgstr ""
+#: en_US/rpm-info.xml:19(holder)
+msgid "Red Hat, Inc. and others"
+msgstr ""
+
+#: en_US/rpm-info.xml:21(title)
+msgid "Fedora Core 5.91 Release Notes"
+msgstr ""
+
+#: en_US/rpm-info.xml:22(desc)
+msgid "Important information about this release of Fedora Core"
+msgstr ""
+
+#: en_US/rpm-info.xml:26(details)
+msgid "Bring version number into line with reality"
+msgstr ""
+
+#: en_US/rpm-info.xml:30(details)
+msgid "FC6 test2 rollout for translation"
+msgstr ""
+
+#: en_US/rpm-info.xml:34(details)
+msgid "Refer to IG and fix repodata instructions (#186904)"
+msgstr ""
+
+#: en_US/rpm-info.xml:38(details)
+msgid "Errata release notes for FC5 release."
+msgstr ""
+
+#: en_US/rpm-info.xml:42(details)
+msgid "Finished port of wiki for FC5 release."
+msgstr ""
+
+#: en_US/README.xml:23(title)
+msgid "Fedora Core 6 test2 README"
+msgstr ""
+
#: en_US/README.xml:26(holder)
msgid "Red Hat, Inc."
msgstr ""
17 years, 10 months
release-notes/devel/en_US rpm-info.xml,NONE,1.1
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/devel/en_US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15605/en_US
Added Files:
rpm-info.xml
Log Message:
Shuffle rpm-info to new location
--- 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 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 id="PaulWFrields" wholename="Paul W. Frields" email="stickster(a)gmail.com" surname="Frields" firstname="Paul" othername="W." initials="PWF"/>
</colophon>
<author worker="fdp"/>
<license>
<rights>OPL</rights>
<version>1.0</version>
</license>
<copyright>
<year>2006</year>
<holder>Red Hat, Inc. and others</holder>
</copyright>
<title>Fedora Core 5.91 Release Notes</title>
<desc>Important information about this release of Fedora Core</desc>
<changelog order="newest-first">
<revision date="2006-07-13" number="5.91" role="doc">
<author worker="PaulWFrields"/>
<details>Bring version number into line with reality</details>
</revision>
<revision date="2006-07-11" number="0.5.9.1" role="doc">
<author worker="PaulWFrields"/>
<details>FC6 test2 rollout for translation</details>
</revision>
<revision date="2006-05-28" number="0.5.0.2" role="doc">
<author worker="PaulWFrields"/>
<details>Refer to IG and fix repodata instructions (#186904)</details>
</revision>
<revision date="2006-04-14" number="0.5.0.1" role="doc">
<author worker="quaid"/>
<details>Errata release notes for FC5 release.</details>
</revision>
<revision date="2006-02-28" number="0.5.0.0" role="doc">
<author worker="quaid"/>
<details>Finished port of wiki for FC5 release.</details>
</revision>
</changelog>
</rpm-info>
17 years, 10 months
release-notes/devel rpm-info.xml,1.6,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-serv15605
Removed Files:
rpm-info.xml
Log Message:
Shuffle rpm-info to new location
--- rpm-info.xml DELETED ---
17 years, 10 months
docs-common Makefile.common,1.134,1.135
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15565
Modified Files:
Makefile.common
Log Message:
Only do a showvars for TAG_RELEASE if there's one to be had.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- Makefile.common 5 Aug 2006 13:11:34 -0000 1.134
+++ Makefile.common 5 Aug 2006 13:14:28 -0000 1.135
@@ -312,7 +312,9 @@
showvars::
@echo "TAG_NAME=${TAG_NAME}"
@echo "TAG_VERSION=${TAG_VERSION}"
+ifdef TAG_RELEASE # Only used if we have a specfile!
@echo "TAG_RELEASE=${TAG_RELEASE}"
+endif
@echo "TAG=${TAG}"
@echo "### (Tag vars do not necessarily reflect CVS status)"
17 years, 10 months
docs-common Makefile.common,1.133,1.134
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15541
Modified Files:
Makefile.common
Log Message:
Get rid of really awful packaging scripts. Mea culpa, I promise the
new round will be better.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- Makefile.common 5 Aug 2006 04:39:18 -0000 1.133
+++ Makefile.common 5 Aug 2006 13:11:34 -0000 1.134
@@ -274,6 +274,11 @@
--specfile ${SPECFILE} | head -1)
endif
+showvars::
+ @echo "VERSION=$(VERSION)"
+ @echo "RELEASE=$(RELEASE)"
+ @echo "PWD=$(PWD)"
+
# CVS-safe version/release -- a package name like 4Suite screws things
# up, so we have to remove the leaving digits from the name
TAG_NAME := $(shell echo ${NAME} | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
@@ -832,19 +837,6 @@
${RM} $(DOCBASE)*.src.tar.gz
help::
- @printf ${TFMT} 'spec' 'Creates RPM spec file from rpm-info.xml'
-
-spec:: ${SPECFILE}
-
-help::
- @printf ${TFMT} '${SPECFILE}' 'Creates RPM spec file from rpm-info.xml'
-
-${SPECFILE}:: ${RPMINFO}
- $(XSLTPROC) --stringparam docbase "${DOCBASE}" \
- ${FDPDIR}/docs-common/packaging/spec.xsl ${RPMINFO} \
- >$@.tmp && move-if-change $@.tmp $@
-
-help::
@printf ${TFMT} 'gnome-desktop' 'Outputs Gnome desktop description'
gnome.desktop:: fedora-doc-${DOCBASE}-gnome.desktop
@@ -911,76 +903,6 @@
omf:: $(foreach LANG,${LANGUAGES},omf-$(LANG)) fedora-doc-${DOCBASE}-C.omf
-help::
- @printf ${TFMT} 'src-tarball' 'Builds tar(1) archive of sources & desktop files'
-
-src-tarball $(DOCBASE)-$(VERSION).src.tar.gz:: xml-all
- ${MAKE} fdp-info
- ${MAKE} gnome.desktop
- ${MAKE} kde.desktop
- ${MAKE} khelp.desktop
- ${MAKE} omf
- ${RM} -r $(DOCBASE)-$(VERSION)
- mkdir -p $(DOCBASE)-$(VERSION)
- find . '(' \
- -name '*#*' \
- -o -name 'CVS' \
- -o -name 'rpm' \
- -o -name '*.rpm' \
- -o -name '*~' \
- -o -name '*.tar.gz' \
- -o -name '*.tmp' \
- -o -name '${DOCBASE}-${VERSION}' \
- -o -name '*.mo' \
- ')' -prune -o -print | cpio -pamdv $(DOCBASE)-$(VERSION)
- tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/
- ${RM} -r $(DOCBASE)-$(VERSION)
-
-package-prep::
- ${MAKE} distclean
- ${MAKE} ${DOCBASE}-${shell version doc}.src.tar.gz
- ${MAKE} ${SPECFILE}
- ${MAKE} omf
- ${MAKE} kde.desktop
- ${MAKE} khelp.desktop
- mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
- mkdir -p rpm/RPMS/{i386,i486,i586,i686,noarch,ppc,x86_64}
- cp -f $(DOCBASE)-$(shell version doc).src.tar.gz rpm/SOURCES/
- cp -f ${SPECFILE} rpm/SPECS
- cp -f *.omf *.desktop rpm/SOURCES
-
-rpm-common::
- if test $(shell get_latest_revision rpm) -eq 0 ; then \
- V=$(shell get_latest_revision doc) ; \
- echo "*** Creating revision log entry for rpm ***" ; \
- ROLE=rpm ID=1 DETAILS="Update to version $$V" \
- $(MAKE) clog ; \
- fi
- ${RM} *.rpm
- if test $(RPMPREP) != "no" ; then ${MAKE} package-prep ; fi
-
-noarch:: rpm-common
- rpmbuild -bb $(RPMDFLAG) $(RPMFLAGS) rpm/SPECS/$(SPECFILE)
- if test $(RPMPOST) != "no" ; then $(MAKE) package-post ; fi
-
-srpm:: rpm-common
- rpmbuild -bs $(RPMDFLAG) $(RPMFLAGS) rpm/SPECS/$(SPECFILE)
- if test $(RPMPOST) != "no" ; then $(MAKE) package-post ; fi
-
-rpm:: rpm-common
- rpmbuild -ba $(RPMDFLAG) $(RPMFLAGS) rpm/SPECS/$(SPECFILE)
- if test $(RPMPOST) != "no" ; then $(MAKE) package-post ; fi
-
-package-post::
- $(MAKE) clean # If needed, review materials in rpm/BUILD/
- find rpm/ -name '*.rpm' -exec ln '{}' . ';'
- ls *.rpm
-
-showvars::
- @echo "VERSION=$(VERSION)"
- @echo "RELEASE=$(RELEASE)"
- @echo "PWD=$(PWD)"
-
#########################################################################
define FDP_ENTITIES_template
17 years, 10 months
docs-common Makefile.common,1.132,1.133
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067
Modified Files:
Makefile.common
Log Message:
The whole section on tagging and assigning NVR stuff should come after
the first TARGETS assignment. (Just like it says, right there.)
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- Makefile.common 5 Aug 2006 04:35:38 -0000 1.132
+++ Makefile.common 5 Aug 2006 04:39:18 -0000 1.133
@@ -173,68 +173,6 @@
#########################################################################
#########################################################################
-# Obtain the document version and release info for building RPM's
-SPECFILE=$(firstword $(wildcard *.spec))
-
-ifneq "${SPECFILE}" ""
-# the name of the package
-ifndef NAME
-NAME := $(shell rpm ${RPMFLAGS} ${DISTRPMFLAGS} -q --qf "%{NAME}\n" \
- --specfile ${SPECFILE} | head -1)
-endif
-# the version of the package
-ifndef VERSION
-VERSION := $(shell rpm ${RPMFLAGS} ${DISTRPMFLAGS} -q --qf "%{VERSION}\n" \
- --specfile ${SPECFILE} | head -1)
-endif
-# the release of the package
-ifndef RELEASE
-RELEASE := $(shell rpm ${RPMFLAGS} ${DISTRPMFLAGS} -q --qf "%{RELEASE}\n" \
- --specfile ${SPECFILE} | head -1)
-endif
-
-# CVS-safe version/release -- a package name like 4Suite screws things
-# up, so we have to remove the leaving digits from the name
-TAG_NAME := $(shell echo ${NAME} | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
-TAG_VERSION := $(shell echo ${VERSION} | sed s/\\\./_/g)
-TAG_RELEASE := $(shell echo ${RELEASE} | sed s/\\\./_/g)
-
-# tag to export, defaulting to current tag in the spec file
-TAG?=${TAG_NAME}-${TAG_VERSION}-${TAG_RELEASE}
-
-# The rest of this rule is set outside the ifneq
-.PHONY: tag
-tag:: ${SPECFILE}
-
-endif # ifneq "${SPECFILE}" ""
-
-# Only set tag here if not done already (i.e. SPECFILE doesn't exist)
-# Use the FDPSH function to get a current version. Keep in mind this
-# 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_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'
-
-#########################################################################
-
-#########################################################################
# Set a provisional ${LANG} value. We'll dynamically change this as
# needed. The "${PRI_LANG}" value is used because that is the original
# language the doc.
@@ -316,6 +254,69 @@
#########################################################################
#########################################################################
+# Obtain the document version and release info for building RPM's
+SPECFILE=$(firstword $(wildcard *.spec))
+
+ifneq "${SPECFILE}" ""
+# the name of the package
+ifndef NAME
+NAME := $(shell rpm ${RPMFLAGS} ${DISTRPMFLAGS} -q --qf "%{NAME}\n" \
+ --specfile ${SPECFILE} | head -1)
+endif
+# the version of the package
+ifndef VERSION
+VERSION := $(shell rpm ${RPMFLAGS} ${DISTRPMFLAGS} -q --qf "%{VERSION}\n" \
+ --specfile ${SPECFILE} | head -1)
+endif
+# the release of the package
+ifndef RELEASE
+RELEASE := $(shell rpm ${RPMFLAGS} ${DISTRPMFLAGS} -q --qf "%{RELEASE}\n" \
+ --specfile ${SPECFILE} | head -1)
+endif
+
+# CVS-safe version/release -- a package name like 4Suite screws things
+# up, so we have to remove the leaving digits from the name
+TAG_NAME := $(shell echo ${NAME} | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
+TAG_VERSION := $(shell echo ${VERSION} | sed s/\\\./_/g)
+TAG_RELEASE := $(shell echo ${RELEASE} | sed s/\\\./_/g)
+
+# tag to export, defaulting to current tag in the spec file
+TAG?=${TAG_NAME}-${TAG_VERSION}-${TAG_RELEASE}
+
+# The rest of this rule is set outside the ifneq
+.PHONY: tag
+tag:: ${SPECFILE}
+ @:
+
+endif # ifneq "${SPECFILE}" ""
+
+# Only set tag here if not done already (i.e. SPECFILE doesn't exist)
+# Use the FDPSH function to get a current version. Keep in mind this
+# 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_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'
+
+#########################################################################
+
+#########################################################################
# Rules to generate the "${LANG}/${DOC_ENTITIES}.ent" file, if used
define DOC_ENTITIES_template
17 years, 10 months
docs-common Makefile.common,1.131,1.132
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21041
Modified Files:
Makefile.common
Log Message:
Add tag to targets list, and make it PHONY
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- Makefile.common 5 Aug 2006 04:30:42 -0000 1.131
+++ Makefile.common 5 Aug 2006 04:35:38 -0000 1.132
@@ -203,6 +203,7 @@
TAG?=${TAG_NAME}-${TAG_VERSION}-${TAG_RELEASE}
# The rest of this rule is set outside the ifneq
+.PHONY: tag
tag:: ${SPECFILE}
endif # ifneq "${SPECFILE}" ""
@@ -273,7 +274,7 @@
TARGETS=all clean distclean fdp-info html html-nochunks pdf po showvars \
tarball rpm rpm-common noarch srpm package-prep package-post \
- src-tarball txt text targets help
+ src-tarball txt text targets help tag
# FIXME: add the .PHONY attribute where the actual target is defined
17 years, 10 months
docs-common/bin xmlformat-fdp.conf,1.17,1.18
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21007/bin
Modified Files:
xmlformat-fdp.conf
Log Message:
Add code to list of inline elements
Index: xmlformat-fdp.conf
===================================================================
RCS file: /cvs/docs/docs-common/bin/xmlformat-fdp.conf,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmlformat-fdp.conf 14 Feb 2006 03:43:57 -0000 1.17
+++ xmlformat-fdp.conf 5 Aug 2006 04:33:37 -0000 1.18
@@ -55,7 +55,7 @@
exit-break = 0
normalize = yes
-emphasis literal abbrev
+emphasis literal abbrev code
format = inline
trademark
17 years, 10 months