- drop fedora catalogs, upstream work

- rel 2

diff --git a/docbook-slides.cat b/docbook-slides.cat
deleted file mode 100644 (file)
index ea1120e..0000000
--- a/docbook-slides.cat
+++ /dev/null
@@ -1,14 +0,0 @@
--- 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/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/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/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 c0c9fc62938a66e17c870c36984ecee4a98291dd..29e7529ae7d71f9f337f832a0a1ba91003b1e058 100644 (file)
--- a/docbook-slides.spec
+++ b/docbook-slides.spec
@@ -1,13 +1,11 @@
 Summary:       DocBook Slides document type and stylesheets
 Name:          docbook-slides
 Version:       3.4.0
-Release:       1
+Release:       2
 License:       MIT
 Group:         Applications/Publishing/XML
 Source0:       http://downloads.sourceforge.net/docbook/%{name}-%{version}.tar.gz
 # Source0-md5: 26e2083077454d7140f2b82ae3d66123
-Source1:       %{name}.xml
-Source2:       %{name}.cat
 URL:           http://sourceforge.net/projects/docbook
 Requires(post,preun):  /usr/bin/install-catalog
 Requires(post,preun):  /usr/bin/xmlcatalog
@@ -36,8 +34,8 @@ install -d $RPM_BUILD_ROOT%{dtd_path}
 
 cp -a browser graphics schema xsl VERSION $RPM_BUILD_ROOT%{dtd_path}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{xmlcat_file}
-install %{SOURCE2} $RPM_BUILD_ROOT%{sgmlcat_file}
+install catalog.xml $RPM_BUILD_ROOT%{xmlcat_file}
+install catalog $RPM_BUILD_ROOT%{sgmlcat_file}
 
 %docbook_sgmlcat_fix $RPM_BUILD_ROOT%{sgmlcat_file} %{version}
 

diff --git a/docbook-slides.xml b/docbook-slides.xml
deleted file mode 100644 (file)
index 7fc024b..0000000
--- a/docbook-slides.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
-"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
-<!-- XML package catalog for docbook-slides -->
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
-
-  <delegatePublic publicIdStartString="-//Norman Walsh//DTD Slides" 
-    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/sgml/docbook/slides/3.4.0/catalog.xml"/>
-
-  <delegateURI uriStartString="http://docbook.sourceforge.net/release/slides/3.4.0/" 
-    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/sgml/docbook/slides/3.4.0/catalog.xml"/>
-
-  <delegateURI uriStartString="http://docbook.sourceforge.net/release/slides/current/" 
-    catalog="file:///usr/share/sgml/docbook/slides/3.4.0/catalog.xml"/>
-
-</catalog>