update rubygem-fluentd to 1.14.5

(cherry picked from commit f1a58ffa1e904e02211e9967fa3d766eb6eddb0b)
This commit is contained in:
YangYunYi 2022-03-01 21:17:49 +08:00 committed by openeuler-sync-bot
parent 1d730d7b27
commit f7e689ee7f
4 changed files with 8 additions and 31 deletions

View File

@ -1,24 +0,0 @@
From e57a32ff5abf6545911acb6af1d6868db820f82c Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Fri, 15 Oct 2021 11:30:48 +0800
Subject: [PATCH] fix subcommand formats usage
---
lib/fluent/command/binlog_reader.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/fluent/command/binlog_reader.rb b/lib/fluent/command/binlog_reader.rb
index f77c47c..7054679 100644
--- a/lib/fluent/command/binlog_reader.rb
+++ b/lib/fluent/command/binlog_reader.rb
@@ -217,6 +217,7 @@ module BinlogReaderCommand
class Formats < Base
def initialize(argv = ARGV)
super
+ @opt_parser.banner = "Usage: fluent-binlog-reader #{self.class.to_s.split('::').last.downcase} [options]"
parse_options!
end
--
2.23.0

BIN
fluentd-1.14.5.gem Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,16 +1,14 @@
%global _empty_manifest_terminate_build 0 %global _empty_manifest_terminate_build 0
%global gem_name fluentd %global gem_name fluentd
Name: rubygem-fluentd Name: rubygem-fluentd
Version: 1.3.3 Version: 1.14.5
Release: 2 Release: 1
Summary: Fluentd event collector Summary: Fluentd event collector
License: Apache-2.0 License: Apache-2.0
URL: https://www.fluentd.org/ URL: https://www.fluentd.org/
Source0: https://rubygems.org/gems/fluentd-1.3.3.gem Source0: https://rubygems.org/gems/fluentd-1.14.5.gem
BuildArch: noarch BuildArch: noarch
Patch0001: fix-subcommand-formats-usage.patch
BuildRequires: rubygem-bundler BuildRequires: rubygem-bundler
BuildRequires: rubygem-cool.io BuildRequires: rubygem-cool.io
BuildRequires: rubygem(http_parser.rb) BuildRequires: rubygem(http_parser.rb)
@ -41,7 +39,7 @@ BuildArch: noarch
Fluentd is an open source data collector designed to scale and simplify log management. It can collect, process and ship many kinds of data in near real-time. Fluentd is an open source data collector designed to scale and simplify log management. It can collect, process and ship many kinds of data in near real-time.
%prep %prep
%autosetup -n fluentd-1.3.3 -p1 %autosetup -n fluentd-1.14.5
gem spec %{SOURCE0} -l --ruby > fluentd.gemspec gem spec %{SOURCE0} -l --ruby > fluentd.gemspec
sed -i '/http_parser.rb/s/< 0.7.0/<= 0.7.0/g' fluentd.gemspec sed -i '/http_parser.rb/s/< 0.7.0/<= 0.7.0/g' fluentd.gemspec
sed -i '/tzinfo/s/~> 1.0/>= 1.0/g' fluentd.gemspec sed -i '/tzinfo/s/~> 1.0/>= 1.0/g' fluentd.gemspec
@ -69,7 +67,7 @@ fi
cp -a .%{gem_extdir_mri}/gem.build_complete %{buildroot}%{gem_extdir_mri}/ cp -a .%{gem_extdir_mri}/gem.build_complete %{buildroot}%{gem_extdir_mri}/
rm -rf %{buildroot}%{gem_instdir}/ext/ rm -rf %{buildroot}%{gem_instdir}/ext/
fi fi
rm -rf %{buildroot}%{gem_instdir}/{.github,.gitignore,.travis.yml} rm -rf %{buildroot}%{gem_instdir}/{.github,.gitignore,.travis.yml,.deepsource.toml,.drone.yml,.gitlab-ci.yml}
pushd %{buildroot} pushd %{buildroot}
touch filelist.lst touch filelist.lst
if [ -d %{buildroot}%{_bindir} ]; then if [ -d %{buildroot}%{_bindir} ]; then
@ -88,6 +86,9 @@ mv %{buildroot}/filelist.lst .
%{gem_docdir}/* %{gem_docdir}/*
%changelog %changelog
* Fri Feb 25 2022 Yangyunyi <yangyunyi2@huawei.com> - 1.14.5-1
- Update fluentd to 1.14.5
* Fri Oct 15 2021 lingsheng <lingsheng@huawei.com> - 1.3.3-2 * Fri Oct 15 2021 lingsheng <lingsheng@huawei.com> - 1.3.3-2
- fix subcommand formats usage - fix subcommand formats usage