Author: glen Date: Wed Oct 17 12:12:54 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- recognize also Suggests
- replace %__install
---- Files affected:
SPECS:
adapter.awk (1.364 -> 1.365)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.364 SPECS/adapter.awk:1.365
--- SPECS/adapter.awk:1.364 Sat Sep 22 13:36:46 2007
+++ SPECS/adapter.awk Wed Oct 17 14:12:49 2007
@@ -29,7 +29,7 @@
RPM_SECTIONS =
"package|build|changelog|clean|description|install|post|posttrans|postun|pre|prep|pretrans|preun|triggerin|triggerpostun|triggerun|verifyscript|check"
SECTIONS = "^%(" RPM_SECTIONS ")"
- PREAMBLE_TAGS =
"(R|BR|Summary|Name|Version|Release|Epoch|License|Group|URL|BuildArch|BuildRoot|Obsoletes|Conflicts|Provides|ExclusiveArch|ExcludeArch|Pre[Rr]eq|(Build)?Requires)"
+ PREAMBLE_TAGS =
"(R|BR|Summary|Name|Version|Release|Epoch|License|Group|URL|BuildArch|BuildRoot|Obsoletes|Conflicts|Provides|ExclusiveArch|ExcludeArch|Pre[Rr]eq|(Build)?Requires|Suggests)"
preamble = 1 # Is it part of preamble? Default - yes
boc = 4 # Beginning of %changelog
@@ -141,7 +141,10 @@
gsub(/^BuildRequires/, "B1BuildRequires", s);
gsub(/^BuildConflicts/, "B2BuildConflicts", s);
+
gsub(/^Provides/, "X1Provides", s);
+ gsub(/^Requires/, "X1Requires", s);
+ gsub(/^Suggests/, "X1Suggests", s);
gsub(/^Obsoletes/, "X2Obsoletes", s);
gsub(/^Conflicts/, "X3Conflicts", s);
gsub(/^BuildArch/, "X4BuildArch", s);
@@ -1321,6 +1324,7 @@
$0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
$0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
$0 = fixedsub("CXXFLAGS=%{rpmcflags} %configure",
"CXXFLAGS=%{rpmcflags}\n%configure", $0);
+ $0 = fixedsub("%__install", "install", $0);
# split configure line to multiple lines
if (/%configure / && !/\\$/) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/adapter.awk?r1=1.364&r2=1.365&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
