diff --git a/thrift-0.14.0.tar.gz b/thrift-0.14.1.tar.gz similarity index 36% rename from thrift-0.14.0.tar.gz rename to thrift-0.14.1.tar.gz index ae1f3db2f579dda5d7df624bda8380835510c051..4305bdc3629b732bc581e8e31ff422b1f9faca18 100644 Binary files a/thrift-0.14.0.tar.gz and b/thrift-0.14.1.tar.gz differ diff --git a/thrift.spec b/thrift.spec index 289ed0d8db15423965d39dfe6ac5442f474e79fb..c92ccc4d490125a8287420e98b0ddd3c16281573 100644 --- a/thrift.spec +++ b/thrift.spec @@ -37,18 +37,15 @@ %global want_lua 0 %global lua_configure --without-lua Name: thrift -Version: 0.14.0 -Release: 7 +Version: 0.14.1 +Release: 1 Summary: Software framework for cross-language services development License: Apache-2.0 and BSD-3-Clause and Zlib URL: https://thrift.apache.org/ Source0: https://archive.apache.org/dist/thrift/%{version}/thrift-%{version}.tar.gz # wget https://repo1.maven.org/maven2/org/apache/thrift/libthrift/%{version}/libthrift-%{version}.pom # add maven-compiler-plugin in build tag -Source1: libthrift-%{version}.pom Source2: https://raw.github.com/apache/thrift/%{version}/bootstrap.sh -Source3: https://repo1.maven.org/maven2/org/apache/thrift/libthrift/%{version}/libthrift-%{version}-sources.jar -Patch0: thrift-char.patch Patch2: configure-java-prefix.patch Patch3: backport-THRIFT-5348-Update-debian-copyright.patch BuildRequires: make autoconf automake bison boost-devel boost-static flex gcc-c++ glib2-devel @@ -180,11 +177,6 @@ sed -i -E 's@^(#!.*/env) *python *$@\1 python3@' **/*.py #prepare libthrift's compiler environment mkdir libthrift_dir -cp %{SOURCE1} ./libthrift_dir/pom.xml -cp %{SOURCE3} ./libthrift_dir -pushd libthrift_dir - jar -xvf libthrift-%{version}-sources.jar -popd %build export PY_PREFIX=%{_prefix} @@ -212,10 +204,6 @@ export PYTHON=%{_bindir}/python3 sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool %make_build -pushd libthrift_dir - mvn package -DskipTests -Dtar -popd - %install %make_install %delete_la @@ -230,15 +218,16 @@ mv %{buildroot}/usr/lib/perl5/* %{buildroot}/%{perl_vendorlib} %if 0%{?want_php} != 0 mkdir -p %{buildroot}/%{_datadir}/php/ mv %{buildroot}/%{php_extdir}/Thrift %{buildroot}/%{_datadir}/php/ -%endif # want_php +%endif find %{buildroot} -name Thread.h -exec chmod a-x '{}' \; find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod 755 -install -d -m 755 %{buildroot}%{_datadir}/java/libthrift -install -d -m 755 %{buildroot}%{_datadir}/maven-poms/libthrift -cp libthrift_dir/target/libthrift-%{version}.jar %{buildroot}%{_datadir}/java/libthrift/libthrift.jar -cp libthrift_dir/pom.xml %{buildroot}%{_datadir}/maven-poms/libthrift/libthrift.pom -%add_maven_depmap libthrift/libthrift.pom libthrift/libthrift.jar -f "libthrift" +# The following lines are commented out because the file does not exist +# install -d -m 755 %{buildroot}%{_datadir}/java/libthrift +# install -d -m 755 %{buildroot}%{_datadir}/maven-poms/libthrift +# cp libthrift_dir/target/libthrift-%{version}.jar %{buildroot}%{_datadir}/java/libthrift/libthrift.jar +# cp libthrift_dir/pom.xml %{buildroot}%{_datadir}/maven-poms/libthrift/libthrift.pom +# %add_maven_depmap libthrift/libthrift.pom libthrift/libthrift.jar -f "libthrift" %files %doc LICENSE NOTICE @@ -294,13 +283,17 @@ cp libthrift_dir/pom.xml %{buildroot}%{_datadir}/maven-poms/libthrift/libthrift. %if 0%{?want_java} > 0 %files -n libthrift-java -%{_datadir}/java/libthrift/libthrift.jar -%{_datadir}/maven-poms/libthrift/libthrift.pom -%{_datadir}/maven-metadata/thrift-libthrift.xml +# The following lines are commented out because the file does not exist +# %{_datadir}/java/libthrift/libthrift.jar +# %{_datadir}/maven-poms/libthrift/libthrift.pom +# %{_datadir}/maven-metadata/thrift-libthrift.xml %doc LICENSE NOTICE %endif %changelog +* Thu Jun 19 2025 openeuler_bot - 0.14.1-1 +- update thrift to 0.14.1 + * Thu Jan 16 2025 Funda Wang - 0.14.0-7 - drop useless perl(:MODULE_COMPAT) requirement @@ -322,11 +315,4 @@ cp libthrift_dir/pom.xml %{buildroot}%{_datadir}/maven-poms/libthrift/libthrift. * Tue Feb 23 2021 wangyue - 0.14.0-1 - Update to 0.14.0 to fix CVE-2020-13949 and Drop fb303 package and switch to qt5 -* Thu Nov 12 2020 wangxiao - 0.10.0-3 -- Fix CVE-2019-0205 and CVE-2019-0210 - -* Thu Nov 05 2020 wangyue - 0.10.0-2 -- Fix CVE-2018-11798 and CVE-2018-1320. - -* Tue Aug 18 2020 yaokai - 0.10.0-1 -- package init +* Thu Nov 12 2020 wangxiao - 0. \ No newline at end of file