packages: poldek/poldek-git.patch, poldek/poldek.spec - rel 4; don't genera...

[arekm]

Author: arekm                        Date: Wed Mar 21 19:20:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; don't generate invalid config files

---- Files affected:
packages/poldek:
   poldek-git.patch (1.4 -> 1.5) , poldek.spec (1.439 -> 1.440) 

---- Diffs:

================================================================
Index: packages/poldek/poldek-git.patch
diff -u packages/poldek/poldek-git.patch:1.4 packages/poldek/poldek-git.patch:1.5
--- packages/poldek/poldek-git.patch:1.4	Wed Mar 21 15:57:43 2012
+++ packages/poldek/poldek-git.patch	Wed Mar 21 20:20:20 2012
@@ -60,3 +60,20 @@
      
      if (tndb_get_voff(db, key, klen, &voffs, &vlen)) {
  	*val = n_malloc(vlen + 1); /* extra byte for \0 */
+diff --git a/doc/conf-xml2.sh b/doc/conf-xml2.sh
+index 19a7f9d..abda8e6 100755
+--- a/doc/conf-xml2.sh
++++ b/doc/conf-xml2.sh
+@@ -37,10 +37,10 @@ to_conf() {
+     perl -pe 's/\[(.?)screen\]/=remove/g; s/\[(.?)\w+\]//g; s/\[\s(\w+)\s\]/[$1]/g;' $FILE > $tmp.tmp
+ 
+     xsl=$DN/conf-xml2conf.xsl
+-    perl -pe "s|%\{name\}|$NAME.conf|g" $xsl > $xsl.tmp
++    perl -pe "s|%\{name\}|$NAME.conf|g" $xsl > $xsl.$NAME.tmp
+ 
+     echo "Writing $NAME.conf"
+-    xsltproc $xsl.tmp $tmp.tmp |
++    xsltproc $xsl.$NAME.tmp $tmp.tmp |
+     # hash text between =xxxstart and =xxxend
+     perl -ne 's/^\s+(=xxx\w+)/$1/; $in = 1 if /^=xxxstart/; $in = 0 if /^=xxxend/; if ($in) { s/^\s+([^#])/# $1/; }; print if $_ !~ /^=/' |
+     # remove unneeded leading lines and lines with =remove tag

================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.439 packages/poldek/poldek.spec:1.440
--- packages/poldek/poldek.spec:1.439	Wed Mar 21 15:57:43 2012
+++ packages/poldek/poldek.spec	Wed Mar 21 20:20:20 2012
@@ -18,7 +18,7 @@
 %define	ver_rpm	4.5-49
 
 %define		snap	rc5
-%define		rel	3
+%define		rel	4
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -496,6 +496,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.440  2012/03/21 19:20:20  arekm
+- rel 4; don't generate invalid config files
+
 Revision 1.439  2012/03/21 14:57:43  cactus
 - rel 3; missing fix for types in tndb_get_all
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/poldek/poldek-git.patch?r1=1.4&r2=1.5
    http://cvs.pld-linux.org/packages/poldek/poldek.spec?r1=1.439&r2=1.440