X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Ffluentd.spec;h=8ccdd154a5f4f1a1e99ec64d87c02a379ce925a9;hb=f0e0ff7d87fca007a03f476ce8a8a5d11d431177;hp=6af5a31a852a6cb6cb690a621429b17b82446f44;hpb=63dde83d6d87b035103e465d4b663c47209a3f63;p=ta%2Fcaas-logging.git

diff --git a/SPECS/fluentd.spec b/SPECS/fluentd.spec
index 6af5a31..8ccdd15 100644
--- a/SPECS/fluentd.spec
+++ b/SPECS/fluentd.spec
@@ -14,8 +14,8 @@
 
 %define COMPONENT fluentd
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.5.2
-%define RPM_MINOR_VERSION 1
+%define RPM_MAJOR_VERSION 1.6.3
+%define RPM_MINOR_VERSION 0
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 
 Name:           %{RPM_NAME}
@@ -24,7 +24,7 @@ Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service Fluentd component
 License:        %{_platform_license} and MIT license and Apache License and BSD 3-clause New or Revised License and Ruby License and BSD and Mozilla Public License and BSD 3-clause New or Revised License
 URL:            https://github.com/fluent/fluentd
-BuildArch:      x86_64
+BuildArch:      %{_arch}
 Vendor:         %{_platform_vendor} and fluent/fluentd unmodified
 Source0:        %{name}-%{version}.tar.gz
 
@@ -62,27 +62,10 @@ docker rmi -f %{COMPONENT}:%{IMAGE_TAG}
 mkdir -p %{buildroot}/%{_caas_container_tar_path}/
 rsync -av %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar %{buildroot}/%{_caas_container_tar_path}/
 
-mkdir -p %{buildroot}/%{_playbooks_path}/
-rsync -av ansible/playbooks/fluentd.yaml %{buildroot}/%{_playbooks_path}/
-
-mkdir -p %{buildroot}/%{_roles_path}/
-rsync -av ansible/roles/fluentd %{buildroot}/%{_roles_path}/
-
 %files
 %{_caas_container_tar_path}/%{COMPONENT}:%{IMAGE_TAG}.tar
-%{_playbooks_path}/fluentd.yaml
-%{_roles_path}/fluentd
 
 %preun
-
 %post
-mkdir -p %{_postconfig_path}/
-ln -sf %{_playbooks_path}/fluentd.yaml %{_postconfig_path}/
-
-%postun
-if [ $1 -eq 0 ]; then
-    rm -f %{_postconfig_path}/fluentd.yaml
-fi
-
 %clean
 rm -rf ${buildroot}