From 0000d30c797eeb486de818cbf0e8f2fa5d7be40f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 02 2022 07:09:06 +0000 Subject: import rhc-0.2.1-9.el8_6 --- diff --git a/SOURCES/0001-feat-default-config-file-location.patch b/SOURCES/0001-feat-default-config-file-location.patch index 07ab750..7afda51 100644 --- a/SOURCES/0001-feat-default-config-file-location.patch +++ b/SOURCES/0001-feat-default-config-file-location.patch @@ -22,7 +22,7 @@ fs.Var(&logLevel, "log-level", "log verbosity level (error (default), warn, info, debug, trace)") fs.Var(&allowPatterns, "allow-pattern", "regular expression pattern to allow package operations\n(can be specified multiple times)") - _ = fs.String("config", "", "path to `file` containing configuration values (optional)") -+ _ = fs.String("config", filepath.Join("etc", "rhc", "workers", fs.Name()+".toml"), "path to `file` containing configuration values (optional)") ++ _ = fs.String("config", filepath.Join("/", "etc", "rhc", "workers", "rhc-package-manager.toml"), "path to `file` containing configuration values (optional)") ff.Parse(fs, os.Args[1:], ff.WithEnvVarPrefix("YGG"), ff.WithConfigFileFlag("config"), ff.WithConfigFileParser(fftoml.Parser)) diff --git a/SPECS/rhc.spec b/SPECS/rhc.spec index 35dd18e..cefa963 100644 --- a/SPECS/rhc.spec +++ b/SPECS/rhc.spec @@ -8,7 +8,7 @@ Name: rhc Version: 0.2.1 -Release: 7%{?dist} +Release: 9%{?dist} Epoch: 1 Summary: rhc connects the system to Red Hat hosted services License: GPLv3 @@ -114,6 +114,12 @@ make %{makeflags} \ %changelog +* Fri Jun 3 2022 Link Dupont - 0.2.1-9 +- Correct default config file name (RHBZ#2084596) + +* Thu May 12 2022 Link Dupont - 0.2.1-8 +- Correct default config file path (RHBZ#2084596) + * Mon Mar 21 2022 Link Dupont - 0.2.1-7 - Use correct macro syntax for ldflags (RHBZ#2059690)