Hello community, here is the log from the commit of package microdnf for openSUSE:Factory checked in at 2020-12-09 22:10:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/microdnf (Old) and /work/SRC/openSUSE:Factory/.microdnf.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microdnf" Wed Dec 9 22:10:59 2020 rev:3 rq:853402 version:3.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/microdnf/microdnf.changes 2020-12-02 13:57:24.017749225 +0100 +++ /work/SRC/openSUSE:Factory/.microdnf.new.2328/microdnf.changes 2020-12-09 22:11:00.903042328 +0100 @@ -1,0 +2,11 @@ +Sun Dec 6 15:36:53 UTC 2020 - Neal Gompa <[email protected]> + +- Update to 3.6.0 + + Add support for setting allow_vendor_change + + Add support for setting a platform module ID +- Drop patches incorporated into this release + + Patch: 0001-Add-support-for-setting-allow_vendor_change.patch + + Patch: 0001-Add-support-for-setting-a-platform-module-ID.patch +- Add weak dependency for DNF configuration skeleton + +------------------------------------------------------------------- Old: ---- 0001-Add-support-for-setting-a-platform-module-ID.patch 0001-Add-support-for-setting-allow_vendor_change.patch microdnf-3.5.1.tar.gz New: ---- microdnf-3.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ microdnf.spec ++++++ --- /var/tmp/diff_new_pack.RlKki0/_old 2020-12-09 22:11:01.439042872 +0100 +++ /var/tmp/diff_new_pack.RlKki0/_new 2020-12-09 22:11:01.443042875 +0100 @@ -15,10 +15,10 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%global libdnf_version 0.55.0 +%global libdnf_version 0.55.2 Name: microdnf -Version: 3.5.1 +Version: 3.6.0 Release: 0 Summary: Lightweight implementation of DNF in C Group: System/Packages @@ -26,10 +26,6 @@ URL: https://github.com/rpm-software-management/microdnf Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Backports from upstream -Patch0001: 0001-Add-support-for-setting-allow_vendor_change.patch -Patch0002: 0001-Add-support-for-setting-a-platform-module-ID.patch - BuildRequires: gcc BuildRequires: meson >= 0.36.0 BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 @@ -39,6 +35,9 @@ BuildRequires: pkgconfig(smartcols) BuildRequires: help2man +# Attempt to install the DNF package manager configuration skeleton +Recommends: dnf-data + # Stricter dependency to keep things sane %requires_ge %(rpm -qf "$(readlink -f %{_libdir}/libdnf.so)") ++++++ microdnf-3.5.1.tar.gz -> microdnf-3.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microdnf-3.5.1/CMakeLists.txt new/microdnf-3.6.0/CMakeLists.txt --- old/microdnf-3.5.1/CMakeLists.txt 2020-11-16 13:50:52.000000000 +0100 +++ new/microdnf-3.6.0/CMakeLists.txt 2020-12-06 16:32:58.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 2.8.5) project (microdnf C) -set (PROJECT_VERSION 3.5.1) +set (PROJECT_VERSION 3.6.0) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -18,7 +18,7 @@ pkg_check_modules (GLIB REQUIRED glib-2.0>=2.44.0) pkg_check_modules (GOBJECT REQUIRED gobject-2.0>=2.44.0) pkg_check_modules (PEAS REQUIRED libpeas-1.0>=1.20.0) -pkg_check_modules (LIBDNF REQUIRED libdnf>=0.55.0) +pkg_check_modules (LIBDNF REQUIRED libdnf>=0.55.2) pkg_check_modules (SCOLS REQUIRED smartcols) set (PKG_LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/dnf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microdnf-3.5.1/dnf/dnf-main.c new/microdnf-3.6.0/dnf/dnf-main.c --- old/microdnf-3.5.1/dnf/dnf-main.c 2020-11-16 13:50:52.000000000 +0100 +++ new/microdnf-3.6.0/dnf/dnf-main.c 2020-12-06 16:32:58.000000000 +0100 @@ -30,6 +30,7 @@ typedef enum { ARG_DEFAULT, ARG_FALSE, ARG_TRUE } BoolArgs; static BoolArgs opt_install_weak_deps = ARG_DEFAULT; +static BoolArgs opt_allow_vendor_change = ARG_DEFAULT; static gboolean opt_yes = TRUE; static gboolean opt_nodocs = FALSE; static gboolean opt_best = FALSE; @@ -131,6 +132,20 @@ } } } + else if (strcmp (setopt[0], "module_platform_id") == 0) + { + const char *module_platform_id = setopt[1]; + if (module_platform_id[0] != '\0') + { + dnf_context_set_platform_module (ctx, module_platform_id); + } + else + { + local_error = g_error_new (G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, + "Empty value in: %s", value); + ret = FALSE; + } + } else if (strcmp (setopt[0], "cachedir") == 0) { cachedir_used = TRUE; @@ -165,6 +180,20 @@ ret = FALSE; } } + else if (strcmp (setopt[0], "allow_vendor_change") == 0) + { + const char *setopt_val = setopt[1]; + if (setopt_val[0] == '1' && setopt_val[1] == '\0') + opt_allow_vendor_change = ARG_TRUE; + else if (setopt_val[0] == '0' && setopt_val[1] == '\0') + opt_allow_vendor_change = ARG_FALSE; + else + { + local_error = g_error_new (G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, + "Invalid boolean value \"%s\" in: %s", setopt[1], value); + ret = FALSE; + } + } else if (strcmp (setopt[0], "reposdir") == 0) { reposdir_used = TRUE; @@ -212,7 +241,7 @@ { "refresh", '\0', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, &opt_refresh, "Set metadata as expired before running the command", NULL }, { "releasever", '\0', G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, process_global_option, "Override the value of $releasever in config and repo files", "RELEASEVER" }, { "setopt", '\0', G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, process_global_option, - "Override a configuration option (install_weak_deps=0/1, cachedir=<path>, reposdir=<path1>,<path2>,..., tsflags=nodocs/test, varsdir=<path1>,<path2>,...)", "<option>=<value>" }, + "Override a configuration option (install_weak_deps=0/1, allow_vendor_change=0/1, module_platform_id=<name:stream>, cachedir=<path>, reposdir=<path1>,<path2>,..., tsflags=nodocs/test, varsdir=<path1>,<path2>,...)", "<option>=<value>" }, { NULL } }; @@ -497,6 +526,11 @@ else if (opt_install_weak_deps == ARG_FALSE) dnf_context_set_install_weak_deps (FALSE); + if (opt_allow_vendor_change == ARG_TRUE) + dnf_context_set_allow_vendor_change (TRUE); + else if (opt_allow_vendor_change == ARG_FALSE) + dnf_context_set_allow_vendor_change (FALSE); + if (opt_best && opt_nobest) { error = g_error_new_literal(G_OPTION_ERROR, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microdnf-3.5.1/meson.build new/microdnf-3.6.0/meson.build --- old/microdnf-3.5.1/meson.build 2020-11-16 13:50:52.000000000 +0100 +++ new/microdnf-3.6.0/meson.build 2020-12-06 16:32:58.000000000 +0100 @@ -1,5 +1,5 @@ project('microdnf', 'c', - version : '3.5.1', + version : '3.6.0', license : 'GPL-2.0+', default_options : [ 'b_asneeded=True', @@ -32,7 +32,7 @@ glib = dependency('glib-2.0', version : '>=2.44.0') gobject = dependency('gobject-2.0', version : '>=2.44.0') libpeas = dependency('libpeas-1.0', version : '>=1.20.0') -libdnf = dependency('libdnf', version : '>=0.55.0') +libdnf = dependency('libdnf', version : '>=0.55.2') scols = dependency('smartcols') pkg_libdir = join_paths(get_option('prefix'), get_option('libdir'), 'dnf') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microdnf-3.5.1/microdnf.spec new/microdnf-3.6.0/microdnf.spec --- old/microdnf-3.5.1/microdnf.spec 2020-11-16 13:50:52.000000000 +0100 +++ new/microdnf-3.6.0/microdnf.spec 2020-12-06 16:32:58.000000000 +0100 @@ -1,9 +1,9 @@ -%global libdnf_version 0.55.0 +%global libdnf_version 0.55.2 Name: microdnf -Version: 3.5.1 +Version: 3.6.0 Release: 1%{?dist} -Summary: Minimal C implementation of DNF +Summary: Lightweight implementation of DNF in C License: GPLv2+ URL: https://github.com/rpm-software-management/microdnf @@ -19,19 +19,17 @@ BuildRequires: help2man Requires: libdnf%{?_isa} >= %{libdnf_version} +# Ensure DNF package manager configuration skeleton is installed +Requires: dnf-data %description -Micro DNF is a very minimal C implementation of DNF's install, upgrade, -remove, repolist, and clean commands, designed to be used for doing simple -packaging actions in containers when you don't need full-blown DNF and -you want the tiniest useful containers possible. +Micro DNF is a lightweight C implementation of DNF, designed to be used +for doing simple packaging actions when you don't need full-blown DNF and +you want the tiniest useful environments possible. That is, you don't want any interpreter stack and you want the most minimal environment possible so you can build up to exactly what you need. -This is not a substitute for DNF for real systems, and many of DNF's -capabilities are intentionally not implemented in Micro DNF. - %prep %autosetup -p1 _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
