- release 13

- use sgml-iso-ent-fix
- fix %%post/%%postun scripts
- new %%doc

Changed files:
    docbook-dtd41-sgml.spec -> 1.10

diff --git a/docbook-dtd41-sgml.spec b/docbook-dtd41-sgml.spec
index 4fb42e9bd8dca8328888e4d254a9e0cb7f616d73..e8848e80f13e37e86e4386c65e33bb0bdff66846 100644 (file)
--- a/docbook-dtd41-sgml.spec
+++ b/docbook-dtd41-sgml.spec
@@ -4,15 +4,17 @@ Summary(pl):  DocBook - DTD przeznaczone do pisania dokumentacji technicznej
 %define sver   41
 Name:          docbook-dtd%{sver}-sgml
 Version:       1.0
 %define sver   41
 Name:          docbook-dtd%{sver}-sgml
 Version:       1.0

-Release:       12
+Release:       13

 Vendor:                OASIS
 License:       Free
 Group:         Applications/Publishing/SGML
 URL:           http://www.oasis-open.org/docbook/
 Source0:       http://www.oasis-open.org/docbook/sgml/%{ver}/docbk%{sver}.zip
 BuildRequires: unzip
 Vendor:                OASIS
 License:       Free
 Group:         Applications/Publishing/SGML
 URL:           http://www.oasis-open.org/docbook/
 Source0:       http://www.oasis-open.org/docbook/sgml/%{ver}/docbk%{sver}.zip
 BuildRequires: unzip

-Prereq:                sgml-common >= 0.5
+BuildRequires: sgml-common >= 0.5-9
+Requires(post,postun): sgml-common >= 0.5

 Requires:      sgmlparser
 Requires:      sgmlparser

+Requires:      sgml-common >= 0.5-9

 Provides:      docbook-dtd
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Provides:      docbook-dtd
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -37,25 +39,33 @@ chmod 644 *
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}
 
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}
 

-install *.dtd *.mod *.dcl $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}
+for ent in *.dtd *.mod *.dcl ; do
+       sgml-iso-ent-fix < $ent > $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}/$ent
+done

 
 # install catalog (but filter out ISO entities)
 grep -v 'ISO ' docbook.cat > $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}/catalog
 
 
 # install catalog (but filter out ISO entities)
 grep -v 'ISO ' docbook.cat > $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}/catalog
 

-gzip -9nf *.txt
-[ ! -f ChangeLog ] || gzip -9nf ChangeLog

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

+%triggerpostun -- %{name} < 1.0-13
+if ! grep -q /etc/sgml/sgml-docbook-%{ver}.cat /etc/sgml/catalog ; then
+       /usr/bin/install-catalog --add /etc/sgml/sgml-docbook-%{ver}.cat /usr/share/sgml/docbook/sgml-dtd-%{ver}/catalog > /dev/null
+fi
+

 %post
 %post

-# Update the centralized catalog corresponding to this version of the DTD
-/usr/bin/install-catalog --add /etc/sgml/sgml-docbook-%{ver}.cat /usr/share/sgml/docbook/sgml-dtd-%{ver}/catalog > /dev/null
+if ! grep -q /etc/sgml/sgml-docbook-%{ver}.cat /etc/sgml/catalog ; then
+       /usr/bin/install-catalog --add /etc/sgml/sgml-docbook-%{ver}.cat /usr/share/sgml/docbook/sgml-dtd-%{ver}/catalog > /dev/null
+fi

 
 %postun
 
 %postun

-/usr/bin/install-catalog --remove /etc/sgml/sgml-docbook-%{ver}.cat /usr/share/sgml/docbook/sgml-dtd-%{ver}/catalog > /dev/null
+if [ "$1" = "0" ] ; then
+       /usr/bin/install-catalog --remove /etc/sgml/sgml-docbook-%{ver}.cat /usr/share/sgml/docbook/sgml-dtd-%{ver}/catalog > /dev/null
+fi

 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc *.gz
+%doc *.txt ChangeLog

 %{_datadir}/sgml/docbook/*
 %{_datadir}/sgml/docbook/*