diff --git a/libthrift-0.14.0-javadoc.jar b/libthrift-0.14.0-javadoc.jar new file mode 100644 index 0000000000000000000000000000000000000000..00551f2b6b18eaf459d46874f85ed29dcb3318ea Binary files /dev/null and b/libthrift-0.14.0-javadoc.jar differ diff --git a/libthrift-0.14.0.jar b/libthrift-0.14.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..e7a5c6b956d4c1c597e20a71f1f8567e2b277f48 Binary files /dev/null and b/libthrift-0.14.0.jar differ diff --git a/thrift.spec b/thrift.spec index 296ce4a65711c40b3d474fd3891b6674e526bd2a..b715dfbe8d26fa7511201f41c38305a0eb974674 100644 --- a/thrift.spec +++ b/thrift.spec @@ -38,21 +38,26 @@ %global lua_configure --without-lua Name: thrift Version: 0.14.0 -Release: 1 +Release: 2 Summary: Software framework for cross-language services development License: ASL 2.0 and BSD and zlib URL: https://thrift.apache.org/ Source0: https://archive.apache.org/dist/thrift/%{version}/thrift-%{version}.tar.gz Source1: https://repo1.maven.org/maven2/org/apache/thrift/libthrift/%{version}/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}.jar +Source4: https://repo1.maven.org/maven2/org/apache/thrift/libthrift/%{version}/libthrift-%{version}-javadoc.jar +Source5: xmvn-reactor Patch0: thrift-char.patch Patch2: configure-java-prefix.patch %if 0%{?want_java} > 0 BuildRequires: ant >= 1.7 %endif -BuildRequires: make autoconf automake bison boost-devel boost-static flex gcc-c++ glib2-devel +BuildRequires: make autoconf automake bison boost-devel boost-static flex gcc-c++ glib2-devel maven-local BuildRequires: libevent-devel libstdc++-devel libtool openssl-devel qt5-qtbase-devel texlive BuildRequires: zlib-devel +Provides: libthrift-java +Provides: libthrift-javadoc Obsoletes: libthrift-java < %{version}-%{release} Obsoletes: libthrift-javadoc < %{version}-%{release} Obsoletes: fb303 < %{version}-%{release} @@ -186,6 +191,14 @@ echo 'EXTRA_libthriftz_la_DEPENDENCIES = libthrift.la' >> lib/cpp/Makefile.am sed -i 's|ANT_VALID=.*|ANT_VALID=1|' aclocal/ax_javac_and_java.m4 shopt -s globstar sed -i -E 's@^(#!.*/env) *python *$@\1 python3@' **/*.py +cp %{SOURCE1} . +cp %{SOURCE3} . +cp %{SOURCE4} . +cp %{SOURCE5} ./.xmvn-reactor +echo `pwd` > absolute_prefix.log +sed -i 's/\//\\\//g' absolute_prefix.log +absolute_prefix=`head -n 1 absolute_prefix.log` +sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor %build export PY_PREFIX=%{_prefix} @@ -210,6 +223,7 @@ sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool %make_build %install +%mvn_install %make_install find %{buildroot} -name '*.la' -exec rm -f {} ';' find %{buildroot} -name fastbinary.so | xargs -r chmod 755 @@ -234,12 +248,18 @@ find %{buildroot} -name Thread.h -exec chmod a-x '{}' \; find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod 755 %ldconfig_scriptlets -%files +install -d -m 755 %{buildroot}%{_datadir}/java/libthrift +for jarpackage in libthrift-javadoc.jar libthrift.jar; do + ln -s %{_datadir}/java/thrift/${jarpackge} %{buildroot}%{_datadir}/java/libthrift/${jarpackage} +done + +%files -f .mfiles %doc LICENSE NOTICE %{_bindir}/thrift %{_libdir}/libthrift-%{version}.so %{_libdir}/libthriftz-%{version}.so %{_libdir}/libthriftnb-%{version}.so +%{_datadir}/java/libthrift/* %files glib %{_libdir}/libthrift_c_glib.so @@ -296,6 +316,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %endif %changelog +* Wed Jun 30 2021 Ge Wang - 0.14.0-2 +- Add libthrift-java package + * 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 diff --git a/xmvn-reactor b/xmvn-reactor new file mode 100644 index 0000000000000000000000000000000000000000..10456e5a51e14830a0a45ae079ab1e7e05d086cb --- /dev/null +++ b/xmvn-reactor @@ -0,0 +1,38 @@ + + + + + org.apache.thrift + libthrift + 0.14.0 + absolute-prefix/libthrift-0.14.0.jar + + jar + 1.6 + + + + org.apache.thrift + libthrift + pom + 0.14.0 + absolute-prefix/libthrift-0.14.0.pom + + jar + 1.6 + + + + + org.apache.thrift + libthrift-javadoc + 0.14.0 + absolute-prefix/libthrift-0.14.0-javadoc.jar + + jar + 1.6 + + + + +