diff --git a/.cvsignore b/.cvsignore index f6a4e56..61fc01f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -docbook-dsssl-1.76.tar.gz +docbook-dsssl-1.78.tar.gz diff --git a/docbook-style-dsssl.Makefile b/docbook-style-dsssl.Makefile new file mode 100644 index 0000000..edd098a --- /dev/null +++ b/docbook-style-dsssl.Makefile @@ -0,0 +1,45 @@ +BINDIR = /usr/bin +DESTDIR = /usr/share/sgml/docbook/dsssl-stylesheets-1.74b + +all: install + +install: install-bin install-dtd install-dsl install-img install-misc + +install-bin: + mkdir -p $(BINDIR) + install bin/collateindex.pl $(BINDIR) + +install-dtd: + mkdir -p $(DESTDIR)/dtds/{decls,dbdsssl,html,imagelib,olink} + cp dtds/decls/docbook.dcl $(DESTDIR)/dtds/decls + cp dtds/decls/xml.dcl $(DESTDIR)/dtds/decls + cp dtds/dbdsssl/dbdsssl.dtd $(DESTDIR)/dtds/dbdsssl + cp dtds/html/dbhtml.dtd $(DESTDIR)/dtds/html + cp dtds/html/ISOlat1.gml $(DESTDIR)/dtds/html + cp dtds/imagelib/imagelib.dtd $(DESTDIR)/dtds/imagelib + cp dtds/olink/olinksum.dtd $(DESTDIR)/dtds/olink + +install-dsl: + mkdir -p $(DESTDIR)/{lib,common,html,print,olink} + cp lib/dblib.dsl $(DESTDIR)/lib + cp common/*.dsl $(DESTDIR)/common + cp common/*.ent $(DESTDIR)/common + cp html/*.dsl $(DESTDIR)/html + cp lib/dblib.dsl $(DESTDIR)/lib + cp print/*.dsl $(DESTDIR)/print + +install-img: + mkdir -p $(DESTDIR)/images/callouts + cp images/*.gif $(DESTDIR)/images + cp images/callouts/*.gif $(DESTDIR)/images/callouts + +#install-test: +# mkdir -p $(DESTDIR)/test/{cases,imagelib,xml} +# cp test/*.* $(DESTDIR)/test +# cp test/cases/*.* $(DESTDIR)/test/cases +# cp test/imagelib/*.* $(DESTDIR)/test/imagelib +# cp test/xml/*.* $(DESTDIR)/test/xml + +install-misc: + cp catalog $(DESTDIR) + cp VERSION $(DESTDIR) diff --git a/docbook-style-dsssl.spec b/docbook-style-dsssl.spec index 902e614..f1f4f30 100644 --- a/docbook-style-dsssl.spec +++ b/docbook-style-dsssl.spec @@ -1,6 +1,6 @@ Name: docbook-style-dsssl -Version: 1.76 -Release: 8 +Version: 1.78 +Release: 2 Group: Applications/Text Summary: Norman Walsh's modular stylesheets for DocBook. @@ -8,9 +8,9 @@ Summary: Norman Walsh's modular stylesheets for DocBook. License: Distributable URL: http://docbook.sourceforge.net/ -%define openjadever 1.3.1 +%define openjadever 1.3.2 Requires: openjade = %{openjadever} -PreReq: docbook-dtd-sgml +PreReq: docbook-dtds >= 1.0-19 PreReq: sgml-common >= 0.5 PreReq: openjade = %{openjadever} Conflicts: docbook-utils < 0.6.9-4 @@ -19,10 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version} BuildArch: noarch Source0: http://prdownloads.sourceforge.net/docbook/docbook-dsssl-%{version}.tar.gz -Source1: %{name}-%{version}.Makefile +Source1: %{name}.Makefile Patch0: docbook-dsssl-1.76-articleinfo.patch -Patch1: docbook-dsssl-1.76-seealso.patch -Patch2: docbook-dsssl-1.76-aname.patch %description @@ -33,8 +31,6 @@ They are highly customizable. %prep %setup -q -n docbook-dsssl-%{version} %patch0 -p1 -b .articleinfo -%patch1 -p1 -b .seealso -%patch2 -p1 -b .aname cp %{SOURCE1} Makefile @@ -63,10 +59,24 @@ rm -rf $DESTDIR %post +rel=$(echo /etc/sgml/sgml-docbook-3.0-*.cat) +rel=${rel##*-} +rel=${rel%.cat} for centralized in /etc/sgml/*-docbook-*.cat -do /usr/bin/install-catalog --add $centralized /usr/share/sgml/openjade-%{openjadever}/catalog > /dev/null 2>/dev/null - /usr/bin/install-catalog --remove $centralized /usr/share/sgml/docbook/dsssl-stylesheets-*/catalog >/dev/null 2>/dev/null - /usr/bin/install-catalog --add $centralized /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null +do + /usr/bin/install-catalog --remove $centralized \ + /usr/share/sgml/docbook/dsssl-stylesheets-*/catalog \ + >/dev/null 2>/dev/null +done + +for centralized in /etc/sgml/*-docbook-*$rel.cat +do + /usr/bin/install-catalog --add $centralized \ + /usr/share/sgml/openjade-%{openjadever}/catalog \ + > /dev/null 2>/dev/null + /usr/bin/install-catalog --add $centralized \ + /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog \ + > /dev/null 2>/dev/null done @@ -77,8 +87,17 @@ if [ "$1" = "0" ]; then /usr/bin/install-catalog --remove $centralized /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null done fi +exit 0 %changelog +* Fri Mar 28 2003 Tim Waugh 1.78-2 +- Require new docbook-dtds. +- Fix %%post scriptlet. + +* Fri Mar 14 2003 Tim Waugh 1.78-1 +- Require openjade 1.3.2. +- 1.78, incorporating seealso, aname patches. + * Wed Jan 22 2003 Tim Powers - rebuilt diff --git a/sources b/sources index b3dd92c..9fbb54a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2e54d98b90a46fa3072d14d3e88aa30 docbook-dsssl-1.76.tar.gz +f60521a38bd425e76f50d3f15b0325c0 docbook-dsssl-1.78.tar.gz