- rel 4; don't generate invalid config files

Changed files:
    poldek-git.patch -> 1.5
    poldek.spec -> 1.440

diff --git a/poldek-git.patch b/poldek-git.patch
index ca4527aacf6483b78171a82f9926652532d1147b..0be00ee0125831215e6b284e0076c169a6c0bb0f 100644 (file)
--- a/poldek-git.patch
+++ b/poldek-git.patch
@@ -60,3 +60,20 @@ index b57bb50..d560799 100644
      
      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

diff --git a/poldek.spec b/poldek.spec
index 5d18d5a09fd538cb3a8de7cf930964dea957f275..326520768eaaa30ec5c22860a7518278dfb2d646 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -17,7 +17,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