rpms/docbook-style-xsl/F-7 docbook-style-xsl.Makefile, 1.6, 1.7 docbook-style-xsl.spec, 1.34, 1.35 docbook-xsl-marginleft.patch, 1.5, 1.6 docbook-xsl-non-constant-expressions.patch, 1.1, 1.2

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7374

Modified Files:
	docbook-style-xsl.Makefile docbook-style-xsl.spec 
	docbook-xsl-marginleft.patch 
	docbook-xsl-non-constant-expressions.patch 
Log Message:
remove entries from xmlcatalog only when removing package (post was adding/postun removing :( ) + ship all xsl files from lib


Index: docbook-style-xsl.Makefile
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/docbook-style-xsl.Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- docbook-style-xsl.Makefile	24 Jan 2007 12:56:26 -0000	1.6
+++ docbook-style-xsl.Makefile	11 Dec 2007 13:10:01 -0000	1.7
@@ -17,7 +17,7 @@
 	cp html/*.xsl $(DESTDIR)/html
 	cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp
 	cp javahelp/*.xsl $(DESTDIR)/javahelp
-	cp lib/lib.xsl $(DESTDIR)/lib
+	cp lib/*.xsl $(DESTDIR)/lib
 	cp template/*.xsl $(DESTDIR)/template
 	cp xhtml/*.xsl $(DESTDIR)/xhtml
 	cp manpages/*.xsl $(DESTDIR)/manpages


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/docbook-style-xsl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- docbook-style-xsl.spec	10 Dec 2007 11:24:03 -0000	1.34
+++ docbook-style-xsl.spec	11 Dec 2007 13:10:01 -0000	1.35
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.73.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -98,12 +98,19 @@
 
 
 %postun
-CATALOG=/etc/xml/catalog
-/usr/bin/xmlcatalog --noout --del \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
-
+# remove entries only on removal of package
+if [ "$1" = 0 ]; then
+  CATALOG=/etc/xml/catalog
+  /usr/bin/xmlcatalog --noout --del \
+   "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
+fi
 
 %changelog
+* Tue Dec 11 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-3
+- correction of Makefile(shiping all xsl in lib subdir)
+- remove entries from xmlcatalog only on removal of package
+  (required because of the last change with droping release) 
+
 * Mon Dec 10 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-2
 - new Requires for libxml2(#253962)
 - a bit of spec file cleanup do follow guidelines and 

docbook-xsl-marginleft.patch:

Index: docbook-xsl-marginleft.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/docbook-xsl-marginleft.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- docbook-xsl-marginleft.patch	9 Feb 2005 14:56:45 -0000	1.5
+++ docbook-xsl-marginleft.patch	11 Dec 2007 13:10:01 -0000	1.6
@@ -104,8 +104,8 @@
    <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
 -  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
 -  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
-+  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-+  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
++  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
++  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
    <xsl:attribute name="hyphenate">false</xsl:attribute>
    <xsl:attribute name="start-indent">0pt</xsl:attribute>
  </xsl:attribute-set>

docbook-xsl-non-constant-expressions.patch:

Index: docbook-xsl-non-constant-expressions.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/docbook-xsl-non-constant-expressions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docbook-xsl-non-constant-expressions.patch	10 Dec 2007 11:24:03 -0000	1.1
+++ docbook-xsl-non-constant-expressions.patch	11 Dec 2007 13:10:01 -0000	1.2
@@ -1,4 +1,3 @@
-Pouze v docbook-xsl-1.73.2/fo: .index.xsl.swp
 diff -ur docbook-xsl-1.73.2-orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
 --- docbook-xsl-1.73.2-orig/fo/param.xsl	2007-12-03 15:49:14.000000000 +0100
 +++ docbook-xsl-1.73.2/fo/param.xsl	2007-12-04 15:49:46.000000000 +0100