fix

apache · Apr 7, 2024 · bbeebdc · bbeebdc
1 parent 9cd2f0e
commit bbeebdc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/bigtop-packages/src/common/knox/install_knox.sh b/bigtop-packages/src/common/knox/install_knox.sh
@@ -100,7 +100,6 @@ install -d -m 0755 $PREFIX/$NP_VAR_LIB_KNOX_DATA
 install -d -m 0755 $PREFIX/$ETC_KNOX/conf.dist
 install -d -m 0755 $PREFIX/$LIB_DIR/samples
 install -d -m 0755 $PREFIX/$LIB_DIR/templates
-install -d -m 0755 $PREFIX/$LIB_DIR/native
 install -d -m 0755 $PREFIX/$RUN_DIR
 install -d -m 0755 $PREFIX/$LOG_DIR
 
@@ -115,7 +114,6 @@ cp -a ${TMP_DIR}/knox-*/samples/* ${PREFIX}/${LIB_DIR}/samples/
 cp -a ${TMP_DIR}/knox-*/templates/* ${PREFIX}/${LIB_DIR}/templates/
 cp -ra ${TMP_DIR}/knox-*/data/* ${PREFIX}/${NP_VAR_LIB_KNOX_DATA}
 cp -ra ${TMP_DIR}/knox-*/conf/* ${PREFIX}/${ETC_KNOX}/conf.dist
-cp ${TMP_DIR}/{LICENSE,README} ${PREFIX}/${LIB_DIR}/
 
 ln -s $NP_ETC_KNOX/conf $PREFIX/$LIB_DIR/conf
 ln -s $NP_VAR_LIB_KNOX_DATA $PREFIX/$LIB_DIR/data
@@ -125,8 +123,8 @@ ln -s $RUN_DIR $PREFIX/$LIB_DIR/pids
 rm -rf $TMP_DIR
 
 # Copy in the /usr/bin/knox wrapper
-install -d -m 0755 $PREFIX/usr/bin
-cat > $PREFIX/usr/bin/gateway <<EOF
+install -d -m 0755 $PREFIX/$BIN_DIR
+cat > $PREFIX/$BIN_DIR/gateway <<EOF
 #!/bin/bash
 
 # Autodetect JAVA_HOME if not defined

diff --git a/bigtop-packages/src/rpm/knox/SPECS/knox.spec b/bigtop-packages/src/rpm/knox/SPECS/knox.spec
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 %define knox_name knox
-
+%define knox_pkg_name knox%{pkg_name_suffix}
 %define etc_default %{parent_dir}/etc/default
 %define usr_lib_knox %{parent_dir}/usr/lib/%{knox_name}
 %define etc_knox %{parent_dir}/etc/%{knox_name}
@@ -27,17 +27,17 @@
 
 %define knox_services gateway
 
-Name: knox
+Name: %{knox_pkg_name}
 Version: %{knox_version}
 Release: %{knox_release}
 BuildArch: noarch
 Summary: Knox Gateway
 URL: https://knox.apache.org/
 Group: Development/Libraries
 License: ASL 2.0
-Source0: %{name}-%{knox_base_version}.zip
+Source0: %{knox_name}-%{knox_base_version}.zip
 Source1: do-component-build
-Source2: install_%{name}.sh
+Source2: install_%{knox_name}.sh
 Source3: knox-gateway.svc
 Source4: bigtop.bom
 Source6: init.d.tmpl
@@ -92,7 +92,7 @@ Requires: /lib/lsb/init-functions
 %__rm -rf $RPM_BUILD_ROOT
 
 %prep
-%setup -n %{name}-%{version}
+%setup -n %{knox_name}-%{version}
 #BIGTOP_PATCH_COMMANDS
 
 %build
@@ -112,41 +112,46 @@ bash -x %{SOURCE2} \
 for service in %{knox_services}
 do
   # Install init script
-  initd_script=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-${service}
-  bash %{SOURCE6} $RPM_SOURCE_DIR/%{name}-${service}.svc rpm $initd_script
+  initd_script=$RPM_BUILD_ROOT/%{initd_dir}/%{knox_name}-${service}
+  bash %{SOURCE6} $RPM_SOURCE_DIR/%{knox_name}-${service}.svc rpm $initd_script
 done
 
 
 %pre
 for service in %{knox_services}; do
-  /sbin/service %{name}-${service} status > /dev/null 2>&1
+  /sbin/service %{knox_name}-${service} status > /dev/null 2>&1
   if [ $? -eq 0 ]; then
-    /sbin/service %{name}-${service} stop > /dev/null 2>&1
+    /sbin/service %{knox_name}-${service} stop > /dev/null 2>&1
   fi
-  chkconfig --del %{name}-${service}
+  chkconfig --del %{knox_name}-${service}
 done
 
 getent group knox >/dev/null || groupadd -r knox
 getent passwd knox >/dev/null || useradd -c "Knox" -s /sbin/nologin -g knox -r -d %{usr_lib_knox} knox 2> /dev/null || :
 
 %post
 for service in %{knox_services}; do
-  chkconfig --add %{name}-${service}
+  chkconfig --add %{knox_name}-${service}
 done
 %{alternatives_cmd} --install %{np_etc_knox}/conf %{knox_name}-conf %{etc_knox}/conf.dist 30
 
+%preun
+if [ "$1" = 0 ]; then
+  %{alternatives_cmd} --remove %{knox_name}-conf %{etc_knox}/conf.dist || :
+fi
 
 %postun
 for service in %{knox_services}; do
   if [ $1 -ge 1 ]; then
-    service %{name}-${service} condrestart >/dev/null 2>&1
+    service %{knox_name}-${service} condrestart >/dev/null 2>&1
   fi
 done
 
 %files
 %defattr(-,root,root)
 %attr(0755,knox,knox) %config(noreplace) %{np_etc_knox}
-%attr(0755,knox,knox) %config(noreplace) %{initd_dir}/%{name}-gateway
+%config(noreplace) %{etc_knox}/conf.dist
+%attr(0755,knox,knox) %config(noreplace) %{initd_dir}/%{knox_name}-gateway
 %dir %{_sysconfdir}/%{knox_name}
 
 %attr(0755,knox,knox) %{np_var_log_knox}
@@ -160,7 +165,6 @@ done
 %{usr_lib_knox}/bin
 %{usr_lib_knox}/dep
 %{usr_lib_knox}/lib
-%{usr_lib_knox}/native
 %{usr_lib_knox}/samples
 %{usr_lib_knox}/templates