From 029fab1252320d0668cd9d0b3951ec381ede76e9 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: May 24 2007 12:07:27 +0000
Subject: version upgrade to latest stable upstream version + path changes


---

diff --git a/.cvsignore b/.cvsignore
index c246366..4d6d5b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-docbook-simple-1.0.zip
+docbook-simple-1.1.zip
diff --git a/docbook-simple.README.redhat b/docbook-simple.README.redhat
index 9f2c335..05bc21d 100644
--- a/docbook-simple.README.redhat
+++ b/docbook-simple.README.redhat
@@ -31,8 +31,8 @@ DocBook Document Type in your document:
 
 <?xml version="1.0"?>
 <!DOCTYPE article
-     PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
-     "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
+     PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+     "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd">
 <article>
 ...
 </article>
@@ -49,8 +49,8 @@ DocBook Document Type in your document:
 
 <?xml version="1.0"?>
 <!DOCTYPE refentry
-     PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
-     "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd">
+     PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
+     "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd">
 <refentry>
 ...
 </refentry>
@@ -64,8 +64,8 @@ Simply place the xml-stylesheet PI in the prolog of the doc as follows:
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/css" href="path--to-sdocbook.css"?>
 <!DOCTYPE article
-     PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
-     "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
+     PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+     "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd">
 <article>
 ...
 </article>
@@ -105,4 +105,4 @@ Feel free to offer comments, suggestions, or complaints.
 
 
  -- Mark Johnson <mjohnson@redhat.com>, Tue Sep  7 15:51:51 EDT 2004
-
+ --changes for 1.1 by Ondrej Vasik <ovasik@redhat.com>, Thu May 24 2007
diff --git a/docbook-simple.cat b/docbook-simple.cat
index b50a419..ecbe356 100644
--- a/docbook-simple.cat
+++ b/docbook-simple.cat
@@ -1,11 +1,11 @@
--- BEGIN OASIS TR 9401:1997 catalog for docbook-simple V1.0 --
+-- BEGIN OASIS TR 9401:1997 catalog for docbook-simple V1.1 --
 OVERRIDE YES
-PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN" "/usr/share/xml/docbook/simple/1.0/sdocbook.dtd"
-PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN" "/usr/share/xml/docbook/simple/1.0/sdocbook-custom.dtd"
-PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN" "/usr/share/xml/docbook/simple/1.0/sdocbookref.dtd"
-PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML CustomizationV1.0//EN" "/usr/share/xml/docbook/simple/1.0/sdocbookref-custom.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd" "/usr/share/xml/docbook/simple/1.0/sdocbook.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd" "/usr/share/xml/docbook/simple/1.0/sdocbook-custom.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd" "/usr/share/xml/docbook/simple/1.0/sdocbookref.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd" "/usr/share/xml/docbook/simple/1.0/sdocbookref-custom.dtd"
--- END OASIS TR 9401:1997 catalog for docbook-simple V1.0 --
+PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbook.dtd"
+PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd"
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbookref.dtd"
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML CustomizationV1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbookref-custom.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbook.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbookref.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbookref-custom.dtd"
+-- END OASIS TR 9401:1997 catalog for docbook-simple V1.1 --
diff --git a/docbook-simple.spec b/docbook-simple.spec
index 62123ef..1edf1bc 100644
--- a/docbook-simple.spec
+++ b/docbook-simple.spec
@@ -1,11 +1,11 @@
 Name: docbook-simple
-Version: 1.0
-Release: 2.1.1
+Version: 1.1
+Release: 1
 Group: Applications/Text
 Summary: Simplified DocBook is a small subset of the DocBook XML DTD.
 License: Distributable
 URL: http://www.oasis-open.org/docbook/xml/simple/
-Source0: http://www.docbook.org/xml/simple/1.0/docbook-simple-1.0.zip
+Source0: http://www.docbook.org/xml/simple/1.1/docbook-simple-1.1.zip
 Source1: %{name}.README.redhat
 Source2: %{name}.xml
 Source3: %{name}.cat
@@ -90,12 +90,12 @@ then
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
 
         /usr/bin/xmlcatalog --noout --add "delegateURI" \
-                "http://www.oasis-open.org/docbook/xml/simple/1.0/" \
+                "http://www.oasis-open.org/docbook/xml/simple/1.1/" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
 
 	# Next line because some resolvers misinterpret uri entries
         /usr/bin/xmlcatalog --noout --add "delegateSystem" \
-                "http://www.oasis-open.org/docbook/xml/simple/1.0/" \
+                "http://www.oasis-open.org/docbook/xml/simple/1.1/" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
 fi
 
@@ -167,6 +167,9 @@ rm -f /etc/sgml/docbook-simple.xml
 rm -rf /usr/share/xml/docbook/simple
 
 %changelog
+* Thu May 24 2007 Ondrej Vasik <ovasik@redhat.com> - 1.1-1
+- rebuilt with latest stable upstream release(1.1)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.0-2.1.1
 - rebuild
 
diff --git a/docbook-simple.xml b/docbook-simple.xml
index 1acd677..c491b48 100644
--- a/docbook-simple.xml
+++ b/docbook-simple.xml
@@ -1,34 +1,34 @@
 <?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">
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.1//EN"
+"http://www.oasis-open.org/committees/entity/release/1.1/catalog.dtd">
 
 <!-- XML package catalog for docbook-simple -->
 
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
 
-  <public publicId="-//OASIS//DTD Simplified DocBook XML V1.0//EN"
-    uri="file:///usr/share/xml/docbook/simple/1.0/sdocbook.dtd"/>
+  <public publicId="-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbook.dtd"/>
 
-  <public publicId="-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
-    uri="file:///usr/share/xml/docbook/simple/1.0/sdocbook-custom.dtd"/>
+  <public publicId="-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
+    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd"/>
 
-  <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN" 
-    uri="file:///usr/share/xml/docbook/simple/1.0/sdocbookref.dtd"/>
+  <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" 
+    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbookref.dtd"/>
 
-  <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.0//EN" 
-    uri="file:///usr/share/xml/docbook/simple/1.0/sdocbookref-custom.dtd"/>
+  <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.1//EN" 
+    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbookref-custom.dtd"/>
 
   <!-- Should probably do a rewriteSystem instead of below... -->
-  <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd" 
-    uri="file:///usr/share/xml/docbook/simple/1.0/sdocbook.dtd"/>
+  <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd" 
+    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbook.dtd"/>
 
-  <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd" 
-    uri="file:///usr/share/xml/docbook/simple/1.0/sdocbook-custom.dtd"/>
+  <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd" 
+    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd"/>
 
-  <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd" 
-    uri="file:///usr/share/xml/docbook/simple/1.0/sdocbookref.dtd"/>
+  <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd" 
+    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbookref.dtd"/>
 
-  <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd" 
-    uri="file:///usr/share/xml/docbook/simple/1.0/sdocbookref-custom.dtd"/>
+  <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd" 
+    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbookref-custom.dtd"/>
 
 </catalog>
diff --git a/sources b/sources
index 64cb542..80d46a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10cf33eb280595db5a6927a3407ef61a  docbook-simple-1.0.zip
+f31c63f121033a72869286d4a0416421  docbook-simple-1.1.zip