From b26c120c87c722758ce56b857bf9395ea8965434 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Jul 19 2008 22:06:00 +0000
Subject: fix loop in post catalog registration(incomplete sed coverage) - #455680,

    fix several issues in postun causing troubles for updates,change file
    locations to prevent their removal via old buggy broken postun

---

diff --git a/docbook-slides.cat b/docbook-slides.cat
index 0e51562..d9e5446 100644
--- a/docbook-slides.cat
+++ b/docbook-slides.cat
@@ -1,14 +1,14 @@
 -- BEGIN OASIS TR 9401:1997 catalog for docbook-slides V3.4.0 --
 OVERRIDE YES
-PUBLIC "-//Norman Walsh//DTD Slides XML V3.4.0//EN"         "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides.dtd"
-PUBLIC "-//Norman Walsh//DTD Slides Custom XML V3.4.0//EN"  "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-custom.dtd"
-PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.4.0//EN"    "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-full.dtd"
+PUBLIC "-//Norman Walsh//DTD Slides XML V3.4.0//EN"         "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides.dtd"
+PUBLIC "-//Norman Walsh//DTD Slides Custom XML V3.4.0//EN"  "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-custom.dtd"
+PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.4.0//EN"    "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-full.dtd"
 
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides.dtd"              "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides-custom.dtd"       "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-custom.dtd"      
-SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides-full.dtd"         "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides.dtd"              "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides-custom.dtd"       "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-custom.dtd"      
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides-full.dtd"         "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-full.dtd"
 
-SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides.dtd"            "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-custom.dtd"     "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-custom.dtd"
-SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-full.dtd"       "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides.dtd"            "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-custom.dtd"     "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-custom.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-full.dtd"       "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-full.dtd"
 -- END OASIS TR 9401:1997 catalog for docbook-slides V3.4.0 --
diff --git a/docbook-slides.patch b/docbook-slides.patch
deleted file mode 100644
index a38a47d..0000000
--- a/docbook-slides.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff -ur slides-3.3.1/catalog.xml slides-3.3.1-patched/catalog.xml
---- slides-3.3.1/catalog.xml	2003-12-22 10:22:17.000000000 -0500
-+++ slides-3.3.1-patched/catalog.xml	2004-09-08 14:29:35.159081228 -0400
-@@ -1,4 +1,7 @@
- <?xml version="1.0"?>
-+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
-+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-+
- <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- 
- <!--  XML Catalog file for Slides. If you are already using
-@@ -6,7 +9,7 @@
-       an entry like this to your XML catalog file, editing the
-       path to match the location of your Slides installation:
- 
--    <nextCatalog catalog="/usr/share/xml/slides-3.3.0/catalog.xml" />
-+    <nextCatalog catalog="/usr/share/xml/slides-3.3.1/catalog.xml" />
- -->
- 
- <!-- Slides DTD locations -->
-@@ -16,16 +19,16 @@
-        prefer="public">
- 
-   <public
--    publicId="-//Norman Walsh//DTD Slides V3.3.0//EN"
-+    publicId="-//Norman Walsh//DTD Slides V3.3.1//EN"
-     uri="slides.dtd"/>
-     <!-- this could be the slides-custom.dtd instead -->
- 
-   <public
--    publicId="-//Norman Walsh//DTD Slides Custom V3.3.0//EN"
-+    publicId="-//Norman Walsh//DTD Slides Custom V3.3.1//EN"
-     uri="slides-custom.dtd"/>
- 
-   <public
--    publicId="-//Norman Walsh//DTD slides Full V3.3.0//EN"
-+    publicId="-//Norman Walsh//DTD Slides Full V3.3.1//EN"
-     uri="slides-full.dtd"/>
- </group>
- 
-@@ -155,6 +158,13 @@
-     uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
-     rewritePrefix="/usr/share/xml/docbook-xsl-1.59.1/"/>
- -->
-+  <rewriteURI
-+    uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
-+    rewritePrefix="file:///usr/share/sgml/docbook/xsl-stylesheets/"/>
-+
-+  <rewriteURI
-+    uriStartString="http://docbook.sourceforge.net/release/xsl/3.3.1/"
-+    rewritePrefix="file:///usr/share/sgml/docbook/xsl-stylesheets/"/>
- 
- <!-- Map web references to DocBook 4.2 DTD -->
- <!--
-diff -ur slides-3.3.1/schema/dtd/slides-custom.dtd slides-3.3.1-patched/schema/dtd/slides-custom.dtd
---- slides-3.3.1/schema/dtd/slides-custom.dtd	2003-12-22 09:43:06.000000000 -0500
-+++ slides-3.3.1-patched/schema/dtd/slides-custom.dtd	2004-09-07 12:15:58.000000000 -0400
-@@ -1,5 +1,5 @@
- <!-- ====================================================================== -->
--<!-- Slides XML V3.3.0 DTD
-+<!-- Slides XML V3.3.1 DTD
-      Copyright (C) 1999, 2000, 2001, 2002, 2003 Norman Walsh
-      http://sourceforge.net/projects/docbook/
- 
-@@ -12,8 +12,8 @@
- 
-      <?xml version='1.0'?>
-      <!DOCTYPE slides
--       PUBLIC "-//Norman Walsh//DTD Slides XML V3.3.0//EN"
--       "http://docbook.sourceforge.net/release/slides/3.3.0/schema/dtd/slides.dtd">
-+       PUBLIC "-//Norman Walsh//DTD Slides XML V3.3.1//EN"
-+       "http://docbook.sourceforge.net/release/slides/3.3.1/schema/dtd/slides.dtd">
-                                                                             -->
- <!-- ====================================================================== -->
- 
-@@ -72,8 +72,8 @@
- <!ENTITY % local.component.mix "|speakernotes">
- 
- <!ENTITY % sdocbook.dtd 
--      PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1b1//EN"
--      "http://docbook.org/xml/simple/1.1b1/sdocbook-custom.dtd">
-+      PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
-+      "http://docbook.org/xml/simple/1.0/sdocbook-custom.dtd">
- %sdocbook.dtd;
- 
- <!-- ====================================================================== -->
-@@ -110,5 +110,5 @@
- <!ENTITY % slides.mod SYSTEM "slides.mod">
- %slides.mod;
- 
--<!-- End of Slides XML V3.3.0 DTD ......................................... -->
-+<!-- End of Slides XML V3.3.1 DTD ......................................... -->
- <!-- ...................................................................... -->
-diff -ur slides-3.3.1/schema/dtd/slides.dtd slides-3.3.1-patched/schema/dtd/slides.dtd
---- slides-3.3.1/schema/dtd/slides.dtd	2003-12-22 09:43:23.000000000 -0500
-+++ slides-3.3.1-patched/schema/dtd/slides.dtd	2004-09-06 16:32:47.000000000 -0400
-@@ -4,7 +4,7 @@
-      ********************************************************************* -->
- 
- <!-- ====================================================================== -->
--<!-- Slides XML V3.3.0 DTD
-+<!-- Slides XML V3.3.1 DTD
-      Copyright (C) 1999, 2000, 2001, 2002, 2003 Norman Walsh
-      http://sourceforge.net/projects/docbook/
- 
-@@ -17,8 +17,8 @@
- 
-      <?xml version='1.0'?>
-      <!DOCTYPE slides
--       PUBLIC "-//Norman Walsh//DTD Slides XML V3.3.0//EN"
--       "http://docbook.sourceforge.net/release/slides/3.3.0/schema/dtd/slides.dtd">
-+       PUBLIC "-//Norman Walsh//DTD Slides XML V3.3.1//EN"
-+       "http://docbook.sourceforge.net/release/slides/3.3.1/schema/dtd/slides.dtd">
-                                                                             -->
- <!-- ====================================================================== -->
- 
-diff -ur slides-3.3.1/schema/dtd/slides-full.dtd slides-3.3.1-patched/schema/dtd/slides-full.dtd
---- slides-3.3.1/schema/dtd/slides-full.dtd	2003-12-22 08:44:44.000000000 -0500
-+++ slides-3.3.1-patched/schema/dtd/slides-full.dtd	2004-09-07 12:15:01.000000000 -0400
-@@ -1,5 +1,5 @@
- <!-- ====================================================================== -->
--<!-- Slides Full XML V3.3.0 DTD
-+<!-- Slides Full XML V3.3.1 DTD
-      Copyright (C) 1999, 2000, 2001, 2002, 2003 Norman Walsh
-      http://sourceforge.net/projects/docbook/
- 
-@@ -15,8 +15,8 @@
- 
-      <?xml version='1.0'?>
-      <!DOCTYPE slides
--       PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.3.0//EN"
--       "http://docbook.sourceforge.net/release/slides/3.3.0/schema/dtd/slides-full.dtd">
-+       PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.3.1//EN"
-+       "http://docbook.sourceforge.net/release/slides/3.3.1/schema/dtd/slides-full.dtd">
-                                                                             -->
- <!-- ====================================================================== -->
- 
-@@ -24,12 +24,13 @@
- <!ENTITY % local.component.mix "|speakernotes">
- 
- <!-- In this version, we use full DocBook -->
--<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.3CR2//EN"
--  "http://docbook.org/xml/4.3CR2/docbookx.dtd">
-+<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-+           "http://docbook.org/xml/4.2/docbookx.dtd">
-+<!--  "http://docbook.org/xml/4.3CR2/docbookx.dtd"> -->
- %docbook.dtd;
- 
- <!ENTITY % slides.mod SYSTEM "slides.mod">
- %slides.mod;
- 
--<!-- End of Slides Full XML V3.3.0 DTD .................................... -->
-+<!-- End of Slides Full XML V3.3.1 DTD .................................... -->
- <!-- ...................................................................... -->
-diff -ur slides-3.3.1/schema/dtd/slides.mod slides-3.3.1-patched/schema/dtd/slides.mod
---- slides-3.3.1/schema/dtd/slides.mod	2003-12-22 08:55:40.000000000 -0500
-+++ slides-3.3.1-patched/schema/dtd/slides.mod	2004-09-07 12:21:05.000000000 -0400
-@@ -1,5 +1,5 @@
- <!-- ====================================================================== -->
--<!-- Slides Module V3.3.0
-+<!-- Slides Module V3.3.1
-      Copyright (C) 1999, 2000, 2001, 2002, 2003 Norman Walsh
-      http://sourceforge.net/projects/docbook/
- 
-@@ -77,5 +77,5 @@
- 		%role.attrib;
- >
- 
--<!-- End of Slides Module V3.3.0 .......................................... -->
-+<!-- End of Slides Module V3.3.1 .......................................... -->
- <!-- ...................................................................... -->
-diff -ur slides-3.3.1/xsl/fo/plain.xsl slides-3.3.1-patched/xsl/fo/plain.xsl
---- slides-3.3.1/xsl/fo/plain.xsl	2003-12-22 09:53:18.000000000 -0500
-+++ slides-3.3.1-patched/xsl/fo/plain.xsl	2004-09-08 10:47:43.115208226 -0400
-@@ -4,7 +4,9 @@
-                 xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                 version="1.0">
- 
--<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
-+<!-- use local, relative path for users w/o XML catalog support -->
-+<xsl:import href="../../../../../../sgml/docbook/xsl-stylesheets/fo/docbook.xsl"/>
-+<!-- <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/> -->
- <xsl:include href="../../VERSION"/>
- 
- <xsl:param name="alignment" select="'start'"/>
-diff -ur slides-3.3.1/xsl/html/slides-common.xsl slides-3.3.1-patched/xsl/html/slides-common.xsl
---- slides-3.3.1/xsl/html/slides-common.xsl	2003-12-22 09:53:07.000000000 -0500
-+++ slides-3.3.1-patched/xsl/html/slides-common.xsl	2004-09-08 10:57:36.786395938 -0400
-@@ -1,8 +1,9 @@
- <?xml version='1.0'?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- 		version="1.0">
--
--<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
-+<!-- use local, relative path for users w/o XML catalog support -->
-+<xsl:import href="../../../../../../sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
-+<!-- <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/> -->
- <xsl:include href="../../VERSION"/>
- 
- <xsl:include href="param.xsl"/>
-diff -ur slides-3.3.1/xsl/xhtml/html2xhtml.xsl slides-3.3.1-patched/xsl/xhtml/html2xhtml.xsl
---- slides-3.3.1/xsl/xhtml/html2xhtml.xsl	2002-10-13 11:19:15.000000000 -0400
-+++ slides-3.3.1-patched/xsl/xhtml/html2xhtml.xsl	2004-09-08 11:09:38.961709752 -0400
-@@ -25,10 +25,17 @@
-   </xsl:copy>
- </xsl:template>
- 
--<xsl:template match="xsl:import[@href='http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl']">
-+<!--
-+<xsl:template match="xsl:import[@href='http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl']"> 
-+-->
-+<!-- use local, relative path for users w/o XML catalog support -->
-+<xsl:template match="xsl:import[@href='../../../../../../sgml/docbook/xsl-stylesheets/html/chunk.xsl']">
-   <xsl:copy>
-     <xsl:copy-of select="@*"/>
-+    <xsl:attribute name="href">../../../../../../sgml/docbook/xsl-stylesheets/html/chunk.xsl</xsl:attribute>
-+    <!--
-     <xsl:attribute name="href">http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl</xsl:attribute>
-+    -->
-   </xsl:copy>
- </xsl:template>
- 
-diff -ur slides-3.3.1/xsl/xhtml/slides-common.xsl slides-3.3.1-patched/xsl/xhtml/slides-common.xsl
---- slides-3.3.1/xsl/xhtml/slides-common.xsl	2003-12-22 10:08:33.000000000 -0500
-+++ slides-3.3.1-patched/xsl/xhtml/slides-common.xsl	2004-09-08 10:50:36.733082376 -0400
-@@ -3,7 +3,8 @@
- <!--from the HTML stylesheets. Do not edit this file.-->
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- 
--<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
-+<!-- use local, relative path for users w/o XML catalog support -->
-+<xsl:import href="../../../../../../sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl"/>
- <xsl:include href="../../VERSION"/>
- 
- <xsl:include href="param.xsl"/>
diff --git a/docbook-slides.spec b/docbook-slides.spec
index 7bbcf74..c1d00d4 100644
--- a/docbook-slides.spec
+++ b/docbook-slides.spec
@@ -2,7 +2,7 @@
 Summary: DocBook Slides document type and stylesheets
 Name: docbook-slides
 Version: 3.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/Text
 URL: http://sourceforge.net/projects/docbook
@@ -37,7 +37,7 @@ and stylesheets are for generating presentations, primarily in HTML.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/slides/%{version}
+DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/slides-F9/%{version}
 mkdir -p $DESTDIR
 cp -a browser $DESTDIR
 cp -a graphics $DESTDIR
@@ -50,11 +50,11 @@ cp -a catalog.xml $DESTDIR
 
 XML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/xml
 mkdir -p $XML_CAT_DIR
-install -p -m 644 %{SOURCE1} $XML_CAT_DIR
+install -p -m 644 %{SOURCE1} $XML_CAT_DIR/%{name}-F9.xml
 
 SGML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/sgml
 mkdir -p $SGML_CAT_DIR
-install -p -m 644 %{SOURCE2} $SGML_CAT_DIR
+install -p -m 644 %{SOURCE2} $SGML_CAT_DIR/%{name}-F9.cat
 
 cp -p %{SOURCE3} ./README.fedora
 
@@ -62,15 +62,18 @@ cp -p %{SOURCE3} ./README.fedora
 rm -rf $RPM_BUILD_ROOT
 
 %files
+##Files and dirs have -F9 suffix to prevent bug in postun of old packages.
+##This change of suffix is temporary and there will be no file/dir suffix in F10
 %defattr (-,root,root, -)
 %doc doc
 %doc tests
 %doc README
 %doc NEWS
 %doc README.fedora
-%{_datadir}/xml/docbook/slides/%{version}
-%config(noreplace) %{_sysconfdir}/sgml/docbook-slides.cat
-%config(noreplace) %{_sysconfdir}/xml/docbook-slides.xml
+%dir %{_datadir}/xml/docbook/slides-F9/
+%{_datadir}/xml/docbook/slides-F9/%{version}
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-slides-F9.cat
+%config(noreplace) %{_sysconfdir}/xml/docbook-slides-F9.xml
 
 
 %post
@@ -80,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 ## Define handy variables ##
 
 ROOT_XML_CATALOG=%{_sysconfdir}/xml/catalog
-PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-slides.xml
+PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-slides-F9.xml
 #LOCAL_XML_CATALOG=/usr/share/xml/docbook/slides/3.4.0/catalog.xml
 
 #
@@ -105,7 +108,7 @@ fi
 #################  SGML catalog registration  ######################
 
 ROOT_SGML_CATALOG=%{_sysconfdir}/sgml/catalog
-PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-slides.cat
+PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-slides-F9.cat
 
 #### Root SGML Catalog Entries ####
 #### "Delegate" appropriate lookups to package catalog ####
@@ -123,7 +126,8 @@ then
   $ROOT_SGML_CATALOG 1>/dev/null
 
 # Hack to workaround bug in install-catalog
-  sed -i 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG
+  sed -i '/^CATALOG.*log\"$/d' $PKG_SGML_CATALOG
+  sed -i '/^CATALOG.*log$/d' $PKG_SGML_CATALOG   
 fi
 
 ####################################################################
@@ -139,32 +143,26 @@ fi
 ## Jobs: remove package catalog entries from both root catalogs &
 ##       remove package catalogs
 
-##### SGML catalogs #####
-
-## Remove package catalog entry from SGML root catalog
-%{_bindir}/xmlcatalog --sgml --noout --del \
-  %{_sysconfdir}/sgml/catalog \
-  "%{_sysconfdir}/sgml/docbook-slides.cat" 
+# remove catalog entries only on removal of package
+if [ "$1" = 0 ]; then
+  %{_bindir}/xmlcatalog --sgml --noout --del \
+    %{_sysconfdir}/sgml/catalog \
+    "%{_sysconfdir}/sgml/docbook-slides-F9.cat" 
   
-## Remove SGML package catalog
-rm -f %{_sysconfdir}/sgml/docbook-slides.cat
-
-
-##### XML catalogs #####
-
-## Remove package catalog entry from XML root catalog
-%{_bindir}/xmlcatalog --noout --del \
-  "file://%{_sysconfdir}/xml/docbook-slides.xml" \
-  %{_sysconfdir}/xml/catalog 
-
-## Remove XML package catalog
-rm -f %{_sysconfdir}/sgml/docbook-slides.xml
-
-## Remove dtd directory
-rm -rf %{_datadir}/xml/docbook/slides
-
+  %{_bindir}/xmlcatalog --noout --del \
+    "file://%{_sysconfdir}/xml/docbook-slides-F9.xml" \
+    %{_sysconfdir}/xml/catalog 
+fi
 
 %changelog
+* Fri Jul 18 2008 Ondrej Vasik <ovasik@redhat.com> - 3.4.0-4
+- fix loop in post catalog registration(incomplete sed
+  coverage) #455680
+- fix broken catalogs for package updates
+- fix removal of files during updates
+- change file locations to prevent their removal via old
+  buggy broken postun
+
 * Tue Nov 06 2007 Ondrej Vasik <ovasik@redhat.com> - 3.4.0-3
 - merge review(#225702)
 - spec file changed to follow guidelines
diff --git a/docbook-slides.xml b/docbook-slides.xml
index a80b28a..1d53446 100644
--- a/docbook-slides.xml
+++ b/docbook-slides.xml
@@ -7,18 +7,18 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
 
   <delegatePublic publicIdStartString="-//Norman Walsh//DTD Slides" 
-    catalog="file:///usr/share/xml/docbook/slides/3.4.0/catalog.xml"/>
+    catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/>
 
   <delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.4.0/" 
-    catalog="file:///usr/share/xml/docbook/slides/3.4.0/catalog.xml"/>
+    catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/>
 
   <delegateURI uriStartString="http://docbook.sourceforge.net/release/slides/3.4.0/" 
-    catalog="file:///usr/share/xml/docbook/slides/3.4.0/catalog.xml"/>
+    catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/>
 
   <delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/current/" 
-    catalog="file:///usr/share/xml/docbook/slides/3.4.0/catalog.xml"/>
+    catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/>
 
   <delegateURI uriStartString="http://docbook.sourceforge.net/release/slides/current/" 
-    catalog="file:///usr/share/xml/docbook/slides/3.4.0/catalog.xml"/>
+    catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/>
 
 </catalog>