[packages/adapter: 411/631] - updates

[glen]

commit ee9487af1f027bc28f0923d30537bf984cbbbaa5
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sat May 24 00:30:51 2008 +0000

    - updates
    
    Changed files:
        adapter.awk -> 1.393

 adapter.awk | 12 ++++++++++++
 1 file changed, 12 insertions(+)
---
diff --git a/adapter.awk b/adapter.awk
index 4cb9712..3e6478e 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -79,6 +79,7 @@ BEGIN {
 	"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 @@ preamble == 1 {
 		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 @@ preamble == 1 {
 		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 @@ function use_macros()
 
 	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}")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885