rpms/docbook-slides/devel docbook-slides.spec,1.9,1.10

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/docbook-slides/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18400

Modified Files:
	docbook-slides.spec 
Log Message:
fix loop in post catalog registration(incomplete sed coverage) - #455680, fix several issues in postun causing troubles for updates


Index: docbook-slides.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-slides/devel/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	18 Jul 2008 12:52:36 -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
@@ -68,8 +68,9 @@
 %doc README
 %doc NEWS
 %doc README.fedora
+%dir %{_datadir}/xml/docbook/slides/
 %{_datadir}/xml/docbook/slides/%{version}
-%config(noreplace) %{_sysconfdir}/sgml/docbook-slides.cat
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-slides.cat
 %config(noreplace) %{_sysconfdir}/xml/docbook-slides.xml
 
 
@@ -123,7 +124,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 +141,24 @@
 ## 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.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.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
+
 * Tue Nov 06 2007 Ondrej Vasik <ovasik at redhat.com> - 3.4.0-3
 - merge review(#225702)
 - spec file changed to follow guidelines