rpms/docbook-simple/F-9 docbook-simple.cat, 1.2, 1.3 docbook-simple.spec, 1.9, 1.10 docbook-simple.xml, 1.3, 1.4

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Sat Jul 19 21:19:13 UTC 2008 

Author: ovasik

Update of /cvs/extras/rpms/docbook-simple/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8523

Modified Files:
	docbook-simple.cat docbook-simple.spec docbook-simple.xml 
Log Message:
fix loop in post catalog registration(incomplete sed coverage) -#455680, fix broken catalogs for package updates, fix removal files during updates, change file locations to prevent their removal via old buggy broken postun


Index: docbook-simple.cat
===================================================================
RCS file: /cvs/extras/rpms/docbook-simple/F-9/docbook-simple.cat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook-simple.cat	24 May 2007 12:07:27 -0000	1.2
+++ docbook-simple.cat	19 Jul 2008 21:18:29 -0000	1.3
@@ -1,11 +1,11 @@
 -- BEGIN OASIS TR 9401:1997 catalog for docbook-simple V1.1 --
 OVERRIDE YES
-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"
+PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" "/usr/share/xml/docbook/simple-F9/1.1/sdocbook.dtd"
+PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN" "/usr/share/xml/docbook/simple-F9/1.1/sdocbook-custom.dtd"
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" "/usr/share/xml/docbook/simple-F9/1.1/sdocbookref.dtd"
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML CustomizationV1.1//EN" "/usr/share/xml/docbook/simple-F9/1.1/sdocbookref-custom.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd" "/usr/share/xml/docbook/simple-F9/1.1/sdocbook.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd" "/usr/share/xml/docbook/simple-F9/1.1/sdocbook-custom.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd" "/usr/share/xml/docbook/simple-F9/1.1/sdocbookref.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd" "/usr/share/xml/docbook/simple-F9/1.1/sdocbookref-custom.dtd"
 -- END OASIS TR 9401:1997 catalog for docbook-simple V1.1 --


Index: docbook-simple.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-simple/F-9/docbook-simple.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- docbook-simple.spec	5 Nov 2007 17:12:50 -0000	1.9
+++ docbook-simple.spec	19 Jul 2008 21:18:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name: docbook-simple
 Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Text
 Summary: Simplified DocBook is a small subset of the DocBook XML DTD
 License: Freely redistributable without restriction
@@ -41,19 +41,19 @@
 
 ########## install versioned-numbered directory of dtd files ############
 
-DESTDIR=$RPM_BUILD_ROOT/usr/share/xml/docbook/simple
+DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/simple-F9
 mkdir -p $DESTDIR
 cp -a ../%{version} $DESTDIR
 
 ########## install package catalogs  ################
 
-XML_CAT_DIR=$RPM_BUILD_ROOT/etc/xml
+XML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/xml
 mkdir -p $XML_CAT_DIR
-install -p -m 644 %{SOURCE2} $XML_CAT_DIR
+install -p -m 644 %{SOURCE2} $XML_CAT_DIR/%{name}-F9.xml
 
-SGML_CAT_DIR=$RPM_BUILD_ROOT/etc/sgml
+SGML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/sgml
 mkdir -p $SGML_CAT_DIR
-install -p -m 644 %{SOURCE3} $SGML_CAT_DIR
+install -p -m 644 %{SOURCE3} $SGML_CAT_DIR/%{name}-F9.cat
 
 ####### FIXME: must copy README.redhat to source directory ########
 #######        for %doc to find it, ${SOURCE1} doesn't work ########
@@ -65,12 +65,15 @@
 rm -rf ../%{version}
 
 %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 sdocbook.css
 %doc README.fedora
-%{_datadir}/xml/docbook/simple/%{version}
-%config(noreplace) %{_sysconfdir}/sgml/docbook-simple.cat
-%config(noreplace) %{_sysconfdir}/xml/docbook-simple.xml
+%dir %{_datadir}/xml/docbook/simple-F9/
+%{_datadir}/xml/docbook/simple-F9/%{version}
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-simple-F9.cat
+%config(noreplace) %{_sysconfdir}/xml/docbook-simple-F9.xml
 
 
 %post
@@ -80,7 +83,7 @@
 ## Define handy variables ##
 
 ROOT_XML_CATALOG=%{_sysconfdir}/xml/catalog
-PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-simple.xml
+PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-simple-F9.xml
 
 #### Root XML Catalog Entries ####
 #### Delegate appropriate lookups to package catalog ####
@@ -107,7 +110,7 @@
 #################  SGML catalog registration  ######################
 
 ROOT_SGML_CATALOG=%{_sysconfdir}/sgml/catalog
-PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-simple.cat
+PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-simple-F9.cat
 
 #### Root SGML Catalog Entries ####
 #### "Delegate" appropriate lookups to package catalog ####
@@ -122,11 +125,12 @@
 #     "/etc/sgml/docbook-simple.cat"
 
   install-catalog --add \
-  $PKG_SGML_CATALOG \
-  $ROOT_SGML_CATALOG 1>/dev/null
+  "$PKG_SGML_CATALOG" \
+  "$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
 
 ####################################################################
@@ -143,31 +147,26 @@
 ## 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-simple.cat" 
-  
-## Remove SGML package catalog
-rm -f  %{_sysconfdir}/sgml/docbook-simple.cat
-
-
-##### XML catalogs #####
-
-## Remove package catalog entry from XML root catalog
-%{_bindir}/xmlcatalog --noout --del \
-  "file://%{_sysconfdir}/xml/docbook-simple.xml" \
-   %{_sysconfdir}/xml/catalog 
-
-## Remove XML package catalog
-rm -f  %{_sysconfdir}/sgml/docbook-simple.xml
-
-## Remove dtd directory
-rm -rf %{_datadir}/xml/docbook/simple
+# remove catalog entries only on removal of package
+if [ "$1" = 0 ]; then
+  %{_bindir}/xmlcatalog --sgml --noout --del \
+     %{_sysconfdir}/sgml/catalog \
+     "%{_sysconfdir}/sgml/docbook-simple-F9.cat"
+
+  %{_bindir}/xmlcatalog --noout --del \
+    "file://%{_sysconfdir}/xml/docbook-simple-F9.xml" \
+     %{_sysconfdir}/xml/catalog 
+fi
 
 %changelog
+* Sat Jul 19 2008 Ondrej Vasik <ovasik at redhat.com> - 1.1-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
+
 * Mon Nov 05 2007 Ondrej Vasik <ovasik at redhat.com> - 1.1-3
 - merge review(#225701)
 - spec modified to follow guidelines


Index: docbook-simple.xml
===================================================================
RCS file: /cvs/extras/rpms/docbook-simple/F-9/docbook-simple.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- docbook-simple.xml	24 May 2007 15:40:20 -0000	1.3
+++ docbook-simple.xml	19 Jul 2008 21:18:29 -0000	1.4
@@ -7,28 +7,28 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
 
   <public publicId="-//OASIS//DTD Simplified DocBook XML V1.1//EN"
-    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbook.dtd"/>
+    uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbook.dtd"/>
 
   <public publicId="-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
-    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd"/>
+    uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbook-custom.dtd"/>
 
   <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" 
-    uri="file:///usr/share/xml/docbook/simple/1.1/sdocbookref.dtd"/>
+    uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbookref.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"/>
+    uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbookref-custom.dtd"/>
 
   <!-- Should probably do a rewriteSystem instead of below... -->
   <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"/>
+    uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbook.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"/>
+    uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbook-custom.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"/>
+    uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbookref.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"/>
+    uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbookref-custom.dtd"/>
 
 </catalog>

More information about the fedora-extras-commits mailing list