- fix groups

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

diff --git a/adapter.awk b/adapter.awk
index 3af83f6306b6cd2c87cc788faf618f1d6682caf7..64ec6377ce9a86272d54ddb87b96ed9c10658f4c 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -646,8 +646,10 @@ preamble == 1 {
                sub(/^X11\/GNOME/,"X11/Applications", group)
                sub(/^X11\/Utilities/,"X11/Applications", group)
                sub(/^X11\/Games\/Strategy/,"X11/Applications/Games/Strategy", group)
+               sub(/^X11\/Library/,"X11/Libraries", group)
                sub(/^Shells/,"Applications/Shells", group)
                sub(/^System Environment\/Libraries$/, "Libraries", group)
+               sub(/^Library\/Development$/, "Development/Libraries", group)
                sub(/^System Environment\/Daemons$/, "Daemons", group)
                sub(/^Applications\/Internet$/, "Applications/Networking", group)
                sub(/^Applications\/Daemons$/, "Daemons", group)
@@ -666,6 +668,8 @@ preamble == 1 {
                sub(/^Development\/Testing$/, "Development", group)
                sub(/^Text Processing\/Markup\/HTML$/, "Applications/Text", group)
                sub(/^Text Processing\/Markup\/XML$/, "Applications/Text", group)
+               sub(/^Web\/Database$/, "Applications/WWW", group)
+               sub(/^System Environment\/Base$/, "Base", group)
 
                $0 = "Group:\t\t" group
 
@@ -943,7 +947,7 @@ preamble == 1 {
        print
 
        if (name_seen == 0 && name) {
-               print "Name:\t" name
+               print "Name:\t\t" name
                name_seen = 1
        }
 
@@ -1086,6 +1090,8 @@ function use_macros()
                        continue;
                if ($c ~ sysconfdir "/{?modprobe.(d|conf)")
                        continue;
+               if ($c ~ sysconfdir "/{?udev/rules.d")
+                       continue;
                if ($c ~ sysconfdir "/{?logrotate.d")
                        continue;
                if ($c ~ sysconfdir "/{?pam.d")
@@ -1114,6 +1120,8 @@ function use_macros()
                        continue;
                if ($c ~ sysconfdir "/{?samba")
                        continue;
+               if ($c ~ sysconfdir "/shells")
+                       continue;
                gsub(sysconfdir, "%{_sysconfdir}", $c)
        }
 
@@ -1361,6 +1369,12 @@ function use_files_macros(       i, n, t, a)
                gsub("%attr\\(0", "%attr(")
        }
 
+    # kill default attrs
+    gsub(/%dir %attr\(755,root,root\)/, "%dir");
+    if (!/%dir/) {
+        gsub(/%attr\(644,root,root\) /, "");
+    }
+
        # sort %verify attrs
        if (match($0, /%verify\(not([^)]+)\)/)) {
                t = substr($0, RSTART, RLENGTH)