Author: glen Date: Wed Oct 12 07:57:20 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- hacks to unify worldforge specs
---- Files affected:
SPECS:
adapter.awk (1.196 -> 1.197)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.196 SPECS/adapter.awk:1.197
--- SPECS/adapter.awk:1.196 Mon Oct 10 11:18:48 2005
+++ SPECS/adapter.awk Wed Oct 12 09:57:15 2005
@@ -489,6 +489,8 @@
sub(/^[^ \t]*[ \t]*/,"")
Grupa = $0
+ sub(/^System Environment\/Libraries/, "Libraries", Grupa)
+
print "Group:\t\t" Grupa
if (Grupa ~ /^X11/ && x11 == 0) # Is it X11 application?
x11 = 1
@@ -538,16 +540,25 @@
$1 = "License:"
if (field ~ /name:/) {
+ if ($2 == "%{name}" && version) {
+ $2 = name
+ }
name = $2
name_seen = 1;
}
if (field ~ /version:/) {
+ if ($2 == "%{version}" && version) {
+ $2 = version
+ }
version = $2
version_seen = 1;
}
if (field ~ /release:/) {
+ if ($2 == "%{release}" && release) {
+ $2 = release
+ }
release = $2
release_seen = 1;
}
@@ -648,6 +659,7 @@
sub("^"prefix, $3, includedir)
prefix = $3
}
+
if ($2 ~ /_bindir/ && !/_sbindir/)
bindir = $3
if ($2 ~ /_sbindir/)
@@ -671,6 +683,13 @@
_rc = $3
if ($2 ~ /_snap/)
_snap = $3
+
+ if ($2 ~ /name/)
+ name = $3
+ if ($2 ~ /version/)
+ version = $3
+ if ($2 ~ /release/)
+ release = $3
}
if (field ~ /requires/) {
@@ -878,6 +897,7 @@
gsub("^%make ", "%{__make} ")
gsub("^%makeinstall_std", "%{__make} install
\\\n\tDESTDIR=$RPM_BUILD_ROOT")
gsub("^%{makeinstall}", "%{__make} install
\\\n\tDESTDIR=$RPM_BUILD_ROOT")
+ gsub("^%makeinstall", "%{__make} install \\\n\tDESTDIR=$RPM_BUILD_ROOT")
gsub("^%{__rm} -rf %{buildroot}", "rm -rf $RPM_BUILD_ROOT")
gsub("^%{__install}", "install")
gsub("^%{__rm}", "rm")
@@ -888,6 +908,8 @@
gsub("^fix-info-dir$", "[ ! -x /usr/sbin/fix-info-dir ] ||
/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>\&1")
$0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
$0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
+ $0 = fixedsub("CXXFLAGS=%{rpmcflags} %configure",
"CXXFLAGS=%{rpmcflags}\n%configure", $0);
+
gsub("%_bindir", "%{_bindir}")
gsub("%_datadir", "%{_datadir}")
gsub("%_iconsdir", "%{_iconsdir}")
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.196&r2=1.197&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
