- less if branches & indenting

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

diff --git a/adapter.awk b/adapter.awk
index 830a6fd714bd78fbbdeaf1bac39da7d28edb8bc3..430cf17394e71dc328604ef5f955e610bf1eeda5 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -747,7 +747,7 @@ preamble == 1 {
                $1 = "Suggests:"
        }
 
-       if ($3 == "==") {
+       if ($3 == "==" && $1 !~ /%/) {
                $3 = "="
        }
 
@@ -1129,6 +1129,9 @@ function use_macros()
        gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}")
        gsub(pkgconfigdir, "%{_pkgconfigdir}")
 
+       gsub("%{_datadir}/pkgconfig", "%{_npkgconfigdir}")
+       gsub(npkgconfigdir, "%{_npkgconfigdir}")
+
        gsub(libdir, "%{_libdir}")
        gsub(javadir, "%{_javadir}")
 
@@ -1454,7 +1457,7 @@ function use_files_macros(        i, n, t, a, l)
                }
        }
 
-       if (/lib.+\.so/ && !/\.so$/ && !/^%attr.*/ && !/%exclude/) {
+       if (/lib.+\.so\b/ && !/\.so$/ && !/^%attr.*/ && !/%exclude/) {
                $0 = "%attr(755,root,root) " $0
        }
 
@@ -1524,6 +1527,7 @@ function use_files_macros(        i, n, t, a, l)
 
        if (/%{_mandir}/) {
                gsub("\.gz$", "*")
+               gsub("%ext_man$", "*")
        }
 
        # locale dir and no %lang -> bad
@@ -1787,7 +1791,7 @@ function import_rpm_macros() {
                exit(rc = 1);
        }
 
-       if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.44) {
+       if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.46) {
                print "adapter shell script is outdated, please cvs up it" > "/dev/stderr"
                do_not_touch_anything = 1
                exit(rc = 1);
@@ -1815,6 +1819,7 @@ function import_rpm_macros() {
        pixmapsdir = ENVIRON["_pixmapsdir"]
        javadir = ENVIRON["_javadir"]
        pkgconfigdir = ENVIRON["_pkgconfigdir"]
+       npkgconfigdir = ENVIRON["_npkgconfigdir"]
 
        perl_sitearch = ENVIRON["perl_sitearch"]
        perl_archlib = ENVIRON["perl_archlib"]
@@ -1935,24 +1940,28 @@ function replace_requires() {
        # fedora / redhat
        sub(/^Django$/, "python-django", $2);
        sub(/^GitPython$/, "python-git", $2);
-       sub(/^freetype2-devel$/, "freetype-devel", $2);
        sub(/^chkconfig$/, "/sbin/chkconfig", $2);
        sub(/^db4-devel$/, "db-devel", $2);
        sub(/^dbus-python$/, "python-dbus", $2);
        sub(/^file-devel$/, "libmagic-devel", $2);
+       sub(/^freetype2-devel$/, "freetype-devel", $2);
        sub(/^fuse-devel$/, "libfuse-devel", $2);
        sub(/^gamin-python$/, "python-gamin", $2);
        sub(/^gcc-c\+\+$/, "libstdc++-devel", $2);
        sub(/^gnome-python2-extras$/, "python-gnome-extras", $2);
        sub(/^gnome-python2-gtkspell$/, "python-gnome-extras-gtkspell", $2);
+       sub(/^gtk-sharp2-devel$/, "dotnet-gtk-sharp2-devel", $2);
        sub(/^gtk2$/, "gtk+2", $2);
        sub(/^gtk2-devel$/, "gtk+2-devel", $2);
        sub(/^initscripts$/, "rc-scripts", $2);
+       sub(/^iproute$/, "iproute2", $2);
        sub(/^iscsi-initiator-utils$/, "open-iscsi", $2);
        sub(/^libXft-devel$/, "xorg-lib-libXft-devel", $2);
        sub(/^libXrandr-devel$/, "xorg-lib-libXrandr-devel", $2);
+       sub(/^libcurl-devel$/, "curl-devel", $2);
        sub(/^mod_wsgi$/, "apache-mod_wsgi", $2);
        sub(/^notify-python$/, "python-pynotify", $2);
+       sub(/^pulseaudio-libs-devel$/, "pulseaudio-devel", $2);
        sub(/^pyOpenSSL$/, "python-pyOpenSSL", $2);
        sub(/^pygobject2$/, "python-pygobject", $2);
        sub(/^pygtk2$/, "python-pygtk", $2);
@@ -1964,6 +1973,7 @@ function replace_requires() {
        sub(/^python2-devel$/, "python-devel", $2);
        sub(/^qt4-devel$/, "qt4-build", $2);
        sub(/^qtlockedfile-devel$/, "QtLockedFile-devel", $2);
+       sub(/^rpm-python$/, "python-rpm", $2);
        sub(/^tftp-server$/, "tftpdaemon", $2);
        sub(/^tkinter$/, "python-tkinter", $2);
        sub(/^xapian-bindings-python$/, "python-xapian", $2);
@@ -2028,6 +2038,7 @@ function replace_groupnames(group) {
        group = replace(group, "Applications/Internet", "Applications/Networking");
        group = replace(group, "Applications/Internet/Peer to Peer", "Applications/Networking");
        group = replace(group, "Applications/Productivity", "X11/Applications");
+       group = replace(group, "Applications/Security", "Applications/System");
        group = replace(group, "Applications/Web", "Applications/WWW");
        group = replace(group, "Database", "Applications/Databases");
        group = replace(group, "Development/C", "Development/Libraries");
@@ -2051,6 +2062,7 @@ function replace_groupnames(group) {
        group = replace(group, "Games", "Applications/Games");
        group = replace(group, "Library/Development", "Development/Libraries");
        group = replace(group, "Networking/Deamons", "Networking/Daemons");
+       group = replace(group, "Networking/Other", "Networking");
        group = replace(group, "Productivity/Databases/Servers", "Applications/Databases");
        group = replace(group, "Productivity/Multimedia/Other", "X11/Applications/Multimedia");
        group = replace(group, "Productivity/Networking/Web/Servers", "Networking/Daemons/HTTP");;