diff --git a/.cvsignore b/.cvsignore index dca36cf..dad4dda 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sgml-common.tgz +sgml-common-0.5.tgz diff --git a/sgml-common-CHANGES b/sgml-common-CHANGES new file mode 100644 index 0000000..cccc290 --- /dev/null +++ b/sgml-common-CHANGES @@ -0,0 +1,15 @@ + o Linux Standard Base SGML & XML adherence -- DocBook packages + which adhere to the LSB addendum concerning SGML & XML are now + included. This means that catalog files are now located in a + different place than they were in previous releases. + + There is now a super catalog, /etc/sgml/catalog, which contains + entries for a number of centralised catalogs, in /etc/sgml. The + centralised catalogs contain entries for DTD-specific files, + which are located in subdirectories in /usr/share/sgml (instead + of /usr/lib/sgml as in previous releases). + + The utility names for converting DocBook documents to other + formats are now named (for example) docbook2ps instead of db2ps; + the old names are provided for compatibility with previous + releases, but may be removed at a future date. diff --git a/sgml-common.spec b/sgml-common.spec index ff08077..76e926f 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -1,15 +1,23 @@ -Summary: Common SGML catalog and DTD files. Name: sgml-common -%define version 0.1 -%define release 10 -Version: %{version} -Release: %{release} -Source: ftp://sourceware.cygnus.com/pub/docbook-tools/SOURCES/sgml-common.tgz -Copyright: freely distributable +Version: 0.5 +Release: 5 Group: Applications/Text + +Summary: Common SGML catalog and DTD files. + +License: GPL +URL: http://www.iso.ch/cate/3524030.html + +Requires: sh-utils fileutils textutils grep + +BuildRoot: %{_tmppath}/%{name}-%{version} + BuildArch: noarch -BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root -Prefix: /usr +Source0: %{name}-%{version}.tgz +Source1: sgml-common-CHANGES +Patch0: sgml-common-oldsyntax.patch +Patch1: sgml-common-quiet.patch + %description The sgml-common package contains a collection of entities and DTDs @@ -17,136 +25,70 @@ that are useful for processing SGML, but that don't need to be included in multiple packages. Sgml-common also includes an up-to-date Open Catalog file. + %prep -%setup -c +%setup -q +%patch0 -p1 -b .oldsyntax +%patch1 -p1 -b .quiet + %build -gawk --posix '/Typical invocation:/,/\-\-\>/ { print }' sgml-common/* | -gawk --posix '/PUBLIC/ { sys=$3 } - /8879:1986.*\"\>/ { saveline=""; print "PUBLIC " $0 " " sys; next } - /8879:1986[^>]*$/ { saveline = $0; next } - /\"\>/ { print "PUBLIC " saveline $0 " " sys; saveline="";next } -' | -sed 's/\">/\"/' > newcat -cat > install-catalog << '__EOF__' -#!/bin/sh -set -e -sgmlbase=%{prefix}/lib/sgml -state="" -package="" -version="" - -for i in $*; do - case $state in - "") - case $i in - --install) state="--install" ; action="install";; - --remove) state="--remove" ; action="remove";; - --sgmlbase) state="--sgmlbase" ;; - --version) state="--version" ;; - *) cat <<__USAGE__ -Usage: - --install pkg: installs pkg.cat in CATALOG - --remove pkg: removes pkg.cat from CATALOG - --version ver: qualify version of package - --sgmlbase path: changes directory for pkg.cat and CATALOG -__USAGE__ - exit 0 - ;; - esac - ;; - --install) state="" ; package=$i ;; - --remove) state="" ; package=$i ;; - --sgmlbase) state="" ; sgmlbase=$i;; - --version) state="" ; version=$i ;; - esac -done - -echo "install-catalog: $action of $package DTD" - -cat=$sgmlbase/CATALOG - -SBEG=" -- start $package $version" -SEND=" -- end $package $version" - -case $action in - install) - if grep -q "$SBEG" $cat - then - echo "$package DTD already in catalog" - else - echo "adding $package DTD to catalog" - (echo "$SBEG -- "; - cat $sgmlbase/$package.cat ; - echo "$SEND -- ") >> $cat - fi - ;; - remove) - if grep -q "$SBEG" $cat - then - echo "removing $package$version DTD from catalog" - sed -e "\#$SBEG#,\#$SEND#d" < $cat > ${cat}.new - mv ${cat}.new ${cat} - else - echo "No $package$version DTD found in catalog" - fi - ;; - *) echo "install-catalog: Invalid action $action"; exit 1 ;; -esac -__EOF__ -chmod +x install-catalog %install rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/share/sgml/sgml-iso-entities-8879.1986 +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/etc/sgml +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 +install *.dcl $RPM_BUILD_ROOT/usr/share/sgml +install iso-entities/*.ent $RPM_BUILD_ROOT/usr/share/sgml/sgml-iso-entities-8879.1986 +install iso-entities/catalog $RPM_BUILD_ROOT/usr/share/sgml/sgml-iso-entities-8879.1986 +install bin/* $RPM_BUILD_ROOT/usr/bin/ +install config/* $RPM_BUILD_ROOT/etc/sgml/ +install doc/man/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ +cp %{SOURCE1} CHANGES -mkdir -p $RPM_BUILD_ROOT/%{prefix}/{bin,lib/sgml} - -install sgml-common/* $RPM_BUILD_ROOT/%{prefix}/lib/sgml -install newcat $RPM_BUILD_ROOT/%{prefix}/lib/sgml/sgml-common.cat - -install -m 755 install-catalog $RPM_BUILD_ROOT/%{prefix}/bin %clean -rm -rf $RPM_BUILD_ROOT +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR -%post -touch %{prefix}/lib/sgml/CATALOG -# since old-postun is run *after* new-post, we must always cycle. -V=%{version}-%{release} -%{prefix}/bin/install-catalog --install sgml-common --version $V >/dev/null - -%postun -# since old-postun is run *after* new-post, we must always cycle. -V=%{version}-%{release} -%{prefix}/bin/install-catalog --remove sgml-common --version $V >/dev/null %files -%defattr(-,root,root) -%{prefix}/lib/sgml/* -%{prefix}/bin/install-catalog +%defattr (-,root,root) +%doc doc/HTML/ CHANGES +%config /etc/sgml/sgml.conf +/usr/share/sgml/xml.dcl +/usr/share/sgml/sgml-iso-entities-8879.1986/* +/usr/bin/sgmlwhich +/usr/bin/install-catalog +%{_mandir}/*/* %changelog -* Wed Jul 12 2000 Prospector -- automatic rebuild +* Wed Mar 14 2001 Tim Powers +- fixed license -* Sat Jun 20 2000 Bill Nottingham -- rebuild +* Wed Jan 24 2001 Tim Waugh +- Make install-catalog quieter during normal operation. -* Wed Apr 13 2000 Bill Nottingham -- install-catalog didn't like catalogs with \ in the name, which we ship. oops +* Tue Jan 23 2001 Tim Waugh +- Require textutils, fileutils, grep (bug #24719). -* Wed Jan 5 2000 Bill Nottingham -- sanitize spec file some +* Wed Jan 17 2001 Tim Waugh +- Require sh-utils. -* Mon Aug 30 1999 Tim Powers -- changed group -- changed buildroot to be in /var/tmp +* Mon Jan 15 2001 Tim Waugh +- Don't play so many macro games. +- Fix typo in install-catalog patch. -* Wed Jul 21 1999 Tim Powsrs -- rebuilt for 6.1 +* Mon Jan 08 2001 Tim Waugh +- Change group. +- Install by hand (man/en/...). Use %%{_mandir}. +- Use %%{_tmppath}. +- Make install-catalog fail silently if given the old syntax. +- Add CHANGES file. +- Change Copyright: to License:. +- Remove Packager: line. -* Fri Apr 23 1999 Michael K. Johnson -- quiet scripts - -* Thu Apr 22 1999 Owen Taylor -- Made noarch +* Mon Jan 08 2001 Tim Waugh +- Based on Eric Bischoff's new-trials packages. diff --git a/sources b/sources index 3028e45..a8b3ef6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46ea2c05ca7cefccc456a6a88137c687 sgml-common.tgz +6a426886a34403f7612d48052999171b sgml-common-0.5.tgz