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

[Ondrej Vasik (ovasik)]

Author: ovasik

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

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


Index: docbook-simple.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-simple/devel/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	18 Jul 2008 12:20:57 -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,17 +41,17 @@
 
 ########## install versioned-numbered directory of dtd files ############
 
-DESTDIR=$RPM_BUILD_ROOT/usr/share/xml/docbook/simple
+DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/simple
 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
 
-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
 
@@ -68,8 +68,9 @@
 %defattr (-,root,root,-)
 %doc sdocbook.css
 %doc README.fedora
+%dir %{_datadir}/xml/docbook/simple/
 %{_datadir}/xml/docbook/simple/%{version}
-%config(noreplace) %{_sysconfdir}/sgml/docbook-simple.cat
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-simple.cat
 %config(noreplace) %{_sysconfdir}/xml/docbook-simple.xml
 
 
@@ -122,11 +123,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 +145,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-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.cat
+
+  %{_bindir}/xmlcatalog --noout --del \
+    "file://%{_sysconfdir}/xml/docbook-simple.xml" \
+     %{_sysconfdir}/xml/catalog 
+fi
 
 %changelog
+* Fri Jul 18 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
+
 * Mon Nov 05 2007 Ondrej Vasik <ovasik at redhat.com> - 1.1-3
 - merge review(#225701)
 - spec modified to follow guidelines