- we have docbook under /usr/share/sgml

diff --git a/docbook-slides.cat b/docbook-slides.cat
index 0e51562f3a98c5b3be961296070046ae631a8f2c..ea1120e0a823c2a6365177723c066a1122bb23c2 100644 (file)
--- 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/sgml/docbook/slides/3.4.0/schema/dtd/slides.dtd"
+PUBLIC "-//Norman Walsh//DTD Slides Custom XML V3.4.0//EN"  "/usr/share/sgml/docbook/slides/3.4.0/schema/dtd/slides-custom.dtd"
+PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.4.0//EN"    "/usr/share/sgml/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/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/sgml/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/sgml/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/sgml/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/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/sgml/docbook/slides/3.4.0/schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-custom.dtd"     "/usr/share/sgml/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/sgml/docbook/slides/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.spec b/docbook-slides.spec
index 31c9abf8825bfaf28bb6e11d831302ef31033014..c0c9fc62938a66e17c870c36984ecee4a98291dd 100644 (file)
--- a/docbook-slides.spec
+++ b/docbook-slides.spec
@@ -16,7 +16,7 @@ Requires:     sgml-common
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                dtd_path        %{_datadir}/xml/docbook/slides/%{version}
+%define                dtd_path        %{_datadir}/sgml/docbook/slides/%{version}
 %define                xmlcat_file     %{dtd_path}/catalog.xml
 %define                sgmlcat_file    %{dtd_path}/catalog
 
@@ -68,4 +68,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc BUGS NEWS README RELEASE-NOTES.txt TODO doc
+%dir %{_datadir}/sgml/docbook/slides
 %{dtd_path}

diff --git a/docbook-slides.xml b/docbook-slides.xml
index a80b28ad10f852413e72fac5eb4c2d5af489220d..7fc024b1cc0412a0685751f45f9d1ddf55315d28 100644 (file)
--- 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/sgml/docbook/slides/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/sgml/docbook/slides/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/sgml/docbook/slides/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/sgml/docbook/slides/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/sgml/docbook/slides/3.4.0/catalog.xml"/>
 
 </catalog>