From fce6e3da2ab46da0823447a8b1d580ad54559810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 16 May 2017 09:46:23 +0200 Subject: [PATCH 1/4] Fix a typo and filter libreport-devel out properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- dnf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf.yaml b/dnf.yaml index 3e959f3..695bec8 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -38,7 +38,7 @@ data: python2-libcomps, # libreport libreport, libreport-anaconda, libreport-centos, - libreport-cli, libreport-compat, librepot-devel, + libreport-cli, libreport-compat, libreport-devel, libreport-fedora, libreport-gtk, libreport-gtk-devel, libreport-newt, libreport-plugin-bugzilla, libreport-plugin-kerneloops, libreport-plugin-logger, From 209e9084aa31a7176a46f7e820699af646aa65f5 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 12 Jul 2017 16:58:36 +0200 Subject: [PATCH 2/4] dnf-2.6 with module support, libdnf in brt is to old, we need > 0.9.0 --- dnf.yaml | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dnf.yaml b/dnf.yaml index 695bec8..455b84a 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -7,9 +7,11 @@ data: module: [ MIT ] dependencies: buildrequires: - bootstrap: master + bootstrap: f26 requires: - base-runtime: master + base-runtime: f26 + # provides libreport bits + shared-userspace: f26 references: community: https://fedoraproject.org/wiki/BaseRuntime documentation: https://github.com/fedora-modularity/base-runtime @@ -24,7 +26,7 @@ data: libcomps, libcomps-devel, libcomps-doc, python-libcomps-doc, python3-libcomps, # libreport - libreport-filesystem, + libreport-python3, # python-iniparse python3-iniparse, ] @@ -37,15 +39,15 @@ data: # libcomps python2-libcomps, # libreport - libreport, libreport-anaconda, libreport-centos, - libreport-cli, libreport-compat, libreport-devel, - libreport-fedora, libreport-gtk, libreport-gtk-devel, - libreport-newt, libreport-plugin-bugzilla, - libreport-plugin-kerneloops, libreport-plugin-logger, - libreport-plugin-mailx, libreport-plugin-mantisbt, - libreport-plugin-reportuploader, libreport-plugin-rhtsupport, - libreport-plugin-systemd-journal, libreport-plugin-ureport, - libreport-python, libreport-python3, libreport-web, + libreport, libreport, libreport-anaconda, libreport-centos, + libreport-cli, libreport-compat, libreport-debuginfo, + libreport-devel, libreport-fedora, libreport-filesystem, + libreport-gtk, libreport-gtk-devel, libreport-newt, + libreport-plugin-bugzilla, libreport-plugin-kerneloops, + libreport-plugin-logger, libreport-plugin-mailx, + libreport-plugin-mantisbt, libreport-plugin-reportuploader, + libreport-plugin-rhtsupport, libreport-plugin-systemd-journal, + libreport-plugin-ureport, libreport-python, libreport-web, libreport-web-devel, # python-iniparse python2-iniparse, @@ -56,19 +58,29 @@ data: deltarpm: rationale: A dependency of python3-dnf ref: 6c36433c34e1c8afac4cc56460c4ef7c561e26ab - # dnf-2.4.0-1.fc26 + # dnf-2.6.0-1.git.40 dnf: rationale: The DNF package manager. - ref: 9087cf58a8559c6103f18e52580a08daff985563 + ref: de5a9d289353849edd144aeb6fab85a4937cd4e8 + buildorder: 10 # libcomps-0.1.8-3.fc26 libcomps: rationale: A dependency of python3-dnf ref: b6ea96bdc5f8d6cacb52d5e4af71330f5b163d2d - # librepo-1.7.20-5.fc26 + # libreport-2.9.1-2.fc26 libreport: - rationale: A dependency of dnf-conf - ref: b730895e1c6c071a493aad90d0b3967ad078e0f3 + rationale: Python bindings required by Anaconda. + ref: ea83325b231f64c575ea104bb698e9d43b80469a # python-iniparse-0.4-24.fc26 python-iniparse: rationale: A dependency of python3-dnf ref: 711272419db83ad02f66c3bb4a38e952d08777c2 + modulemd: + rationale: A dependency of dnf-2.6 + ref: 1ece9647232c1f419c1882c1762971653e56e3be + python-smartcols: + rationale: A dependency of dnf-2.6 + ref: 91d054e8cb03a0bb81500ab978b3f74ccc0aec78 + libdnf: + rationale: A dependency of dnf-2.6 + ref: 8a2c2ce0fe8899d18e8dfb88dd61fc0b13ab6616 From ccfa864a6f720aa457594585c0e8d01b92a78c2d Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 12 Jul 2017 17:20:39 +0200 Subject: [PATCH 3/4] filter libdnf-devel, python2-hawkey --- dnf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dnf.yaml b/dnf.yaml index 455b84a..555755c 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -38,6 +38,8 @@ data: drpmsync, python2-deltarpm, # libcomps python2-libcomps, + # libdnf + libdnf-devel, python2-hawkey, # libreport libreport, libreport, libreport-anaconda, libreport-centos, libreport-cli, libreport-compat, libreport-debuginfo, From 70251fde0c1db6dda393aa4e5443e203d1de7f0e Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 12 Jul 2017 17:47:07 +0200 Subject: [PATCH 4/4] drop libdnf, build it in brt instead --- dnf.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dnf.yaml b/dnf.yaml index 555755c..2774710 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -38,8 +38,6 @@ data: drpmsync, python2-deltarpm, # libcomps python2-libcomps, - # libdnf - libdnf-devel, python2-hawkey, # libreport libreport, libreport, libreport-anaconda, libreport-centos, libreport-cli, libreport-compat, libreport-debuginfo, @@ -83,6 +81,3 @@ data: python-smartcols: rationale: A dependency of dnf-2.6 ref: 91d054e8cb03a0bb81500ab978b3f74ccc0aec78 - libdnf: - rationale: A dependency of dnf-2.6 - ref: 8a2c2ce0fe8899d18e8dfb88dd61fc0b13ab6616