- merge xmlcatalog branch

- drop %%{version} from files location
- English es "translation" removed
- release 2

Changed files:
    docbook-style-xsl.spec -> 1.32

diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index 208cb39aca26dd1e953cb0d95a081f2d204fcaac..17a5ca575e3c020008e0787bf698d08e0479d0eb 100644 (file)
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -1,34 +1,40 @@
-Summary:       Modular DocBook Stylesheets
-Summary(es):   Norman Walsh's modular stylesheets for DocBook
+Summary:       Norman Walsh's modular stylesheets for DocBook
 Summary(pl):   Arkusze stylistyczne XSL dla DocBook DTD
 Summary(pt_BR):        Stylesheets modulares do Norman Walsh para DocBook
 Name:          docbook-style-xsl
 Version:       1.54.1
-Release:       1
+Release:       2
 License:       (C) 1997, 1998 Norman Walsh (Free)
 Group:         Applications/Publishing/XML
 Vendor:                Norman Walsh http://nwalsh.com/
-Source0:       http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz
+Source0:       http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.gz
 URL:           http://docbook.sourceforge.net/projects/xsl/index.html
+BuildRequires: /usr/bin/xmlcatalog
+Requires(post,postun): /usr/bin/xmlcatalog
+Requires(post,postun): /etc/xml/catalog
+Requires:      /etc/xml/catalog
 Requires:      sgml-common >= 0.5
-BuildArch:     noarch
 AutoReqProv:   0
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# think about _javaclassdir location
 %define                _javaclassdir   %{_datadir}/java/classes
+%define xsl_path %{_datadir}/sgml/docbook/xsl-stylesheets
+%define catalog  %{xsl_path}/catalog.xml
+# please look into docbook-dtd42-xml.spec
+%define xmlcat_add_rewrite()  /usr/bin/xmlcatalog --noout --add rewriteSystem %1 %2 %3
+%define xmlcat_create()       /usr/bin/xmlcatalog --noout --create %1
 
 %description
-XSL is a stylesheet language for both print and online rendering.
-There is XSL stylesheets for DocBook DTD.
-
-%description -l es
-These XSL stylesheets allow to produce XSL FO trees or HTML / XHTML
-with any DocBook XML document. They are highly customizable.
+Highly customizable XSL stylesheets for DocBook XML DTD. The
+stylesheets allow to produce documents in XSL FO, HTML or XHTML
+formats.
 
 %description -l pl
-docbook-xsl jest zbiorem arkuszy stylistycznych pozwalaj±cych
-przekszta³ciæ dokument napisany w DocBook DTD na prezentacjê on-line
-(wykorzystuj±c HTML) lub na drukowany dokument.
+Konfigurowalne arkusze stylistyczne dla DocBook XML DTD. Arkusze
+stylistyczne, zawarte w tym pakiecie, umo¿liwiaj± tworzenie dokumentów
+w formacie XSL FO, HTML lub XHTML.
 
 %description -l pt_BR
 Stylesheets modulares do Norman Walsh para DocBook.
@@ -38,50 +44,47 @@ Stylesheets modulares do Norman Walsh para DocBook.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets \
+install -d $RPM_BUILD_ROOT{%{xsl_path},%{_sysconfdir}/xml} \
        $RPM_BUILD_ROOT%{_javaclassdir}
 
-cp -a * $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets
+cp -a * $RPM_BUILD_ROOT%{xsl_path}
 
 install extensions/*.jar $RPM_BUILD_ROOT%{_javaclassdir}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets/doc \
-       $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets/BUGS \
-       $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets/ChangeLog \
-       $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets/README \
-       $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets/RELEASE-NOTES.html \
-       $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets/RELEASE-NOTES.xml \
-       $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets/TODO \
-       $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-stylesheets/WhatsNew \
+%xmlcat_create $RPM_BUILD_ROOT%{catalog}
+ 
+%xmlcat_add_rewrite http://docbook.sourceforge.net/release/xsl/%{version} file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
+
+rm -rf $RPM_BUILD_ROOT%{xsl_path}/doc \
+       $RPM_BUILD_ROOT%{xsl_path}/BUGS \
+       $RPM_BUILD_ROOT%{xsl_path}/ChangeLog \
+       $RPM_BUILD_ROOT%{xsl_path}/README \
+       $RPM_BUILD_ROOT%{xsl_path}/RELEASE-NOTES.html \
+       $RPM_BUILD_ROOT%{xsl_path}/RELEASE-NOTES.xml \
+       $RPM_BUILD_ROOT%{xsl_path}/TODO \
+       $RPM_BUILD_ROOT%{xsl_path}/WhatsNew \
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre 
-if [ -L %{_datadir}/sgml/docbook/xsl-stylesheets ] ; then
-       rm -rf %{_datadir}/sgml/docbook/xsl-stylesheets
+if [ -L %{xsl_path} ] ; then
+       rm -rf %{xsl_path}
 fi
 
+%post
+if ! grep -q %{catalog} /etc/xml/catalog ; then
+       /usr/bin/xmlcatalog --noout --add nextCatalog "" %{catalog} /etc/xml/catalog
+fi 
+ 
+%preun
+if [ "$1" = "0" ] ; then
+       /usr/bin/xmlcatalog --noout --del %{catalog} /etc/xml/catalog
+fi
 
 %files
 %defattr(644,root,root,755)
 %doc doc ChangeLog WhatsNew BUGS TODO README RELEASE-NOTES.*
 %{_javaclassdir}/*
-%dir %{_datadir}/sgml/docbook/xsl-stylesheets
-%{_datadir}/sgml/docbook/xsl-stylesheets/VERSION
-%{_datadir}/sgml/docbook/xsl-stylesheets/common
-%{_datadir}/sgml/docbook/xsl-stylesheets/docsrc
-%{_datadir}/sgml/docbook/xsl-stylesheets/extensions
-%{_datadir}/sgml/docbook/xsl-stylesheets/fo
-%{_datadir}/sgml/docbook/xsl-stylesheets/html
-%{_datadir}/sgml/docbook/xsl-stylesheets/htmlhelp
-%{_datadir}/sgml/docbook/xsl-stylesheets/images
-%{_datadir}/sgml/docbook/xsl-stylesheets/javahelp
-%{_datadir}/sgml/docbook/xsl-stylesheets/lib
-%{_datadir}/sgml/docbook/xsl-stylesheets/params
-%{_datadir}/sgml/docbook/xsl-stylesheets/profiling
-%{_datadir}/sgml/docbook/xsl-stylesheets/template
-%{_datadir}/sgml/docbook/xsl-stylesheets/tools
-%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml
-%{_datadir}/sgml/docbook/xsl-stylesheets/manpages
+%{xsl_path}