From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 13 Dec 2005 15:51:36 +0000 (+0000)
Subject: - there's no XFree86 groups
X-Git-Tag: auto/ac/rpm-4_4_2-30~80
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=589bf4b316e065344f1405e87f3413899c1e12e1;p=packages%2Frpm-build-tools.git

- there's no XFree86 groups
- all -I/usr .. is okay

Changed files:
    adapter.awk -> 1.242
---

diff --git a/adapter.awk b/adapter.awk
index 81f0c0b..9476133 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -571,9 +571,10 @@ preamble == 1 {
 		sub(/^System Environment\/Daemons$/, "Daemons", Grupa)
 		sub(/^Applications\/Internet$/, "Applications/Networking", Grupa)
 		sub(/^Applications\/Daemons$/, "Daemons", Grupa)
+		sub(/^Application\/Multimedia$/, "Applications/Multimedia", Grupa)
 		sub(/^System\/Servers$/, "Daemons", Grupa)
 		sub(/^X11\/Xserver$/, "X11/Servers", Grupa)
-		sub(/^X11\/XFree86$/, "X11", Grupa)
+		sub(/^X11\/XFree86/, "X11", Grupa)
 		sub(/^Applications\/Compilers$/, "Development/Languages", Grupa)
 		sub(/^Applications\/Internet\/Peer to Peer/, "Applications/Networking", Grupa)
 		sub(/^Networking\/Deamons$/, "Networking/Daemons", Grupa)
@@ -962,8 +963,8 @@ function use_macros()
 				if ($c ~ prefix "/lib/pkgconfig")
 					continue;
 
-				# CFLAGS="-I/usr/include/ncurses is usually correct.
-				if (/-I\/usr\/include/)
+				# CFLAGS="-I/usr..." is usually correct.
+				if (/-I\/usr/)
 					continue;
 				# same for LDFLAGS="-L/usr..."
 				if (/-L\/usr/)