[packages/rpm-build-tools] some fedoraishms

glen glen at pld-linux.org
Fri Nov 27 23:57:16 CET 2015


commit b97e3fdf90fd59a6abcedeee8b6744b0ea10bc34
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Nov 28 00:57:07 2015 +0200

    some fedoraishms

 adapter.awk | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/adapter.awk b/adapter.awk
index d2793bd..ad9f980 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1329,6 +1329,7 @@ function use_macros()
 	gsub(php_pear_dir, "%{php_pear_dir}")
 	gsub(php_data_dir, "%{php_data_dir}")
 	gsub("%{_datadir}/php", "%{php_data_dir}")
+	gsub("%{php_home}", "%{php_data_dir}")
 
 	# change to %{_datadir}, with some exceptions
 	for (c = 1; c <= NF; c++) {
@@ -2053,6 +2054,10 @@ function replace_php_virtual_deps(field) {
 		}
 	}
 
+	if (pkg == "php(language)") {
+		$2 = "php(core)"
+	}
+
 	if (pkg == "php4") {
 		$2 = "webserver(php)"
 		if ($4 ~ /^[0-9]:/) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/b97e3fdf90fd59a6abcedeee8b6744b0ea10bc34



More information about the pld-cvs-commit mailing list