- dots must be escaped after version subst

[packages/rpm-build-tools.git] / pldnotify.awk

diff --git a/pldnotify.awk b/pldnotify.awk
index c58a0f7184537a338acda50892c47d7296df64ee..fb81ce5c7b361ba7661b9b9146408f52812bb4c5 100644 (file)
--- a/pldnotify.awk
+++ b/pldnotify.awk
@@ -16,6 +16,8 @@ function compare_ver(v1,v2) {
                v2=(substr(v2,1,RSTART) "." substr(v2,RSTART+RLENGTH-1))
        sub("^0*","",v1)
        sub("^0*","",v2)
+       gsub("\.0*",".",v1)
+       gsub("\.0*",".",v2)
        if (DEBUG) print "v1 == " v1
        if (DEBUG) print "v2 == " v2
        count=split(v1,v1a,"\.")
@@ -25,8 +27,6 @@ function compare_ver(v1,v2) {
        else mincount=count2
        
        for (i=1; i<=mincount; i++) {
-               sub("^0*","",v1a[i])
-               sub("^0*","",v2a[i])
                if (v1a[i]=="") v1a[i]=0
                if (v2a[i]=="") v2a[i]=0
                if (DEBUG) print "i == " i
@@ -46,19 +46,19 @@ function compare_ver(v1,v2) {
                                return 1
                        else if (v1a[i]>v2a[i])
                                return 0
-               } else if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha"))
+               } else if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")||(v1a[i]~"rc"))
                        return 1
                else
                        return 0
        }
        if ((count2==mincount)&&(count!=count2)) {
                for (i=count2+1; i<=count; i++)
-                       if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")) 
+                       if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")||(v1a[i]~"rc")) 
                                return 1
                return 0
        } else if (count!=count2) {
                for (i=count+1; i<=count2; i++)
-                       if ((v2a[i]~"pre")||(v2a[i]~"beta")||(v2a[i]~"alpha"))
+                       if ((v2a[i]~"pre")||(v2a[i]~"beta")||(v2a[i]~"alpha")||(v2a[i]~"rc"))
                                return 0
                return 1
        }
@@ -108,19 +108,19 @@ function compare_ver_dec(v1,v2) {
                                return 1
                        else if (v1a[i]>v2a[i])
                                return 0
-               } else if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha"))
+               } else if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")||(v1a[i]~"rc"))
                        return 1
                else
                        return 0
        }
        if ((count2==mincount)&&(count!=count2)) {
                for (i=count2+1; i<=count; i++)
-                       if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")) 
+                       if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")||(v1a[i]~"rc")) 
                                return 1
                return 0
        } else if (count!=count2) {
                for (i=count+1; i<=count2; i++)
-                       if ((v2a[i]~"pre")||(v2a[i]~"beta")||(v2a[i]~"alpha"))
+                       if ((v2a[i]~"pre")||(v2a[i]~"beta")||(v2a[i]~"alpha")||(v2a[i]~"rc"))
                                return 0
                return 1
        }
@@ -253,7 +253,8 @@ function process_source(number,lurl,name,version) {
 
        filenameexp=filename
        gsub("\+","\\+",filenameexp)
-       sub(version,"[A-Za-z0-9\\.]+",filenameexp)
+       sub(version,"[A-Za-z0-9.]+",filenameexp)
+       gsub("\.","\\.",filenameexp)
        if ( DEBUG ) print "Wzorzec: " filenameexp
        match(filename,version)
        prever=substr(filename,1,RSTART-1)
@@ -278,7 +279,7 @@ function process_source(number,lurl,name,version) {
                for (nr=1; nr<=c; nr++) {
                        addr=linki[nr]
                        if (DEBUG) print "Znaleziony link: " addr
-                       if (addr ~ filenameexp) {
+                       if ((addr ~ filenameexp) && !(addr ~ "[-_.0-9A-Za-z]" filenameexp)) {
                                match(addr,filenameexp)
                                newfilename=substr(addr,RSTART,RLENGTH)
                                if (DEBUG) print "Hipotetyczny nowy: " newfilename