From df92858f6566afb53f16b8d340b679c4a54a9403 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 1 Dec 2003 18:21:32 +0000 Subject: [PATCH] changed doc build again to use docbook2 tools. Original commit message from CVS: changed doc build again to use docbook2 tools. *please* stop quickfixing the docs build, I'm tired of tracking and properly fixing the build at the whim of each developer :) --- common | 2 +- docs/manuals.mak | 2 +- gstreamer.spec.in | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common b/common index 2c2bce0..b5288e8 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2c2bce01ed5ed1d1684bd76a334477398009ef4a +Subproject commit b5288e8215c6eacf0782880f6c5b6dea8f445a34 diff --git a/docs/manuals.mak b/docs/manuals.mak index ee860df..9c5e98b 100644 --- a/docs/manuals.mak +++ b/docs/manuals.mak @@ -95,7 +95,7 @@ html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC) @echo "*** Generating HTML output ***" @-mkdir -p html @cp -f $(srcdir)/../image-png $(BUILDDIR)/image.entities - @cd $(BUILDDIR) && xmlto html -o ../html $(MAIN) + @cd $(BUILDDIR) && docbook2html -o ../html $(MAIN) @test "x$(CSS)" != "x" && \ echo "Copying .css files: $(CSS)" && \ cp $(srcdir)/$(CSS) html diff --git a/gstreamer.spec.in b/gstreamer.spec.in index 0f5320b..008c5b9 100644 --- a/gstreamer.spec.in +++ b/gstreamer.spec.in @@ -31,8 +31,10 @@ Prereq: /sbin/ldconfig ### documentation requirements BuildRequires: openjade BuildRequires: python2 -BuildRequires: docbook-style-dsssl docbook-dtd31-sgml -BuildRequires: transfig xfig +BuildRequires: docbook-style-dsssl +BuildRequires: docbook-utils +BuildRequires: transfig +BuildRequires: xfig %description GStreamer is a streaming-media framework, based on graphs of filters which @@ -208,6 +210,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %changelog +* Mon Dec 01 2003 Thomas Vander Stichele +- changed documentation buildrequires + * Sun Nov 09 2003 Christian Schaller - Fix spec to handle new bytestream library -- 2.7.4