rpms/docbook-dtds/devel docbook-dtds.spec,1.24,1.25

Ondrej Vasik ovasik at fedoraproject.org
Wed Sep 24 14:49:30 UTC 2008


Author: ovasik

Update of /cvs/extras/rpms/docbook-dtds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224

Modified Files:
	docbook-dtds.spec 
Log Message:
Fixed wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 iso entities(#461206) , fixed /ent/iso-cyrl.ent typo, fixed broken unregistration of xml-dtds from catalog due to missing CAT_DIR variable


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- docbook-dtds.spec	29 Aug 2008 12:56:03 -0000	1.24
+++ docbook-dtds.spec	24 Sep 2008 14:49:00 -0000	1.25
@@ -1,6 +1,6 @@
 Name: docbook-dtds
 Version: 1.0
-Release: 39%{?dist}
+Release: 40%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -342,9 +342,6 @@
 touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
 
-
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -699,7 +696,7 @@
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -788,7 +785,7 @@
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -877,7 +874,7 @@
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -915,43 +912,43 @@
   # DocBook XML V4.4
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
@@ -960,19 +957,19 @@
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
@@ -981,19 +978,19 @@
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.4" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
@@ -1004,43 +1001,43 @@
    # DocBook XML V4.5
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
@@ -1049,19 +1046,19 @@
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
@@ -1070,19 +1067,19 @@
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.5" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
@@ -1189,6 +1186,7 @@
 ## XML catalog
 ##
 
+CAT_DIR=/usr/share/sgml/docbook/
 CATALOG=/usr/share/sgml/docbook/xmlcatalog
 
 if [ -w $CATALOG ]
@@ -1229,7 +1227,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1287,7 +1285,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1345,7 +1343,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1369,122 +1367,130 @@
 
   # DocBook XML V4.4
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.5
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
 fi
 
 %changelog
+* Wed Sep 24 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-40
+- Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 
+  iso entities(#461206)
+- /ent/iso-cyr1.ent now correctly registered in xml catalog
+  (there was /ent/iso-cyrl.ent typo)
+- fixed broken unregistration of xml-dtds from catalog
+  (missing CAT_DIR variable)
+
 * Fri Aug 29 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-39
 - rebuild with F9 spec file to fix some heavy-weight black 
   magic causing failures of sgml documents 




More information about the fedora-extras-commits mailing list