- poldek -u works again

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

diff --git a/adapter.awk b/adapter.awk
index 6e21ef9281dee20bca664ed587c97b2298bc9d83..36de9035bfeee3a2a60e7ef4d211bbecfb7fef8f 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -34,7 +34,7 @@ BEGIN {
        # get cvsaddress for changelog section
        # using rpm macros as too lazy to add ~/.adapterrc parsing support.
        "rpm --eval '%{?_cvsmaildomain}%{!?_cvsmaildomain:@pld-linux.org}'" | getline _cvsmaildomain
-       "rpm --eval '%{?_cvsmailfeedback}%{!?_cvsmailfeedback:PLD Team <rpm@cvs.delfi.ee>}'" | getline _cvsmailfeedback
+       "rpm --eval '%{?_cvsmailfeedback}%{!?_cvsmailfeedback:PLD Team <feedback@pld-linux.org>}'" | getline _cvsmailfeedback
 
        # If 1, we are inside of comment block (started with /^#%/)
        comment_block = 0
@@ -416,7 +416,15 @@ preamble == 1 {
 ###########
 /^%pre/, (/^%[a-z]+$/ && !/^%pre/) {
        preamble = 0
+
+       # %useradd and %groupadd may not be wrapped
+       if (/%(useradd|groupadd).*\\$/) {
+               a = $0; getline;
+               sub(/^[\s\t]*/, "");
+               $0 = substr(a, 1, length(a) - 1) $0;
+       }
 }
+
 /^%post/, (/^%[a-z]+$/ && !/^%post/) {
        preamble = 0
 }
@@ -612,6 +620,7 @@ preamble == 1 {
 
                sub("^http://.*\.dl\.sourceforge\.net/", "http://dl.sourceforge.net/", $2)
                sub("^http://dl\.sourceforge\.net/sourceforge/", "http://dl.sourceforge.net/", $2)
+               sub("^http://dl\.sf\.net/", "http://dl.sourceforge.net/", $2)
        }
 
 
@@ -852,12 +861,16 @@ function use_macros()
 
        gsub("^make$", "%{__make}")
        gsub("^make ", "%{__make} ")
+       gsub("^gcc ", "%{__cc} ")
 
        # mandrake specs
        gsub("^%make$", "%{__make}")
        gsub("^%make ", "%{__make} ")
        gsub("^%makeinstall_std", "%{__make} install \\\n\tDESTDIR=$RPM_BUILD_ROOT")
+       gsub("^%{makeinstall}", "%{__make} install \\\n\tDESTDIR=$RPM_BUILD_ROOT")
        gsub("^%{__rm} -rf %{buildroot}", "rm -rf $RPM_BUILD_ROOT")
+       gsub("^%{__install}", "install")
+       gsub("^%{__rm}", "rm")
        gsub("%optflags", "%{rpmcflags}")
        gsub("%{compat_perl_vendorarch}", "%{perl_vendorarch}")