diff --git a/hadoop-hdfs.service.template b/hadoop-hdfs.service.template
index bca5c5f859619c9127d81a827ed1e0cd618d5d3e..6a29e942dee212a54d1394abf64e2c4d4c6c5f94 100644
--- a/hadoop-hdfs.service.template
+++ b/hadoop-hdfs.service.template
@@ -11,7 +11,7 @@ ExecStart=/usr/sbin/hadoop-daemon.sh start DAEMON
 ExecStop=/usr/sbin/hadoop-daemon.sh stop DAEMON
 User=hdfs
 Group=hadoop
-PIDFile=/var/run/hadoop-hdfs/hadoop-hdfs-DAEMON.pid
+PIDFile=/run/hadoop-hdfs/hadoop-hdfs-DAEMON.pid
 LimitNOFILE=32768
 LimitNPROC=65536
 
diff --git a/hadoop-mapreduce.service.template b/hadoop-mapreduce.service.template
index fb9080427e9d0743ffadc58b79b02f6e494edf97..61094798f7434151e2161d022460bb5b3981c5e8 100644
--- a/hadoop-mapreduce.service.template
+++ b/hadoop-mapreduce.service.template
@@ -11,7 +11,7 @@ ExecStart=/usr/sbin/mr-jobhistory-daemon.sh start DAEMON
 ExecStop=/usr/sbin/mr-jobhistory-daemon.sh stop DAEMON
 User=mapred
 Group=hadoop
-PIDFile=/var/run/hadoop-mapreduce/mapred-mapred-DAEMON.pid
+PIDFile=/run/hadoop-mapreduce/hadoop-mapred-DAEMON.pid
 LimitNOFILE=32768
 LimitNPROC=65536
 
diff --git a/hadoop-yarn.service.template b/hadoop-yarn.service.template
index 00e53f4fc31f9d5baa7ef72014a4b2b441f5855f..603623d9273ff284a50cd74369b1bd3fc62adea9 100644
--- a/hadoop-yarn.service.template
+++ b/hadoop-yarn.service.template
@@ -11,7 +11,7 @@ ExecStart=/usr/sbin/yarn-daemon.sh start DAEMON
 ExecStop=/usr/sbin/yarn-daemon.sh stop DAEMON
 User=yarn
 Group=hadoop
-PIDFile=/var/run/hadoop-yarn/yarn-yarn-DAEMON.pid
+PIDFile=/run/hadoop-yarn/hadoop-yarn-DAEMON.pid
 LimitNOFILE=32768
 LimitNPROC=65536
 
diff --git a/hadoop.spec b/hadoop.spec
index e15e187b93030da36700cbb7dc37a372592ea45a..3a135d2aef1f57d94dff382c2da2b42e8d1473f8 100644
--- a/hadoop.spec
+++ b/hadoop.spec
@@ -8,10 +8,10 @@
 # Filter out undesired provides and requires
 %global __requires_exclude_from ^%{_libdir}/%{name}/libhadoop.so$
 %global __provides_exclude_from ^%{_libdir}/%{name}/.*$
-
+%define _binaries_in_noarch_packages_terminate_build 0
 Name:   hadoop
 Version: 3.2.1
-Release: 5
+Release: 6
 Summary: A software platform for processing vast amounts of data
 # The BSD license file is missing
 # https://issues.apache.org/jira/browse/HADOOP-9849
@@ -35,6 +35,7 @@ Source13: %{name}-yarn-site.xml
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel 
 BuildRequires: cyrus-sasl-devel chrpath systemd protobuf2-compiler protobuf2-devel protobuf2-java protobuf2
+BuildRequires: leveldbjni leveldb-java hawtjni-runtime
 Requires: java-1.8.0-openjdk protobuf2-java apache-zookeeper
 
 %description
@@ -84,6 +85,7 @@ Requires: javamail
 Requires: jettison
 Requires: jetty8
 Requires: jsr-311
+Requires: leveldb
 Requires: mockito
 Requires: objectweb-asm
 Requires: objenesis
@@ -226,6 +228,7 @@ offering local computation and storage.
 This package contains test related resources for Apache Hadoop.
 
 %package yarn
+BuildArch: noarch
 Summary: Apache Hadoop YARN
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-mapreduce = %{version}-%{release}
@@ -260,6 +263,19 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
 
 %prep
 %autosetup -p1 -n %{name}-%{version}-src
+mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar 
+mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar
+mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar
+mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchmark -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-benchmark.jar
+mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar
+mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar
+
+%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-hdfs-project/hadoop-hdfs
+%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy 
+%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice
+%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common
+%pom_add_dep org.fusesource.leveldbjni:leveldbjni:1.8 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server
+%pom_add_dep org.fusesource.hawtjni:hawtjni-runtime:1.16 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice
 
 %pom_disable_module hadoop-minikdc hadoop-common-project
 %pom_disable_module hadoop-pipes hadoop-tools
@@ -728,7 +744,6 @@ install -pm 644 hadoop-project-dist/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{na
 
 # client jar depenencies
 copy_dep_jars hadoop-client-modules/%{name}-client/target/%{name}-client-%{hadoop_version}/share/%{name}/client/lib %{buildroot}%{_datadir}/%{name}/client/lib
-%{_bindir}/xmvn-subst %{buildroot}%{_datadir}/%{name}/client/lib
 pushd  hadoop-client-modules/%{name}-client/target/%{name}-client-%{hadoop_version}/share/%{name}/client/lib
   link_hadoop_jars %{buildroot}%{_datadir}/%{name}/client/lib
 popd
@@ -741,9 +756,9 @@ popd
 
 # common jar depenencies
 copy_dep_jars $basedir/share/%{name}/common/lib %{buildroot}%{_datadir}/%{name}/common/lib
-%{_bindir}/xmvn-subst %{buildroot}%{_datadir}/%{name}/common/lib
 cp -f hadoop-common-project/%{name}-kms/target/hadoop-kms-%{version}.jar $basedir/share/%{name}/common
 cp -f hadoop-common-project/%{name}-nfs/target/hadoop-nfs-%{version}.jar $basedir/share/%{name}/common 
+cp -f hadoop-common-project/%{name}-auth/target/hadoop-auth-%{version}.jar $basedir/share/%{name}/common
 pushd $basedir/share/%{name}/common
   link_hadoop_jars %{buildroot}%{_datadir}/%{name}/common
 popd
@@ -753,7 +768,6 @@ popd
 
 # hdfs jar dependencies
 copy_dep_jars $hdfsdir/share/%{name}/hdfs/lib %{buildroot}%{_datadir}/%{name}/hdfs/lib
-%{_bindir}/xmvn-subst %{buildroot}%{_datadir}/%{name}/hdfs/lib
 %{__ln_s} %{_jnidir}/%{name}/%{name}-hdfs-bkjournal.jar %{buildroot}%{_datadir}/%{name}/hdfs/lib
 cp -f hadoop-hdfs-project/%{name}-hdfs-client/target/hadoop-hdfs-client-%{version}.jar $hdfsdir/share/%{name}/hdfs
 cp -f hadoop-hdfs-project/%{name}-hdfs-httpfs/target/hadoop-hdfs-httpfs-%{version}.jar $hdfsdir/share/%{name}/hdfs
@@ -802,7 +816,6 @@ cp %{SOURCE5} %{buildroot}%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/META
 # Remove the jars included in the webapp and create symlinks
 rm -f %{buildroot}%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/tools*.jar
 rm -f %{buildroot}%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/tomcat-*.jar
-%{_bindir}/xmvn-subst %{buildroot}%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib
 
 pushd %{buildroot}%{_datadir}/%{name}/httpfs/tomcat
   %{__ln_s} %{_datadir}/tomcat/bin bin
@@ -816,7 +829,6 @@ popd
 # mapreduce jar dependencies
 mrdir='%{name}-mapreduce-project/target/%{name}-mapreduce-%{hadoop_version}'
 copy_dep_jars $mrdir/share/%{name}/mapreduce/lib %{buildroot}%{_datadir}/%{name}/mapreduce/lib
-%{_bindir}/xmvn-subst %{buildroot}%{_datadir}/%{name}/mapreduce/lib
 %{__ln_s} %{_javadir}/%{name}/%{name}-annotations.jar %{buildroot}%{_datadir}/%{name}/mapreduce/lib
 cp -f hadoop-mapreduce-project/%{name}-mapreduce-client/%{name}-mapreduce-client-nativetask/target/hadoop-mapreduce-client-nativetask-%{version}.jar $mrdir/share/%{name}/mapreduce
 cp -f hadoop-mapreduce-project/%{name}-mapreduce-client/%{name}-mapreduce-client-uploader/target/hadoop-mapreduce-client-uploader-%{version}.jar $mrdir/share/%{name}/mapreduce
@@ -828,7 +840,6 @@ popd
 # yarn jar dependencies
 yarndir='%{name}-yarn-project/target/%{name}-yarn-project-%{hadoop_version}'
 copy_dep_jars $yarndir/share/%{name}/yarn/lib %{buildroot}%{_datadir}/%{name}/yarn/lib
-%{_bindir}/xmvn-subst %{buildroot}%{_datadir}/%{name}/yarn/lib
 %{__ln_s} %{_javadir}/%{name}/%{name}-annotations.jar %{buildroot}%{_datadir}/%{name}/yarn/lib
 cp -f hadoop-yarn-project/%{name}-yarn/%{name}-yarn-server/%{name}-yarn-server-nodemanager/target/hadoop-yarn-server-nodemanager-%{version}.jar $yarndir/share/%{name}/yarn
 cp -f hadoop-yarn-project/%{name}-yarn/%{name}-yarn-server/%{name}-yarn-server-router/target/hadoop-yarn-server-router-%{version}.jar $yarndir/share/%{name}/yarn
@@ -1010,6 +1021,7 @@ fi
 %{_datadir}/%{name}/common/lib
 %{_datadir}/%{name}/common/hadoop-kms.jar
 %{_datadir}/%{name}/common/hadoop-nfs.jar
+%{_datadir}/%{name}/common/hadoop-auth.jar
 %{_libexecdir}/%{name}-config.sh
 %{_libexecdir}/%{name}-layout.sh
 
@@ -1122,6 +1134,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
 
 %changelog
+* Fri Apr 16 2021 Ge Wang <wangge20@huawei.com> -3.2.1-6
+- Build with local leveldbjni package instead of package in remote repository
+
 * Thu Apr 08 2021 Ge Wang <wangge20@huawei.com> - 3.2.1-5
 - Add hadoop-yarn-server-timelineservice.jar to rpm package