SPECS: adapter.awk - updates

[glen]

Author: glen                         Date: Sat May 24 00:30:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updates

---- Files affected:
SPECS:
   adapter.awk (1.392 -> 1.393) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.392 SPECS/adapter.awk:1.393
--- SPECS/adapter.awk:1.392	Sun Apr 27 12:08:47 2008
+++ SPECS/adapter.awk	Sat May 24 02:30:51 2008
@@ -79,6 +79,7 @@
 	"rpm --eval %_kdedocdir"	| getline kdedocdir
 	"rpm --eval %_desktopdir" | getline desktopdir
 	"rpm --eval %_pixmapsdir" | getline pixmapsdir
+	"rpm --eval %_javadir" | getline javadir
 
 	"rpm --eval %perl_sitearch" | getline perl_sitearch
 	"rpm --eval %perl_archlib" | getline perl_archlib
@@ -718,6 +719,9 @@
 		sub(/^X11\/Utilities/,"X11/Applications", group)
 		sub(/^X11\/XFree86/, "X11", group)
 		sub(/^X11\/Xserver$/, "X11/Servers", group)
+		sub(/^Development\/C$/, "Development/Libraries", group)
+		sub(/^Development\/Python$/, "Development/Languages/Python", group)
+		sub(/^System\/Kernel and hardware$/, "Base/Kernel", group)
 
 		$0 = "Group:\t\t" group
 
@@ -816,6 +820,12 @@
 		if (l == "Apache Software License 1.1" || l == "Apache 1.1") {
 			l = "Apache v1.1"
 		}
+		if (l == "GPLv2") {
+			l = "GPL v2"
+		}
+		if (l == "GPLv2+") {
+			l = "GPL v2+"
+		}
 		$0 = "License:\t" l;
 	}
 
@@ -1135,8 +1145,10 @@
 
 	gsub("%{_datadir}/applications", "%{_desktopdir}")
 	gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}")
+	gsub("%{_datadir}/java", "%{_javadir}")
 
 	gsub(libdir, "%{_libdir}")
+	gsub(javadir, "%{_javadir}")
 
 	gsub(bindir, "%{_bindir}")
 	gsub("%{prefix}/bin", "%{_bindir}")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/adapter.awk?r1=1.392&r2=1.393&f=u