rpms/docbook-slides/F-9 docbook-slides.cat, 1.2, 1.3 docbook-slides.spec, 1.9, 1.10 docbook-slides.xml, 1.2, 1.3 docbook-slides.patch, 1.1, NONE

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Sat Jul 19 22:06:45 UTC 2008 

Author: ovasik

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

Modified Files:
	docbook-slides.cat docbook-slides.spec docbook-slides.xml 
Removed Files:
	docbook-slides.patch 
Log Message:
fix loop in post catalog registration(incomplete sed coverage) - #455680, fix several issues in postun causing troubles for updates,change file locations to prevent their removal via old buggy broken postun


Index: docbook-slides.cat
===================================================================
RCS file: /cvs/extras/rpms/docbook-slides/F-9/docbook-slides.cat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook-slides.cat	25 May 2007 07:58:35 -0000	1.2
+++ docbook-slides.cat	19 Jul 2008 22:06:00 -0000	1.3
@@ -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/xml/docbook/slides-F9/3.4.0/schema/dtd/slides.dtd"
+PUBLIC "-//Norman Walsh//DTD Slides Custom XML V3.4.0//EN"  "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-custom.dtd"
+PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.4.0//EN"    "/usr/share/xml/docbook/slides-F9/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/xml/docbook/slides-F9/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-F9/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-F9/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/xml/docbook/slides-F9/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-F9/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-F9/3.4.0/schema/dtd/slides-full.dtd"
 -- END OASIS TR 9401:1997 catalog for docbook-slides V3.4.0 --


Index: docbook-slides.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-slides/F-9/docbook-slides.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- docbook-slides.spec	14 Nov 2007 09:19:48 -0000	1.9
+++ docbook-slides.spec	19 Jul 2008 22:06:00 -0000	1.10
@@ -2,7 +2,7 @@
 Summary: DocBook Slides document type and stylesheets
 Name: docbook-slides
 Version: 3.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/Text
 URL: http://sourceforge.net/projects/docbook
@@ -37,7 +37,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/slides/%{version}
+DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/slides-F9/%{version}
 mkdir -p $DESTDIR
 cp -a browser $DESTDIR
 cp -a graphics $DESTDIR
@@ -50,11 +50,11 @@
 
 XML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/xml
 mkdir -p $XML_CAT_DIR
-install -p -m 644 %{SOURCE1} $XML_CAT_DIR
+install -p -m 644 %{SOURCE1} $XML_CAT_DIR/%{name}-F9.xml
 
 SGML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/sgml
 mkdir -p $SGML_CAT_DIR
-install -p -m 644 %{SOURCE2} $SGML_CAT_DIR
+install -p -m 644 %{SOURCE2} $SGML_CAT_DIR/%{name}-F9.cat
 
 cp -p %{SOURCE3} ./README.fedora
 
@@ -62,15 +62,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %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 doc
 %doc tests
 %doc README
 %doc NEWS
 %doc README.fedora
-%{_datadir}/xml/docbook/slides/%{version}
-%config(noreplace) %{_sysconfdir}/sgml/docbook-slides.cat
-%config(noreplace) %{_sysconfdir}/xml/docbook-slides.xml
+%dir %{_datadir}/xml/docbook/slides-F9/
+%{_datadir}/xml/docbook/slides-F9/%{version}
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-slides-F9.cat
+%config(noreplace) %{_sysconfdir}/xml/docbook-slides-F9.xml
 
 
 %post
@@ -80,7 +83,7 @@
 ## Define handy variables ##
 
 ROOT_XML_CATALOG=%{_sysconfdir}/xml/catalog
-PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-slides.xml
+PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-slides-F9.xml
 #LOCAL_XML_CATALOG=/usr/share/xml/docbook/slides/3.4.0/catalog.xml
 
 #
@@ -105,7 +108,7 @@
 #################  SGML catalog registration  ######################
 
 ROOT_SGML_CATALOG=%{_sysconfdir}/sgml/catalog
-PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-slides.cat
+PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-slides-F9.cat
 
 #### Root SGML Catalog Entries ####
 #### "Delegate" appropriate lookups to package catalog ####
@@ -123,7 +126,8 @@
   $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
 
 ####################################################################
@@ -139,32 +143,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-slides.cat" 
+# remove catalog entries only on removal of package
+if [ "$1" = 0 ]; then
+  %{_bindir}/xmlcatalog --sgml --noout --del \
+    %{_sysconfdir}/sgml/catalog \
+    "%{_sysconfdir}/sgml/docbook-slides-F9.cat" 
   
-## Remove SGML package catalog
-rm -f %{_sysconfdir}/sgml/docbook-slides.cat
-
-
-##### XML catalogs #####
-
-## Remove package catalog entry from XML root catalog
-%{_bindir}/xmlcatalog --noout --del \
-  "file://%{_sysconfdir}/xml/docbook-slides.xml" \
-  %{_sysconfdir}/xml/catalog 
-
-## Remove XML package catalog
-rm -f %{_sysconfdir}/sgml/docbook-slides.xml
-
-## Remove dtd directory
-rm -rf %{_datadir}/xml/docbook/slides
-
+  %{_bindir}/xmlcatalog --noout --del \
+    "file://%{_sysconfdir}/xml/docbook-slides-F9.xml" \
+    %{_sysconfdir}/xml/catalog 
+fi
 
 %changelog
+* Fri Jul 18 2008 Ondrej Vasik <ovasik at redhat.com> - 3.4.0-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
+
 * Tue Nov 06 2007 Ondrej Vasik <ovasik at redhat.com> - 3.4.0-3
 - merge review(#225702)
 - spec file changed to follow guidelines


Index: docbook-slides.xml
===================================================================
RCS file: /cvs/extras/rpms/docbook-slides/F-9/docbook-slides.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook-slides.xml	25 May 2007 07:58:35 -0000	1.2
+++ docbook-slides.xml	19 Jul 2008 22:06:00 -0000	1.3
@@ -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/xml/docbook/slides-F9/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/xml/docbook/slides-F9/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/xml/docbook/slides-F9/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/xml/docbook/slides-F9/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/xml/docbook/slides-F9/3.4.0/catalog.xml"/>
 
 </catalog>


--- docbook-slides.patch DELETED ---

More information about the fedora-extras-commits mailing list