release-notes RELEASE-NOTES-en.xml, 1.7, 1.8 RELEASE-NOTES-it.xml, 1.4, 1.5 RELEASE-NOTES-ja_JP.xml, 1.1, 1.2 RELEASE-NOTES-ru.xml, 1.1, 1.2 RELEASE-NOTES-zh_CN.xml, 1.2, 1.3
by fedora-docs-commits@redhat.com
Author: kwade
Update of /cvs/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17207
Modified Files:
RELEASE-NOTES-en.xml RELEASE-NOTES-it.xml
RELEASE-NOTES-ja_JP.xml RELEASE-NOTES-ru.xml
RELEASE-NOTES-zh_CN.xml
Log Message:
New entity name from upstream Makefile needs.
Index: RELEASE-NOTES-en.xml
===================================================================
RCS file: /cvs/docs/release-notes/RELEASE-NOTES-en.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RELEASE-NOTES-en.xml 25 Nov 2005 19:25:18 -0000 1.7
+++ RELEASE-NOTES-en.xml 4 Jan 2006 21:48:44 -0000 1.8
@@ -40,7 +40,7 @@
<!-- *************** Local entities *************** -->
- <!ENTITY BOOKID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-11-24-T23:10+0000)"> <!-- version of manual and date -->
+ <!ENTITY DOCID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-11-24-T23:10+0000)"> <!-- version of manual and date -->
<!ENTITY LOCALVER "5 test1"> <!-- Set value to your choice, when guide version is out -->
<!-- of sync with FC release, use instead of FEDVER or FEDTESTVER -->
<!ENTITY NAME "Fedora"> <!-- The project's (and software's) basic name -->
Index: RELEASE-NOTES-it.xml
===================================================================
RCS file: /cvs/docs/release-notes/RELEASE-NOTES-it.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RELEASE-NOTES-it.xml 25 Nov 2005 21:12:13 -0000 1.4
+++ RELEASE-NOTES-it.xml 4 Jan 2006 21:48:44 -0000 1.5
@@ -40,7 +40,7 @@
<!-- *************** Local entities *************** -->
- <!ENTITY BOOKID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-10-25-T04:20-0700)"> <!-- version of manual and date -->
+ <!ENTITY DOCID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-10-25-T04:20-0700)"> <!-- version of manual and date -->
<!ENTITY LOCALVER "5 test1"> <!-- Set value to your choice, when guide version is out -->
<!-- of sync with FC release, use instead of FEDVER or FEDTESTVER -->
<!ENTITY NAME "Fedora"> <!-- The project's (and software's) basic name -->
Index: RELEASE-NOTES-ja_JP.xml
===================================================================
RCS file: /cvs/docs/release-notes/RELEASE-NOTES-ja_JP.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RELEASE-NOTES-ja_JP.xml 1 Nov 2005 05:30:18 -0000 1.1
+++ RELEASE-NOTES-ja_JP.xml 4 Jan 2006 21:48:44 -0000 1.2
@@ -48,7 +48,7 @@
<!-- *************** Local entities *************** -->
- <!ENTITY BOOKID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-10-25-T04:20-0700)"> <!-- version of manual and date -->
+ <!ENTITY DOCID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-10-25-T04:20-0700)"> <!-- version of manual and date -->
<!ENTITY LOCALVER "5 test1"> <!-- Set value to your choice, when guide version is out -->
<!-- of sync with FC release, use instead of FEDVER or FEDTESTVER -->
<!ENTITY NAME "Fedora"> <!-- The project's (and software's) basic name -->
Index: RELEASE-NOTES-ru.xml
===================================================================
RCS file: /cvs/docs/release-notes/RELEASE-NOTES-ru.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RELEASE-NOTES-ru.xml 10 Nov 2005 21:21:08 -0000 1.1
+++ RELEASE-NOTES-ru.xml 4 Jan 2006 21:48:44 -0000 1.2
@@ -40,7 +40,7 @@
<!-- *************** Local entities *************** -->
- <!ENTITY BOOKID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-10-25-T04:20-0700)"
+ <!ENTITY DOCID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-10-25-T04:20-0700)"
> <!-- version of manual and date -->
<!ENTITY LOCALVER "5 test1"
> <!-- Set value to your choice, when guide version is out -->
Index: RELEASE-NOTES-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/RELEASE-NOTES-zh_CN.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RELEASE-NOTES-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2
+++ RELEASE-NOTES-zh_CN.xml 4 Jan 2006 21:48:44 -0000 1.3
@@ -32,7 +32,7 @@
%FEDORA-ENTITIES-EN;
<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
-<!ENTITY BOOKID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-11-24-T23:10+0000)">
+<!ENTITY DOCID "RELEASE-NOTES-&FCX;&DISTROVER; (2005-11-24-T23:10+0000)">
<!ENTITY LOCALVER "5 test1">
<!ENTITY NAME "Fedora">
<!ENTITY PROJ "&FP;">
18 years, 3 months
docs-common/bin/build-docs Makefile, NONE, 1.1 README, NONE, 1.1 build-docs, NONE, 1.1 build-docs.conf, NONE, 1.1 build-docs.cron, NONE, 1.1 build-docs.spec, NONE, 1.1
by fedora-docs-commits@redhat.com
Author: nman64
Update of /cvs/docs/docs-common/bin/build-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17147/build-docs
Added Files:
Makefile README build-docs build-docs.conf build-docs.cron
build-docs.spec
Log Message:
Replacing bulkbuild script with build-docs package
--- NEW FILE Makefile ---
VERSION=$(shell awk '/Version:/ { print $$2 }' build-docs.spec)
RELEASE=$(shell awk '/Release:/ { print $$2 }' build-docs.spec)
CVSTAG=r$(subst .,-,$(VERSION))
PREFIX=/usr
BINDIR=$(PREFIX)/bin
DATADIR=$(PREFIX)/share
LOCALSTATEPREFIX=/var
LOCALSTATEDIR=$(LOCALSTATEPREFIX)/lib
DOCDIR=$(DATADIR)/doc
PKGNAME=build-docs
PKGLOCALSTATEDIR=$(LOCALSTATEDIR)/$(PKGNAME)
PKGDOCDIR=$(DOCDIR)/$(PKGNAME)-$(VERSION)
SOURCEDIR := $(shell pwd)
default:
.PHONY: default
.PHONY: tarball
tarball: clean
rm -rf /tmp/$(PKGNAME)-$(VERSION)
mkdir -p /tmp/$(PKGNAME)-$(VERSION)
cp -a * /tmp/$(PKGNAME)-$(VERSION)
tar -C /tmp --exclude CVS --bzip2 -cSpf $(PKGNAME)-$(VERSION).tar.bz2 $(PKGNAME)-$(VERSION)
rm -rf /tmp/$(PKGNAME)-$(VERSION)
srpm: tarball
rpmbuild --define "_srcrpmdir $(SOURCEDIR)" -ts $(PKGNAME)-$(VERSION).tar.bz2
install:
@[ "x$(INSTROOT)" != "x" ] || echo -e "\nWARNING\nWARNING: Installation using make is discouraged, try RPMs instead!\nWARNING\n"
mkdir -p $(INSTROOT)
mkdir -p $(INSTROOT)$(BINDIR)
mkdir -p $(INSTROOT)$(PKGLOCALSTATEDIR)
@if [ "$(DISABLECRON)" != "1" ]; then \
mkdir -p $(INSTROOT)/etc/cron.hourly ; \
install -b $(PKGNAME).conf $(INSTROOT)/etc/$(PKGNAME).conf ; \
install $(PKGNAME).cron $(INSTROOT)/etc/cron.hourly/$(PKGNAME).cron ; \
fi
install -m755 $(PKGNAME) $(INSTROOT)$(BINDIR)/$(PKGNAME)
install-docs:
@[ "x$(INSTROOT)" != "x" ] || echo -e "\nWARNING\nWARNING: Installation using make is discouraged, try RPMs instead!\nWARNING\n"
mkdir -p $(INSTROOT)$(DOCDIR)
install README $(INSTROO)$(DOCDIR)/README
uninstall:
@rm -fv $(INSTROOT)/etc/cron.hourly/$(PKGNAME).cron
@rm -fv $(INSTROOT)$(BINDIR)/$(PKGNAME)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)/etc/cron.hourly
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)/etc
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(PKGLOCALSTATEDIR)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(LOCALSTATEDIR)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(LOCALSTATEPREFIX)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(DATADIR)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(BINDIR)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(PREFIX)
uninstall-docs:
@rm -fv $(INSTROOT)$(DOCDIR)/README
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(DOCDIR)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(DATADIR)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(PREFIX)
.PHONY: clean
clean:
@rm -fv $(PKGNAME)-$(VERSION)-$(RELEASE).src.rpm
@rm -fv $(PKGNAME)-$(VERSION).tar.bz2
--- NEW FILE README ---
build-docs - Fedora Documentation builder script
Main script written by Paul W. Frields <stickster(a)gmail.com>
Packaged by Patrick Barnes <nman64(a)n-man.com>
== About ==
The build-docs script is used by the Fedora Documentation Project to
build the latest documents in CVS for viewing by others without a testing
sandbox. It is intended to build HTML (and potentially other) documents for
presentation on a local web server.
This package also includes a cron job that can run the build process once each
hour. This requires the crontabs package to be installed. The cron job is
normally installed but disabled by default. You can disable it's installation
when building the RPM -- see below. To enable the cron job after installation,
see the file /etc/build-docs.conf for instructions.
== Installation ==
The recommended method for installing this package is using RPM.
Note that this document demonstrates using 'sudo' to gain root privileges. You
may need or want to use another method, such as 'su'.
=== Using RPM & yum ===
If you already have an RPM package, you can use yum to install it.
sudo yum localinstall build-docs-<version>.noarch.rpm
==== Building Your Own RPM ====
If you are working from a source directory or tarball, you can make an RPM
to install easily. You will need rpmbuild (found in the rpm-build package)
installed on the system. Note that it is considered poor practice to build
packages as root. Dag Wieers has an excellent HOWTO for creating a non-root
RPM-building environment: http://dag.wieers.com/howto/bits/rpm-build-user.php
First build an SRPM:
make srpm
Next, build the RPM from the SRPM:
rpmbuild --rebuild build-docs-<version>.src.rpm
Where <version> is replaced by the version of the package you are building.
* If you do not want to use the cron job, you can disable its installation
and the dependency on crontabs:
rpmbuild --rebuild --define "_without_cron 1" build-docs-...
Finally, install the package:
cd /path/to/your/rpm
sudo yum localinstall build-docs-<version>.noarch.rpm
If you don't know where the RPM was built, look at the output from rpmbuild.
=== Using make ===
Installing the package using make is not recommended. See the
'Using RPM & yum' section above. To install the package using make:
make install
* If you do not want to use the cron job, you can disable its installation:
make DISABLECRON=1 install
Uninstallation is also available:
make uninstall
== Usage ==
build-docs [options...]
Where options can be one or more of:
-h : print usage
-m WORKDIR : set home directory, default '~'
-f FDPDIR : set d/l dir for CVS, default '~/fdpdocs-cvs<datetag>'
-D TARGETDIR : set target dir for built files,
default '/var/www/webtest/docs'
-a ANONCVS : set CVS repo location (cvs -d), default
':pserver:anonymous@cvs.fedora.redhat.com:/cvs/docs'
-r REV : checkout REV from CVS (global), default 'HEAD'
-Q : make CVS checkout less quiet
-c : build chunked HTML
-n : build HTML nochunks
-p : build PDF (not working currently)
-t : build tarball
-k : continue building in face of errors
--- NEW FILE build-docs ---
#!/bin/bash
#
# Written by stickster :)
# Mangled by megacoder ;-P
# Further editing and packaging by nman64
#
# Dedicated to the lazy Fedora Docs heroes. ;-)
#
# Pull all active FDP docs from CVS, build and install HTML in
# TARGETDIR folder.
#
MYSELF="$(basename "$0")"
NOW="$(date +%Y%m%d%H%M%S)"
print_usage() {
echo "$MYSELF: Usage: $MYSELF [options...]"
echo " -h : print usage (this message)"
echo " -m WORKDIR : set home directory, default $HOME"
echo " -f FDPDIR : set d/l dir for CVS, default $FDPDIR"
echo " -D TARGETDIR : set target dir for built files, default $TARGETDIR"
echo " -a ANONCVS : set CVS repo location (cvs -d), default $ANONCVS"
echo " -r REV : checkout REV from CVS (global), default $REV"
echo " -Q : make CVS checkout less quiet"
echo " -c : build chunked HTML"
echo " -n : build HTML nochunks"
echo " -p : build PDF (not working currently)"
echo " -t : build tarball"
echo " -k : continue building in face of errors"
}
set_vars() {
[ -z "$WORKDIR" ] && WORKDIR="${HOME}"
[ -z "$FDPDIR" ] && FDPDIR="${WORKDIR}/fdpdocs-cvs${NOW}"
[ -z "$TARGETDIR" ] && TARGETDIR="/var/www/webtest/docs"
# Do this anonymously for now
[ -z "$ANONCVS" ] && ANONCVS=":pserver:anonymous@cvs.fedora.redhat.com:/cvs/docs"
[ -z "$REV" ] && REV="HEAD"
[ -z "$REDIR" ] && REDIR="/dev/null"
[ -z "$QUIET" ] && QUIET="-Q"
}
# just to make sure defaults are read
unset FDPDIR HTMLDIR ANONCVS TAG CHUNKS NOCHUNKS PDF TARBALL VERBOSE
unset KEEPON
BUILDS=0
while getopts "m:f:D:a:r:Qcnpthvk" OPT; do
case $OPT in
m )
WORKDIR="$OPTARG"
;;
f )
FDPDIR="$OPTARG"
;;
D )
TARGETDIR="$OPTARG"
;;
a )
ANONCVS="$OPTARG"
;;
r )
REV="$OPTARG"
;;
Q )
QUIET="-q"
;;
c )
CHUNKS="yes"
BUILDS=$(($BUILDS+1))
;;
n )
NOCHUNKS="yes"
BUILDS=$(($BUILDS+1))
;;
p )
PDF="yes" # But PDF doesn't work yet, don't do this!
BUILDS=$(($BUILDS+1))
;;
t )
TARBALL="yes"
BUILDS=$(($BUILDS+1))
;;
h )
set_vars
print_usage
exit 0
;;
v )
REDIR="/dev/stdout"
;;
k )
KEEPON="-k"
;;
* )
echo "$MYSELF: invalid option: $OPT"
print_usage
exit 10
;;
esac
done
shift $(($OPTIND - 1))
if [ $BUILDS -lt 1 ]; then
echo "$MYSELF: nothing to do, try selecting one of [-c|-n|-p|-t]"
exit 20
fi
set_vars
mkdir "${FDPDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
mkdir -p "${TARGETDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
pushd "${FDPDIR}" >/dev/null || ( echo "Could not pushd ${FDPDIR}" ; exit 253 )
echo "Checking out docs-common from Fedora Docs CVS"
#cvs -d $ANONCVS login
cvs "$QUIET" -z3 -d $ANONCVS co docs-common
# for DOC in `cat docs-common/bin/active`; do
xargs -n1 echo <docs-common/bin/active |
while read DOC;
do
DONE=""
echo "Checking out module $DOC from Fedora Docs CVS"
cvs "$QUIET" -z3 -d $ANONCVS co $DOC 2>&1 > $REDIR
pushd "$DOC" >/dev/null || (echo "Couldn't cd to $DOCDIR" ; exit 252 )
make showvars > tmpvars
. tmpvars
rm -f tmpvars
if [ "$CHUNKS" = "yes" ]; then
echo "Making chunked HTML for ${DOCBASE}"
make ${KEEPON} html 2>&1 > $REDIR || ( echo "$MYSELF: CHUNKS failed" ;\
exit 251 )
for LANG in $LANGUAGES ; do
DESTDIR="${TARGETDIR}/${DOCBASE}/${LANG}"
[ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
cp -r "${DOCBASE}-${LANG}/"* "${DESTDIR}"
done
fi
if [ "$NOCHUNKS" = "yes" ]; then
echo "Making nochunks HTML for ${DOCBASE}"
make ${KEEPON} html-nochunks 2>&1 > $REDIR ||
( echo "$MYSELF: NOCHUNKS failed" ; exit 251 )
for LANG in $LANGUAGES ; do
DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
[ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
cp -r "${DOCBASE}-${LANG}.html" "${DESTDIR}"
done
fi
if [ "$TARBALL" = "yes" ]; then
echo "Making tarball for ${DOCBASE}"
make tarball 2>&1 > $REDIR || ( echo "$MYSELF: TARBALL failed" ;\
exit 251 )
for LANG in $LANGUAGES ; do
DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
[ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
cp -r "${DOCBASE}-${LANG}.tar.gz" "${DESTDIR}"
done
fi
popd >/dev/null
done
popd >/dev/null
[ "$FDPDIR" != "/" ] && [ "$FDPDIR" != "$HOME" ] && rm -rf "${FDPDIR}"
exit 0
--- NEW FILE build-docs.conf ---
## Configuration for build-docs cron job
#
# ENABLE_HOURLY_BUILD, if set to 'yes', will enable the hourly cron
# job that runs the build-docs script.
#
#ENABLE_HOURLY_BUILD=yes
#
# BDR, if set, should point to the absolute path where the main
# build-docs script is located.
#
#BDR="build-docs"
#
# BDRFLAGS, if set, should contain the desired flags to be passed
# to the build-docs script.
#
#BDRFLAGS="-c -m /var/lib/build-docs"
#
# LOGFILE, if set, should point to the location where you want the
# build-docs script output to be written.
#
#LOGFILE="/var/log/build-docs.log"
--- NEW FILE build-docs.cron ---
#!/bin/sh
. /etc/build-docs.conf
[ "${ENABLE_HOURLY_BUILD}" == "yes" ] || exit 0
[ "x" == "x${BDR}" ] && BDR="build-docs"
[ "x" == "x${BDRFLAGS}" ] && BDRFLAGS="-c -m /var/lib/build-docs"
[ "x" == "x${LOGFILE}" ] && LOGFILE="/var/log/build-docs.log"
echo "Starting build-docs at `date -uR`..." >> $LOGFILE
$BDR $BDRFLAGS &> $LOGFILE 2>&1
echo "Finished build-docs at `date -uR`..." >> $LOGFILE
exit 0
--- NEW FILE build-docs.spec ---
Summary: A simple script and cron job to build Fedora Documentation
Name: build-docs
Version: 0.0.3
Release: 1
URL: http://fedoraproject.org/wiki/DocsProject
License: GPL
ExclusiveOS: Linux
Group: Applications/Publishing
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
Source0: %{name}-%{version}.tar.bz2
Requires: xmlto docbook-utils docbook-utils-pdf cvs
%{!?_without_cron:Requires: crontabs}
%description
build-docs is a script that builds Fedora Documentation.
rpmbuild options:
--define "_without_cron 1" Disables installation of hourly cron job
(default: cron job is installed but disabled)
%prep
%setup -q
%build
make
%install
make INSTROOT=$RPM_BUILD_ROOT %{?_without_cron:DISABLECRON=1} install
%clean
rm -rf $RPM_BUILD_ROOT
%post
%preun
%postun
%files
%defattr(-,root,root)
%doc README
%dir /var/lib/%{name}
%attr(0744,root,root) /usr/bin/%{name}
%if 0%{!?_without_cron:1}
%attr(0744,root,root) /etc/cron.hourly/%{name}.cron
%attr(0644,root,root) %config /etc/%{name}.conf
%endif
%changelog
* Sat Dec 17 2005 Patrick Barnes <nman64(a)n-man.com>
- Renamed package to build-docs
- Updated script now allows -k flag
- Incremented version to 0.0.3
* Fri Dec 02 2005 Patrick Barnes <nman64(a)n-man.com>
- Added last Requires
- Allowed disabling of cron job
- Incremented version to 0.0.2
* Fri Dec 2 2005 Paul W. Frields <stickster(a)gmail.com>
- Added Requires and changed to valid Group
* Thu Dec 01 2005 Patrick Barnes <nman64(a)n-man.com>
- Initial packaging
18 years, 3 months
docs-common/bin bulkbuild,1.5,NONE
by fedora-docs-commits@redhat.com
Author: nman64
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17147
Removed Files:
bulkbuild
Log Message:
Replacing bulkbuild script with build-docs package
--- bulkbuild DELETED ---
18 years, 3 months
docs-common/bin/build-docs - New directory
by fedora-docs-commits@redhat.com
Author: nman64
Update of /cvs/docs/docs-common/bin/build-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17119/build-docs
Log Message:
Directory /cvs/docs/docs-common/bin/build-docs added to the repository
18 years, 3 months
release-notes/xmlbeats beatlist,1.1,1.2
by fedora-docs-commits@redhat.com
Author: kwade
Update of /cvs/docs/release-notes/xmlbeats
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590
Modified Files:
beatlist
Log Message:
Updating list with backwards compat beat.
Index: beatlist
===================================================================
RCS file: /cvs/docs/release-notes/xmlbeats/beatlist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beatlist 26 Nov 2005 04:37:20 -0000 1.1
+++ beatlist 4 Jan 2006 19:12:03 -0000 1.2
@@ -18,11 +18,13 @@
SystemDaemons
Multimedia
Entertainment
+Networking
Xorg
ArchSpecific
DatabaseServers
I18n
PackageChanges
+BackwardsCompatibility
Legacy
FinalOverview
Colophon
18 years, 3 months
docs-common/packaging bookinfo.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-serv11406
Modified Files:
bookinfo.xsl
Log Message:
Don't forget the legalnotice... but this should incorporate some
smarts later on using the right license for the rpm-info's <rights> tag
Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bookinfo.xsl 3 Jan 2006 00:38:44 -0000 1.7
+++ bookinfo.xsl 4 Jan 2006 01:30:06 -0000 1.8
@@ -65,6 +65,7 @@
</xsl:element>
</xsl:for-each>
</xsl:element>
+ &LEGALNOTICE;
</xsl:element>
</xsl:template>
18 years, 3 months
install-guide Makefile,1.16,1.17
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29223/install-guide
Modified Files:
Makefile
Log Message:
Remove old munge from packaging experiments
Index: Makefile
===================================================================
RCS file: /cvs/docs/install-guide/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile 14 Dec 2005 22:59:52 -0000 1.16
+++ Makefile 3 Jan 2006 02:01:39 -0000 1.17
@@ -33,67 +33,3 @@
#${DOCBASE}-en/index.html::
# echo FINISHED AT LAST
######################################################
-# Some packaging specific vars
-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/).\+//' }
-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
-DESKTOPIN=../docs-common/packaging/fedora-doc.desktop.in.common
-DOCSPEC=$(PWD)/SPECS/$(DOCBASE).spec
-DOCOMF=$(PWD)/SOURCES/fedora-doc-$(DOCBASE)-C.omf
-DOCDESKTOP=$(PWD)/SOURCES/fedora-doc-$(DOCBASE).desktop
-DOCSRCTAR=$(PWD)/SOURCES/$(DOCBASE)-$(VERSION).src.tar.gz
-TITLE=$(shell ../docs-common/packaging/titlegrab.py $(DOCBASE)-en.xml | sed 's/^ \+//')
-######################################################
-# Some RPM flags...
-######################################################
-RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)"
-######################################################
-
-
-clean::
- rm -rf fedora-doc-$(DOCBASE)*.rpm
-
-
-rpm: clean
-#
-# Make RPM-compliant tarball of source XML and other stuff
- mkdir $(DOCBASE)-$(VERSION)
- find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \) \
- | cpio -pamdv $(DOCBASE)-$(VERSION)
- find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
- -o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \
- | cpio -pamdv $(DOCBASE)-$(VERSION)
-#
-# Make RPM build tree; don't rely on local user's setup
- mkdir -p {BUILD,RPMS/noarch,SOURCES,SPECS,SRPMS}
- tar -zcvf $(DOCSRCTAR) $(DOCBASE)-$(VERSION)
- rm -rf $(DOCBASE)-$(VERSION)/
-#
-# 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)
-#
-# 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)
-#
-# Do the build...
-#
- rpmbuild -bb $(RPMFLAGS) $(DOCSPEC)
- mv RPMS/noarch/*.rpm .
- rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
- rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS}
- rm -rf $(DOCBASE)-$(VERSION)
18 years, 3 months
install-guide fedora-install-guide-en.xml,1.34,1.35
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27497
Modified Files:
fedora-install-guide-en.xml
Log Message:
Update entity BOOKID -> DOCID to meet new standards
Index: fedora-install-guide-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fedora-install-guide-en.xml 22 Dec 2005 14:54:15 -0000 1.34
+++ fedora-install-guide-en.xml 3 Jan 2006 01:08:41 -0000 1.35
@@ -8,7 +8,7 @@
<!ENTITY DOCLANG "en">
<!ENTITY DOCVERSION "1.1">
<!ENTITY DOCDATE "2005-12-22">
-<!ENTITY BOOKID "&DOCNAME;-&DOCLANG;-&DOCVERSION; (&DOCDATE;)">
+<!ENTITY DOCID "&DOCNAME;-&DOCLANG;-&DOCVERSION; (&DOCDATE;)">
<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
18 years, 3 months
docs-common/packaging info2rpminfo.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-serv27473/docs-common/packaging
Modified Files:
info2rpminfo.xsl
Log Message:
Break ties in revhistory
Index: info2rpminfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/info2rpminfo.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- info2rpminfo.xsl 2 Jan 2006 22:42:50 -0000 1.2
+++ info2rpminfo.xsl 3 Jan 2006 01:07:06 -0000 1.3
@@ -16,7 +16,7 @@
</xsl:element>
<xsl:element name="copyright">
<xsl:for-each select="copyright">
- <xsl:copy-of select="node()"/>
+ <xsl:copy-of select="."/>
</xsl:for-each>
</xsl:element>
<xsl:element name="titles">
@@ -58,7 +58,7 @@
</xsl:attribute-set>
- <xsl:template match="/book/bookinfo/title|/article/articleinfo/title">
+ <xsl:template match="bookinfo/title|articleinfo/title">
<xsl:element name="translation" use-attribute-sets="translation-atts">
<xsl:call-template name="translation"/>
</xsl:element>
@@ -66,7 +66,7 @@
</xsl:template>
<xsl:template name="translation">
- <xsl:element name="title"><xsl:value-of select="node()"/></xsl:element>
+ <xsl:element name="title"><xsl:value-of select="."/></xsl:element>
<xsl:element name="desc">PLEASE ADD BOOK/ARTICLE DESCRIPTION TO RPM-INFO</xsl:element>
<!-- Sorry, can't langify out of separate docs right now. -->
</xsl:template>
@@ -77,7 +77,7 @@
<xsl:template match="revhistory">
- <xsl:apply-templates select="revision"><xsl:sort select="date" order="descending"/></xsl:apply-templates>
+ <xsl:apply-templates select="revision"><xsl:sort select="date" order="descending"/><xsl:sort select="revnumber" order="descending"/></xsl:apply-templates>
</xsl:template>
<xsl:template match="revision">
@@ -85,7 +85,7 @@
<xsl:element name="author" use-attribute-sets="revision-worker-atts"/>
<xsl:for-each select="revdescription/para">
<xsl:element name="details" use-attribute-sets="revision-detail-atts">
- <xsl:value-of select="node()"/>
+ <xsl:value-of select="."/>
</xsl:element>
</xsl:for-each>
</xsl:element>
18 years, 3 months
docs-common/packaging bookinfo.xsl,1.6,1.7
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25798/docs-common/packaging
Modified Files:
bookinfo.xsl
Log Message:
Reduce unnecessary verbosity
Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bookinfo.xsl 2 Jan 2006 21:13:51 -0000 1.6
+++ bookinfo.xsl 3 Jan 2006 00:38:44 -0000 1.7
@@ -14,8 +14,8 @@
</xsl:element>
<xsl:for-each select="/rpm-info/copyright">
<xsl:element name="copyright">
- <xsl:for-each select="/rpm-info/copyright/year"><xsl:element name="year">
- <xsl:value-of select="node()"/>
+ <xsl:for-each select="year"><xsl:element name="year">
+ <xsl:value-of select="."/>
</xsl:element></xsl:for-each>
<xsl:for-each select="/rpm-info/copyright/holder">
<xsl:element name="holder">
18 years, 3 months