- when removing ISO entries from catalog, don't break its syntax

- mention DocBook version in descriptions
- release 2

diff --git a/docbook-dtd43-sgml.spec b/docbook-dtd43-sgml.spec
index 5af4bfaf40d4a560121198366e7a66b5636173ea..40574d5f8fd60a801dbac0e27cf580b8d086c26a 100644 (file)
--- a/docbook-dtd43-sgml.spec
+++ b/docbook-dtd43-sgml.spec
@@ -1,15 +1,15 @@
 %define ver    4.3
 %define sver   43
-Summary:       DocBook - DTD for technical documentation
-Summary(pl.UTF-8):     DocBook - DTD przeznaczone do pisania dokumentacji technicznej
+Summary:       DocBook 4.3 SGML - DTD for technical documentation
+Summary(pl.UTF-8):     DocBook 4.3 SGML - DTD przeznaczone do pisania dokumentacji technicznej
 Name:          docbook-dtd%{sver}-sgml
 Version:       1.0
-Release:       1
+Release:       2
 License:       Free
 Group:         Applications/Publishing/SGML
-URL:           http://www.oasis-open.org/docbook/
 Source0:       http://www.oasis-open.org/docbook/sgml/%{ver}/docbook-%{ver}.zip
 # Source0-md5: e3beb1b0b2923c24fa55a68e88654b01
+URL:           http://www.oasis-open.org/docbook/
 BuildRequires: unzip
 Requires(post,postun): sgml-common >= 0.5
 Requires:      sgml-common >= 0.5
@@ -21,13 +21,13 @@ BuildArch:  noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-DocBook - DTD for technical documentation.
+DocBook 4.3 SGML - DTD for technical documentation.
 
 %description -l pl.UTF-8
 DocBook DTD jest zestawem definicji dokumentów przeznaczonych do
 tworzenia dokumentacji programistycznej. Stosowany jest do pisania
 podręczników systemowych, instrukcji technicznych jak i wielu innych
-ciekawych rzeczy.
+ciekawych rzeczy. Ten pakiet zawiera wersję DocBook 4.3 SGML.
 
 %prep
 %setup -q -c
@@ -37,10 +37,10 @@ chmod 644 *
 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}/
+install *.dtd *.mod *.dcl $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}
 
 # install catalog (but filter out ISO entities)
-grep -v 'ISO ' docbook.cat > $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}/catalog
+grep -Ev '^(PUBLIC "ISO| *"iso-)' docbook.cat > $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/sgml-dtd-%{ver}/catalog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,5 +57,5 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog
-%{_datadir}/sgml/docbook/*
+%doc ChangeLog README
+%{_datadir}/sgml/docbook/sgml-dtd-4.3