From 0794f3c68e6bdd5fd958bffd7fc64d495796744d Mon Sep 17 00:00:00 2001 From: mkocka Date: Tue, 27 Jun 2017 12:39:21 +0200 Subject: [PATCH] repairing conflicts --- php.yaml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/php.yaml b/php.yaml index 3c085c5..257cb67 100644 --- a/php.yaml +++ b/php.yaml @@ -38,6 +38,21 @@ data: api: rpms: - php + filter: + rpms: + - php-dba + - php-devel + - php-enchant + - php-gd + - php-imap + - php-interbase + - php-mcrypt + - php-odbc + - php-pdo-dblib + - php-pspell + - php-recode + - php-snmp + - php-tidy components: rpms: php: @@ -48,10 +63,10 @@ data: # rationale: Provides API for this module. # ref: f26 # buildorder: 2 - gperftools: - rationale: dependency - ref: f26 - buildorder: 1 +# gperftools: +# rationale: dependency +# ref: f26 +# buildorder: 1 libmnl: rationale: dependency ref: f26