diff --git a/fix-subcommand-formats-usage.patch b/fix-subcommand-formats-usage.patch deleted file mode 100644 index 59b33c15e30b6aa8b1b63019e9deb6a1ef3f7e15..0000000000000000000000000000000000000000 --- a/fix-subcommand-formats-usage.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e57a32ff5abf6545911acb6af1d6868db820f82c Mon Sep 17 00:00:00 2001 -From: lingsheng -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 - diff --git a/fluentd-1.14.5.gem b/fluentd-1.14.5.gem new file mode 100644 index 0000000000000000000000000000000000000000..78ee01c910ee714adb82fce7d9c7984494825663 Binary files /dev/null and b/fluentd-1.14.5.gem differ diff --git a/fluentd-1.3.3.gem b/fluentd-1.3.3.gem deleted file mode 100644 index b7c8467db0e6e62b2679d771939703564850f225..0000000000000000000000000000000000000000 Binary files a/fluentd-1.3.3.gem and /dev/null differ diff --git a/rubygem-fluent.spec b/rubygem-fluent.spec index 09725982204c0643fc310e57912fcf007da42155..4c8ee72775a54f9fbf71bb66632931b7cb909f8d 100644 --- a/rubygem-fluent.spec +++ b/rubygem-fluent.spec @@ -1,16 +1,14 @@ %global _empty_manifest_terminate_build 0 %global gem_name fluentd Name: rubygem-fluentd -Version: 1.3.3 -Release: 2 +Version: 1.14.5 +Release: 1 Summary: Fluentd event collector License: Apache-2.0 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 -Patch0001: fix-subcommand-formats-usage.patch - BuildRequires: rubygem-bundler BuildRequires: rubygem-cool.io 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. %prep -%autosetup -n fluentd-1.3.3 -p1 +%autosetup -n fluentd-1.14.5 gem spec %{SOURCE0} -l --ruby > 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 @@ -69,7 +67,7 @@ fi cp -a .%{gem_extdir_mri}/gem.build_complete %{buildroot}%{gem_extdir_mri}/ rm -rf %{buildroot}%{gem_instdir}/ext/ 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} touch filelist.lst if [ -d %{buildroot}%{_bindir} ]; then @@ -88,6 +86,9 @@ mv %{buildroot}/filelist.lst . %{gem_docdir}/* %changelog +* Fri Feb 25 2022 Yangyunyi - 1.14.5-1 +- Update fluentd to 1.14.5 + * Fri Oct 15 2021 lingsheng - 1.3.3-2 - fix subcommand formats usage