diff --git a/suse-xsl-stylesheets-1.9.tar.bz2 b/suse-xsl-stylesheets-1.9.tar.bz2 index 2b96d4e..2a35ce7 100644 --- a/suse-xsl-stylesheets-1.9.tar.bz2 +++ b/suse-xsl-stylesheets-1.9.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fb14f81a3d41a133ba124192f9b61f0df74571bdeed379b4329e1c11212645a -size 142390 +oid sha256:c1f082d6ff09d86e66408fea31a4f5124c779c06f90b9cf05183c01e01da2791 +size 142282 diff --git a/suse-xsl-stylesheets.changes b/suse-xsl-stylesheets.changes index bdba763..1401921 100644 --- a/suse-xsl-stylesheets.changes +++ b/suse-xsl-stylesheets.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 10 10:15:30 UTC 2012 - fsundermeyer@opensuse.org + +Bugfix: Added Catalog entries for the URI to + /etc/xml/suse-catalog.xml + ------------------------------------------------------------------- Fri Feb 10 09:18:58 UTC 2012 - fsundermeyer@opensuse.org diff --git a/suse-xsl-stylesheets.spec b/suse-xsl-stylesheets.spec index a803188..07c45a0 100644 --- a/suse-xsl-stylesheets.spec +++ b/suse-xsl-stylesheets.spec @@ -9,14 +9,29 @@ # # +############################################################### +# +# ATTENTION: Do NOT edit this file outside of +# https://svn.code.sf.net/p/daps/svn/trunk/daps/\ +# suse-xslt/packaging/suse-xsl-stylesheets.spec +# +# Your changes will be lost on the next update +# If you do not have access to the SVN repository, notify +# and +# or send a patch +# +################################################################ + + Name: suse-xsl-stylesheets Version: 1.9 -%define dtdversion 1.0 -%define dtdname novdoc -%define regcat %{_bindir}/sgml-register-catalog -%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current -%define novdoc_catalog for-catalog-%{dtdname}-%{dtdversion}.xml +%define dtdversion 1.0 +%define dtdname novdoc +%define regcat %{_bindir}/sgml-register-catalog +%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current +%define novdoc_catalog for-catalog-%{dtdname}-%{dtdversion}.xml +%define susexsl_catalog for-catalog-%{name}.xml Release: 1 Summary: SUSE-branded Docbook stylesheets for XSLT 1.0 @@ -76,7 +91,7 @@ if [ -x %{regcat} ]; then %{regcat} -a %{_datadir}/sgml/$CATALOG >/dev/null 2>&1 || true done fi -# XML Catalog +# XML Catalogs # # remove existing entries first - needed for # zypper in, since it does not call postun @@ -86,6 +101,12 @@ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ # ... and add it again edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{novdoc_catalog} +# delete ... +edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --del %{name} +# ... and add it again +edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --add /etc/xml/%{susexsl_catalog} exit 0 @@ -94,14 +115,18 @@ exit 0 # # Remove catalog entries # -# SGML if [ ! -f %{_sysconfdir}/xml/%{novdoc_catalog} -a -x /usr/bin/edit-xml-catalog ] ; then - for c in catalog/CATALOG.%{dtdname}-%{dtdversion}; do - %{regcat} -r %{_datadir}/sgml/$c >/dev/null 2>&1 - done -# XML - edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{dtdversion} + # SGML + for c in catalog/CATALOG.%{dtdname}-%{dtdversion}; do + %{regcat} -r %{_datadir}/sgml/$c >/dev/null 2>&1 + done + # XML + # novdoc entry + edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --del %{dtdname}-%{dtdversion} + # susexsl entry + edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --del %{name} fi exit 0