- completly rewrited in PLD style (release 11).

Changed files:
    docbook-dtd30-sgml.spec -> 1.2

diff --git a/docbook-dtd30-sgml.spec b/docbook-dtd30-sgml.spec
index ebdd24e1a1debf0c8b31fd83a3415dcceb2bf3a5..4c37eb8e6d9357e6ce1d1116983ff53ff02257c5 100644 (file)
--- a/docbook-dtd30-sgml.spec
+++ b/docbook-dtd30-sgml.spec
@@ -1,60 +1,52 @@
-Name: docbook-dtd30-sgml
-Version: 1.0
-Release: 10
-Group: Applications/Text
-
-Summary: SGML document type definition for DocBook.
-
-License: Distributable
-URL: http://www.oasis-open.org/docbook/
-
-Provides: docbook-dtd-sgml
-Requires: sgml-common >= 0.5
-Requires(post,postun): sgml-common >= 0.5 fileutils
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-
-BuildArch: noarch
-Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
-Source1: %{name}-%{version}.Makefile
-Patch0: %{name}-%{version}.catalog.patch
-BuildRequires: unzip
+Summary:       SGML document type definition for DocBook 3.0
+Name:          docbook-dtd30-sgml
+Version:       1.0
+Release:       11
+License:       Distributable
+Group:         Applications/Text
+Group(de):     Applikationen/Text
+Group(pl):     Aplikacje/Tekst
+Source0:       http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
+Source1:       %{name}-Makefile
+Patch0:                %{name}-catalog.patch
+URL:           http://www.oasis-open.org/docbook/
+BuildRequires: unzip
+Requires:      sgml-common >= 0.5
+Requires(post):                sgml-common >= 0.5
+Requires(postun):      sgml-common >= 0.5
+Requires:      fileutils
+BuildArch:     noarch
+Provides:      docbook-dtd-sgml
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

 
 %description
 The DocBook Document Type Definition (DTD) describes the syntax of
 
 %description
 The DocBook Document Type Definition (DTD) describes the syntax of

-technical documentation texts (articles, books and manual pages).
-This syntax is SGML-compliant and is developed by the OASIS consortium.
+technical documentation texts (articles, books and manual pages). This
+syntax is SGML-compliant and is developed by the OASIS consortium.

 This is the version 3.0 of this DTD.
 
 
 %prep
 This is the version 3.0 of this DTD.
 
 
 %prep

-%setup -c -T
+%setup -q -c -T

 unzip %{SOURCE0}
 unzip %{SOURCE0}

-if [ `id -u` -eq 0 ]; then
-  chown -R root.root .
-  chmod -R a+rX,g-w,o-w .
-fi
+chmod -R a+rX,g-w,o-w .

 cp %{SOURCE1} Makefile
 cp %{SOURCE1} Makefile

-patch -b docbook.cat $RPM_SOURCE_DIR/%{name}-%{version}.catalog.patch
-
-%build
-
+patch -b docbook.cat $RPM_SOURCE_DIR/%{name}-catalog.patch

 
 %install
 
 %install

-DESTDIR=$RPM_BUILD_ROOT
-rm -rf $DESTDIR
-make install DESTDIR=$DESTDIR/usr/share/sgml/docbook/sgml-dtd-3.0
+rm -rf $RPM_BUILD_ROOT

 
 

+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+gzip -9nf *.txt

 
 %clean
 
 %clean

-DESTDIR=$RPM_BUILD_ROOT

 rm -rf $DESTDIR
 
 rm -rf $DESTDIR
 

-

 %files
 %files

-%defattr (-,root,root)
-%doc *.txt
-/usr/share/sgml/docbook/sgml-dtd-3.0
+%defattr(644,root,root,755)
+%doc *.gz
+%{_datadir}/sgml/docbook/sgml-dtd-3.0

 
 
 %post
 
 
 %post


@@ -67,13 +59,12 @@ rm -rf $DESTDIR
 STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)
 STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-}
 if [ "$STYLESHEETS" != "*" ]; then
 STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)
 STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-}
 if [ "$STYLESHEETS" != "*" ]; then

-    /usr/bin/install-catalog --add /etc/sgml/sgml-docbook-3.0.cat /usr/share/sgml/openjade-1.3/catalog > /dev/null
-    /usr/bin/install-catalog --add /etc/sgml/sgml-docbook-3.0.cat /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog > /dev/null
+       /usr/bin/install-catalog --add /etc/sgml/sgml-docbook-3.0.cat /usr/share/sgml/openjade-1.3/catalog > /dev/null
+       /usr/bin/install-catalog --add /etc/sgml/sgml-docbook-3.0.cat /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog > /dev/null

 fi
 
 # Update the link to the current version of the DTD
 fi
 
 # Update the link to the current version of the DTD

-ln -s -f /etc/sgml/sgml-docbook-3.0.cat /etc/sgml/sgml-docbook.cat
-
+ln -sf /etc/sgml/sgml-docbook-3.0.cat /etc/sgml/sgml-docbook.cat

 
 %postun
 # Update the centralized catalog corresponding to this version of the DTD
 
 %postun
 # Update the centralized catalog corresponding to this version of the DTD


@@ -85,42 +76,13 @@ ln -s -f /etc/sgml/sgml-docbook-3.0.cat /etc/sgml/sgml-docbook.cat
 STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)
 STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-}
 if [ "$STYLESHEETS" != "*" ]; then
 STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)
 STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-}
 if [ "$STYLESHEETS" != "*" ]; then

-    /usr/bin/install-catalog --remove /etc/sgml/sgml-docbook-3.0.cat /usr/share/sgml/openjade-1.3/catalog > /dev/null
-    /usr/bin/install-catalog --remove /etc/sgml/sgml-docbook-3.0.cat /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog > /dev/null
+       /usr/bin/install-catalog --remove /etc/sgml/sgml-docbook-3.0.cat /usr/share/sgml/openjade-1.3/catalog > /dev/null
+       /usr/bin/install-catalog --remove /etc/sgml/sgml-docbook-3.0.cat /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog > /dev/null

 fi
 
 # Update the link to the current version of the DTD
 if [ ! -e /etc/sgml/sgml-docbook-3.0.cat ]; then
 fi
 
 # Update the link to the current version of the DTD
 if [ ! -e /etc/sgml/sgml-docbook-3.0.cat ]; then

-    rm -f /etc/sgml/sgml-docbook.cat
-    OTHERCAT=`ls /etc/sgml/sgml-docbook-?.?.cat 2> /dev/null | head --lines 1`
-    if [ -n "$OTHERCAT" ]; then ln -s $OTHERCAT /etc/sgml/sgml-docbook.cat; fi
+       rm -f /etc/sgml/sgml-docbook.cat
+       OTHERCAT=`ls /etc/sgml/sgml-docbook-?.?.cat 2> /dev/null | head --lines 1`
+       if [ -n "$OTHERCAT" ]; then ln -s $OTHERCAT /etc/sgml/sgml-docbook.cat; fi

 fi
 fi

-
-%changelog
-* Wed Jan 24 2001 Tim Waugh <twaugh@redhat.com>
-- Scripts require fileutils.
-- Make scripts quieter.
-
-* Mon Jan 15 2001 Tim Waugh <twaugh@redhat.com>
-- Don't play so many macro games.
-- Don't use 'rpm' in post scripts.
-- Make sure to own the sgml-dtd-3.0 directory.
-
-* Sun Jan 14 2001 Tim Waugh <twaugh@redhat.com>
-- Change requirement on /usr/bin/install-catalog to sgml-common.
-
-* Fri Jan 12 2001 Tim Waugh <twaugh@redhat.com>
-- Change Copyright: to License:.
-- Remove Packager: line.
-
-* Tue Jan 09 2001 Tim Waugh <twaugh@redhat.com>
-- Change group.
-- Use %%{_tmppath}.
-- rm before install.
-- openjade not jade.
-- Correct typo.
-- Build requires unzip.
-- Require install-catalog for post and postun.
-
-* Tue Jan 09 2001 Tim Waugh <twaugh@redhat.com>
-- Based on Eric Bischoff's new-trials packages.