update-version

(cherry picked from commit 12a62e71a7423ce12a3dc2afee01b32f7bc72f74)
This commit is contained in:
xiexing01 2022-09-20 14:44:37 +08:00 committed by openeuler-sync-bot
parent dcf0d3f739
commit b3fc3b303f
2 changed files with 13 additions and 3 deletions

View File

@ -10,7 +10,7 @@
%global __provides_exclude_from ^%{_libdir}/%{name}/.*$ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
Name: hadoop Name: hadoop
Version: 3.3.3 Version: 3.3.4
Release: 1 Release: 1
Summary: A software platform for processing vast amounts of data Summary: A software platform for processing vast amounts of data
# The BSD license file is missing # The BSD license file is missing
@ -39,7 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel 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: cyrus-sasl-devel chrpath systemd protobuf2-compiler protobuf2-devel protobuf2-java protobuf2
BuildRequires: leveldbjni leveldb-java hawtjni-runtime gcc-c++ BuildRequires: leveldbjni leveldb-java hawtjni-runtime gcc-c++
BuildRequires: npm BuildRequires: npm chrpath
Requires: java-1.8.0-openjdk protobuf2-java apache-zookeeper Requires: java-1.8.0-openjdk protobuf2-java apache-zookeeper
%description %description
@ -754,10 +754,10 @@ pushd $basedir/share/%{name}/common
popd popd
pushd $basedir/share/%{name}/common/lib pushd $basedir/share/%{name}/common/lib
link_hadoop_jars %{buildroot}%{_datadir}/%{name}/common/lib link_hadoop_jars %{buildroot}%{_datadir}/%{name}/common/lib
\cp -r %{_builddir}/hadoop-%{version}-src/hadoop-dist/target/hadoop-%{version}/share/hadoop/common/lib/* %{buildroot}%{_datadir}/%{name}/common/lib
popd popd
# hdfs jar dependencies # hdfs jar dependencies
echo "----------------hdfs jar dependencies"
copy_dep_jars $hdfsdir/share/%{name}/hdfs/lib %{buildroot}%{_datadir}/%{name}/hdfs/lib copy_dep_jars $hdfsdir/share/%{name}/hdfs/lib %{buildroot}%{_datadir}/%{name}/hdfs/lib
%{__ln_s} %{_jnidir}/%{name}/%{name}-hdfs-bkjournal.jar %{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-client/target/hadoop-hdfs-client-%{version}.jar $hdfsdir/share/%{name}/hdfs
@ -767,6 +767,7 @@ cp -f hadoop-hdfs-project/%{name}-hdfs-nfs/target/hadoop-hdfs-nfs-%{version}.jar
cp -f hadoop-hdfs-project/%{name}-hdfs-rbf/target/hadoop-hdfs-rbf-%{version}.jar $hdfsdir/share/%{name}/hdfs cp -f hadoop-hdfs-project/%{name}-hdfs-rbf/target/hadoop-hdfs-rbf-%{version}.jar $hdfsdir/share/%{name}/hdfs
pushd $hdfsdir/share/%{name}/hdfs pushd $hdfsdir/share/%{name}/hdfs
link_hadoop_jars %{buildroot}%{_datadir}/%{name}/hdfs link_hadoop_jars %{buildroot}%{_datadir}/%{name}/hdfs
\cp -r %{_builddir}/hadoop-%{version}-src/hadoop-dist/target/hadoop-%{version}/share/hadoop/hdfs/lib %{buildroot}%{_datadir}/%{name}/hdfs/lib
popd popd
# httpfs # httpfs
@ -905,6 +906,9 @@ sed -i "s|{|%{_var}/log/hadoop-hdfs/*.audit\n{|" %{buildroot}%{_sysconfdir}/logr
# hdfs init script # hdfs init script
install -m 755 %{SOURCE8} %{buildroot}%{_sbindir} install -m 755 %{SOURCE8} %{buildroot}%{_sbindir}
chrpath -d %{buildroot}%{_bindir}/container-executor
chrpath -d %{buildroot}%{_bindir}/test-container-executor
%pretrans -p <lua> hdfs %pretrans -p <lua> hdfs
path = "%{_datadir}/%{name}/hdfs/webapps" path = "%{_datadir}/%{name}/hdfs/webapps"
st = posix.stat(path) st = posix.stat(path)
@ -1124,6 +1128,12 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
%changelog %changelog
* Tue Sep 20 2022 xiasenlin <xiasenlin1@huawei.com> - 3.3.4-1
- fix cve CVE-2021-25642
* Thu Sep 8 2022 xiasenlin <xiasenlin1@huawei.com> - 3.3.3-2
- add chrpath to solve check_rpath warning
* Thu Aug 11 2022 xiexing <xiexing4@hisilicon.com> - 3.3.3-1 * Thu Aug 11 2022 xiexing <xiexing4@hisilicon.com> - 3.3.3-1
- update version - update version