diff --git a/mariadb.yaml b/mariadb.yaml index 293af0c..eb3edd0 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -15,9 +15,15 @@ data: buildrequires: bootstrap: f27 requires: +<<<<<<< HEAD platform: f27 host: f27 networking-base: f27 +======= + platform: master + host: master + networking-base: master +>>>>>>> 8aad0284c3e826da2219104d8d2ba138e9a0613d references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/container-images/mariadb/ @@ -47,11 +53,15 @@ data: %runselftest 0 components: rpms: + # mariadb-10.2.9-3.fc28 mariadb: rationale: MariaDB package. - ref: f27 - buildorder: 5 + ref: 81336ab97e91b46dc459b15c24fa124cc56370bc + # bison-3.0.4-8.fc27 bison: rationale: A runtime dependency of mariadb. - ref: f27 - buildorder: 5 + ref: 716b8b181fda674e6ad2b3c0662e5b3e16d4a6f3 + # jemalloc-4.5.0-4.fc27 + jemalloc: + rationale: Generated. + ref: a1dce39784b3c9cc2bef14027ab9bbc41fdb8c0c