repairing conflicts

This commit is contained in:
mkocka 2017-06-27 12:39:21 +02:00
commit 0794f3c68e

View file

@ -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