From: Elan Ruusamäe Date: Thu, 22 May 2014 07:17:21 +0000 (+0300) Subject: adapter: handle suggests for php name changes X-Git-Tag: auto/th/rpm-build-tools-4.6-4~48 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=f983d041be2c8f5134ce2a06d4c9d2a1fcdbaf5f;p=packages%2Frpm-build-tools.git adapter: handle suggests for php name changes --- diff --git a/adapter.awk b/adapter.awk index 525fb0c..003418b 100644 --- a/adapter.awk +++ b/adapter.awk @@ -721,7 +721,7 @@ preamble == 1 { replace_requires(field); } - if (field == "requires:" || field ~ /^requires\(/) { + if (field == "requires:" || field ~ /^requires\(/ || field == "suggests:") { replace_requires(field); } @@ -1960,7 +1960,7 @@ function replace_php_virtual_deps(field) { # return # } - if (field == "requires:") { + if (field == "requires:" || field == "suggests:") { 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);