- more sf url unify

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

diff --git a/adapter.awk b/adapter.awk
index ca5106647c693e4c4320b9ab0fa519e97014bbca..171bfc62cfeafe62ea830fb0a82bec2711e1ebb2 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -82,9 +82,9 @@ BEGIN {
        "rpm --eval %perl_vendorarch" | getline perl_vendorarch
        "rpm --eval %perl_sitelib" | getline perl_sitelib
 
-       "rpm --eval %py_sitescriptdir" | getline py_sitescriptdir
-       "rpm --eval %py_sitedir" | getline py_sitedir
-       "rpm --eval %py_scriptdir " | getline py_scriptdir
+       "rpm --eval %py_sitescriptdir 2>/dev/null" | getline py_sitescriptdir
+       "rpm --eval %py_sitedir 2>/dev/null" | getline py_sitedir
+       "rpm --eval %py_scriptdir 2>/dev/null" | getline py_scriptdir
 
        "rpm --eval %ruby_archdir" | getline ruby_archdir
        "rpm --eval %ruby_ridir" | getline ruby_ridir
@@ -436,10 +436,7 @@ function b_makekey(a, b,   s) {
 /^%clean/, (!/^%clean/ && $0 ~ SECTIONS) {
        did_clean = 1
 
-       # prevent next section header like "%post -p /sbin/ldconfig" being adapterized
-       if (!/^%post/) {
-               use_macros()
-       }
+    use_macros()
 }
 
 ############
@@ -716,7 +713,7 @@ preamble == 1 {
                value = substr($0, index($0, $2));
                $0 = format_requires($1, value);
        }
-
+    
        # BR: tar (and others) is to common (rpm-build requires it)
        if (field ~ /^buildrequires:/) {
                l = substr($0, index($0, $2));
@@ -750,8 +747,15 @@ preamble == 1 {
                sub(/^ant-junit$/, "jakarta-ant", $2);
                sub(/^ldapjdk$/, "ldapsdk", $2);
                sub(/^saxon-scripts$/, "saxon", $2);
+
+        replace_php_virtual_deps();
        }
 
+       if (field ~ /^requires:/) {
+        replace_php_virtual_deps();
+    }
+
+
        # obsolete/unwanted tags
        if (field ~ /vendor:|packager:|distribution:|docdir:|prefix:|icon:|author:|author-email:|metadata-version:/) {
                next
@@ -884,10 +888,15 @@ preamble == 1 {
                $2 = fixedsub(filename, url[n], $2)
 
                # sourceforge urls
+               sub("[?&]big_mirror=.*$", "", $2);
+               sub("[?&]modtime=.*$", "", $2);
+
                sub("[?]use_mirror=.*$", "", $2);
                sub("[?]download$", "", $2);
+
                sub("^http://prdownloads\.sourceforge\.net/", "http://dl.sourceforge.net/", $2)
                sub("^http://download\.sf\.net/", "http://dl.sourceforge.net/", $2)
+               sub("^http://download\.sourceforge\.net/", "http://dl.sourceforge.net/", $2)
 
                sub("^http://.*\.dl\.sourceforge\.net/", "http://dl.sourceforge.net/", $2)
                sub("^http://dl\.sourceforge\.net/sourceforge/", "http://dl.sourceforge.net/", $2)
@@ -1066,6 +1075,8 @@ function use_macros()
     sub("%{_bindir}/perl", "%{__perl}");
     sub("%{_bindir}/python", "%{__python}");
 
+       gsub(infodir, "%{_infodir}")
+
        gsub(perl_sitearch, "%{perl_sitearch}")
        gsub(perl_archlib, "%{perl_archlib}")
        gsub(perl_privlib, "%{perl_privlib}")
@@ -1098,6 +1109,8 @@ function use_macros()
                        continue;
                if ($c ~ sbindir "/webapp")
                        continue;
+               if ($c ~ sbindir "/ldconfig")
+                       continue;
                if ($c ~ sbindir "/chsh")
                        continue;
                if ($c ~ sbindir "/usermod")
@@ -1386,11 +1399,11 @@ function use_files_macros(      i, n, t, a)
        # %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*
        # attr not required, allow default 644 attr
        if (!/network-scripts/ && !/%dir/ && !/\.d$/ && !/functions/ && !/\/etc\/sysconfig\/wmstyle/) {
-               if (/\/etc\/sysconfig\// && /%config/ && !/%config\(noreplace\)/) {
+               if (/\/etc\/sysconfig\// && /%config/ && !/%config\(noreplace/) {
                        gsub("%config", "%config(noreplace)")
                }
 
-               if (/\/etc\/sysconfig\// && !/%config\(noreplace\)/) {
+               if (/\/etc\/sysconfig\// && !/%config\(noreplace/) {
                        $NF = "%config(noreplace) " $NF
                }
 
@@ -1600,4 +1613,34 @@ function add_br(br)
     BR[BR_count++] = br
 }
 
+# php virtual deps as discussed in devel-en
+function replace_php_virtual_deps()
+{
+    pkg = $2
+#    if (pkg == "php-program") {
+#        $0 = $1 "\t/usr/bin/php"
+#        return
+#    }
+
+    if (pkg ~ /^php-/ && pkg !~ /^php-(pear|common|cli|devel|fcgi|cgi|dirs|program|ZendOptimizer|pecl-)/) {
+        sub(/^php-/, "php(", pkg);
+        sub(/$/, ")", pkg);
+        $2 = pkg
+    }
+
+    if (pkg ~/^php$/) {
+        $2 = "webserver(php)";
+        if ($4 ~ /^[0-9]:/) {
+            $4 = substr($4, 3);
+        }
+    }
+
+    if (pkg ~/^php4$/) {
+        $2 = "webserver(php)";
+        if ($4 ~ /^[0-9]:/) {
+            $4 = substr($4, 3);
+        }
+    }
+}
+
 # vim:ts=4:sw=4:et