diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec index 2920bd5..c738786 100644 --- a/docbook-style-xsl.spec +++ b/docbook-style-xsl.spec @@ -1,6 +1,6 @@ Name: docbook-style-xsl Version: 1.73.2 -Release: 4%{?dist} +Release: 4.1%{?dist} Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML @@ -58,7 +58,7 @@ done %install DESTDIR=$RPM_BUILD_ROOT rm -rf $DESTDIR -make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets-%{version} +make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets--%{version} ln -s xsl-stylesheets-%{version} \ $DESTDIR/usr/share/sgml/docbook/xsl-stylesheets @@ -77,7 +77,7 @@ rm -rf $DESTDIR %doc README %doc TODO %doc doc -/usr/share/sgml/docbook/xsl-stylesheets-%{version} +/usr/share/sgml/docbook/xsl-stylesheets--%{version} /usr/share/sgml/docbook/xsl-stylesheets @@ -85,16 +85,16 @@ rm -rf $DESTDIR CATALOG=/etc/xml/catalog /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG + "file:///usr/share/sgml/docbook/xsl-stylesheets--%{version}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG + "file:///usr/share/sgml/docbook/xsl-stylesheets--%{version}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG + "file:///usr/share/sgml/docbook/xsl-stylesheets--%{version}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG + "file:///usr/share/sgml/docbook/xsl-stylesheets--%{version}" $CATALOG %postun @@ -102,10 +102,16 @@ CATALOG=/etc/xml/catalog if [ "$1" = 0 ]; then CATALOG=/etc/xml/catalog /usr/bin/xmlcatalog --noout --del \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG + "file:///usr/share/sgml/docbook/xsl-stylesheets--%{version}" $CATALOG fi %changelog +* Tue Jan 22 2008 Ondrej Vasik 1.73.2-4.1 +- little change in destdir to make update from buggy + docbook-style-xsl-1.73.2-3.fc8 working automatically + (requested by #429214, will be changed back in next + update) + * Tue Dec 11 2007 Ondrej Vasik 1.73.2-4 - remove entries from xmlcatalog only on removal of package (required because of the last change with droping release