From 714d073bc09b41460879a52409f6a144226a77cd Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Sat, 11 Sep 2021 11:18:19 +0800
Subject: [PATCH] Change jar install path from libtools to libext

(cherry picked from commit a31b433a70028e604d362d8ccff76bbf5e5b729d)
---
 fix-oozie-command-not-found-jar-path.patch | 26 ++++++++++++++++++++++
 oozie.spec                                 |  9 ++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 fix-oozie-command-not-found-jar-path.patch

diff --git a/fix-oozie-command-not-found-jar-path.patch b/fix-oozie-command-not-found-jar-path.patch
new file mode 100644
index 0000000..4738270
--- /dev/null
+++ b/fix-oozie-command-not-found-jar-path.patch
@@ -0,0 +1,26 @@
+From 71ce2e135b97a50594cb36fa84f397e9f214b533 Mon Sep 17 00:00:00 2001
+From: caodongxia <315816521@qq.com>
+Date: Sat, 11 Sep 2021 11:41:23 +0800
+Subject: [PATCH] fix oozie command not found jar path
+
+---
+ client/src/main/bin/oozie | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/client/src/main/bin/oozie b/client/src/main/bin/oozie
+index b8db5ee..6c3593a 100644
+--- a/client/src/main/bin/oozie
++++ b/client/src/main/bin/oozie
+@@ -51,6 +51,9 @@ if [ ! -d "${BASEDIR}/lib" ]; then
+ fi
+ 
+ OOZIECPPATH=""
++for i in "${BASEDIR}/libtools/"*.jar; do
++  OOZIECPPATH="${OOZIECPPATH}:$i"
++done
+ for i in "${BASEDIR}/lib/"*.jar; do
+   OOZIECPPATH="${OOZIECPPATH}:$i"
+ done
+-- 
+2.27.0
+
diff --git a/oozie.spec b/oozie.spec
index 7360c49..9a3de72 100644
--- a/oozie.spec
+++ b/oozie.spec
@@ -1,12 +1,13 @@
 Name:        oozie
 Version:     5.2.1
-Release:     1
+Release:     2
 Summary:     A work-flow scheduling system for Apache Hadoop
 License:     Apache 2.0
 URL:         http://oozie.apache.org
 Source0:     https://github.com/apache/%{name}/archive/refs/tags/release-%{version}.tar.gz
 Source1:     fluent-job-api-target.tar.gz 
 Source2:     %{name}.logrotate
+Patch0000:   fix-oozie-command-not-found-jar-path.patch
 BuildArch:   noarch
 BuildRequires:   java-1.8.0-openjdk-devel maven xmvn xmvn-install gradle-local maven-local 
 Requires:     java-1.8.0-openjdk-devel hostname tomcat
@@ -20,6 +21,7 @@ web services
 
 %prep
 %setup -qn %{name}-release-%{version}  
+%patch0 -p1
 
 tar xf %{SOURCE1}
 cp -arf target   fluent-job/fluent-job-api/
@@ -30,7 +32,7 @@ rm -rf  target
 %build
 export LC_ALL=en_US.UTF-8
 
-mvn  clean package assembly:single -DskipTests 
+mvn  clean package assembly:single  -DskipTests 
 
 %install
 
@@ -170,5 +172,8 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 %attr(0775,root,tomcat) %dir %{_sysconfdir}/%{name}/tomcat/Catalina/localhost
 
 %changelog
+* Sat Sep 11 2021 caodongxia <caodongxia@huawei.com> - 5.2.1-2
+- fix oozie command not found jar path
+
 * Mon Jul 12 2021 liyanan <liyanan32@huawei.com> - 5.2.1-1
 - package init
-- 
Gitee