diff --git a/fix-ooziedb-command-not-found-jar-path.patch b/fix-ooziedb-command-not-found-jar-path.patch new file mode 100644 index 0000000..cf4fbb8 --- /dev/null +++ b/fix-ooziedb-command-not-found-jar-path.patch @@ -0,0 +1,44 @@ +From 98b847494d8f41e8c50e6222cf2b8c0657f0022c Mon Sep 17 00:00:00 2001 +From: lyn1001 +Date: Mon, 11 Oct 2021 11:05:57 +0800 +Subject: [PATCH] fix ooziedb command not found jar path + + +diff --git a/tools/src/main/bin/ooziedb.sh b/tools/src/main/bin/ooziedb.sh +index b9e38af..7b75e2b 100644 +--- a/tools/src/main/bin/ooziedb.sh ++++ b/tools/src/main/bin/ooziedb.sh +@@ -42,13 +42,13 @@ OOZIEDB_OPTS="${OOZIEDB_OPTS} -Doozie.data.dir=${OOZIE_DATA}"; + OOZIEDB_OPTS="${OOZIEDB_OPTS} -Dderby.stream.error.file=${OOZIE_LOG}/derby.log" + + #Create lib directory from war if lib doesn't exist +-if [ ! -d "${BASEDIR}/lib" ]; then +- mkdir ${BASEDIR}/lib +- unzip ${BASEDIR}/oozie.war WEB-INF/lib/*.jar -d ${BASEDIR}/lib > /dev/null +- mv ${BASEDIR}/lib/WEB-INF/lib/*.jar ${BASEDIR}/lib/ +- rmdir ${BASEDIR}/lib/WEB-INF/lib +- rmdir ${BASEDIR}/lib/WEB-INF +-fi ++#if [ ! -d "${BASEDIR}/lib" ]; then ++# mkdir ${BASEDIR}/lib ++# unzip ${BASEDIR}/oozie.war WEB-INF/lib/*.jar -d ${BASEDIR}/lib > /dev/null ++# mv ${BASEDIR}/lib/WEB-INF/lib/*.jar ${BASEDIR}/lib/ ++# rmdir ${BASEDIR}/lib/WEB-INF/lib ++# rmdir ${BASEDIR}/lib/WEB-INF ++#fi + + OOZIECPPATH="" + for i in "${BASEDIR}/libtools/"*.jar; do +@@ -60,6 +60,9 @@ done + for i in "${BASEDIR}/libext/"*.jar; do + OOZIECPPATH="${OOZIECPPATH}:$i" + done ++for i in "${BASEDIR}/embedded-oozie-server/webapp/WEB-INF/lib/"*.jar; do ++ OOZIECPPATH="${OOZIECPPATH}:$i" ++done + + + if test -z ${JAVA_HOME} +-- +2.23.0 + diff --git a/oozie.spec b/oozie.spec index b9114a4..05518ec 100644 --- a/oozie.spec +++ b/oozie.spec @@ -1,6 +1,6 @@ Name: oozie Version: 5.2.1 -Release: 2 +Release: 3 Summary: A work-flow scheduling system for Apache Hadoop License: Apache 2.0 URL: http://oozie.apache.org @@ -8,6 +8,7 @@ Source0: https://github.com/apache/%{name}/archive/refs/tags/release-%{versi Source1: fluent-job-api-target.tar.gz Source2: %{name}.logrotate Patch0000: fix-oozie-command-not-found-jar-path.patch +Patch0001: fix-ooziedb-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,8 +21,7 @@ web services %prep -%setup -qn %{name}-release-%{version} -%patch0 -p1 +%autosetup -n %{name}-release-%{version} -p1 tar xf %{SOURCE1} cp -arf target fluent-job/fluent-job-api/ @@ -172,6 +172,9 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} %attr(0775,root,tomcat) %dir %{_sysconfdir}/%{name}/tomcat/Catalina/localhost %changelog +* Sat Oct 9 2021 liyanan - 5.2.1-3 +- fix ooziedb command not found jar path + * Thu Sep 30 2021 liyanan - 5.2.1-2 - fix oozie command not found jar path