X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=adapter.awk;h=88380813a3a895d10969fec891e5a9ae3b64e6ec;hb=d08c28a8abbbea45daebcf6f5b3b63a30c75d213;hp=8a131739a8d46d84557cb8a39bc92fe4b475cedc;hpb=62dd0f8781d7ef3a996c37c04bc194e344257b95;p=packages%2Fadapter.git

diff --git a/adapter.awk b/adapter.awk
index 8a13173..8838081 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -636,9 +636,11 @@ preamble == 1 {
 	if (field ~ /summary:/ && !/etc\.$/ && !/Inc\.$/) {
 		sub(/\.$/, "", $0);
 	}
-	if (field ~ /group(\([^)]+\)):/)
+	if (field ~ /group(\([^)]+\)):/) {
 		next
-	if (field ~ /group:/) {
+	}
+
+	if (field == "group:") {
 		format_preamble()
 		group = $0;
 		sub(/^[^ \t]*[ \t]*/, "", group);
@@ -664,7 +666,7 @@ preamble == 1 {
 		did_groups = 1
 	}
 
-	if (field ~ /prereq:/) {
+	if (field == "prereq:") {
 		sub(/Pre[Rr]eq:/, "Requires:", $1);
 	}
 
@@ -675,7 +677,7 @@ preamble == 1 {
 	}
 
 	# BR: tar (and others) is to common (rpm-build requires it)
-	if (field ~ /^buildrequires:/) {
+	if (field == "buildrequires:") {
 		l = substr($0, index($0, $2));
 		if (l == "awk" ||
 			l == "binutils" ||
@@ -700,7 +702,7 @@ preamble == 1 {
 		replace_requires(field);
 	}
 
-	if (field ~ /^requires:/ || field ~ /^requires\(/) {
+	if (field == "requires:" || field ~ /^requires\(/) {
 		replace_requires(field);
 	}
 
@@ -1189,6 +1191,8 @@ function use_macros()
 			continue;
 		if ($c ~ sysconfdir "/apm")
 			continue;
+		if ($c ~ sysconfdir "/modules-load\.d")
+			continue;
 		gsub(sysconfdir, "%{_sysconfdir}", $c)
 	}
 
@@ -1866,7 +1870,7 @@ function replace_php_virtual_deps(field) {
 #		return
 #	}
 
-	if (field == "requires") {
+	if (field == "requires:") {
 		if (pkg ~ /^php-(bcmath|bz2|calendar|ctype|curl|dba|date|dom|enchant|exif|fileinfo|filter|fpm|ftp|gd|gettext|gmp|hash|iconv|imap|interbase|intl|json|ldap|mbstring|mcrypt|mssql|mysql|mysqli|odbc|openssl|pcntl|pcre|pdo|pdo-dblib|pdo-firebird|pdo-mysql|pdo-odbc|pdo-pgsql|pdo-sqlite|pgsql|phar|posix|pspell|readline|recode|session|shmop|simplexml|snmp|soap|sockets|spl|sqlite|sqlite3|sybase-ct|sysvmsg|sysvsem|sysvshm|tidy|tokenizer|wddx|xml|xmlreader|xmlrpc|xmlwriter|xsl|zip|zlib)/) {
 			sub(/^php-/, "php(", pkg);
 			sub(/$/, ")", pkg);
@@ -2076,6 +2080,8 @@ function replace_requires(field) {
 	sub(/^iscsi-initiator-utils$/, "open-iscsi", $2);
 	sub(/^keyutils-libs-devel$/, "keyutils-devel", $2);
 	sub(/^libSM-devel$/, "xorg-lib-libSM-devel", $2);
+	sub(/^libXv-devel$/, "xorg-lib-libXv-devel", $2);
+	sub(/^libxkbfile-devel$/, "xorg-lib-libxkbfile", $2);
 	sub(/^libX11-devel$/, "xorg-lib-libX11-devel", $2);
 	sub(/^libXScrnSaver-devel$/, "xorg-lib-libXScrnSaver-devel", $2);
 	sub(/^libXau-devel$/, "xorg-lib-libXau-devel", $2);
@@ -2087,6 +2093,7 @@ function replace_requires(field) {
 	sub(/^libXinerama-devel$/, "xorg-lib-libXinerama-devel", $2);
 	sub(/^libXrandr-devel$/, "xorg-lib-libXrandr-devel", $2);
 	sub(/^libXrender-devel$/, "xorg-lib-libXrender-devel", $2);
+	sub(/^libXtst-devel$/, "xorg-lib-libXtst-devel", $2);
 	sub(/^libXxf86vm-devel$/, "xorg-lib-libXxf86vm-devel", $2);
 	sub(/^libacl-devel$/, "acl-devel", $2);
 	sub(/^libcurl-devel$/, "curl-devel", $2);