diff --git a/.abf.yml b/.abf.yml index 7f96558..ff6ea47 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - thrift-0.18.1.tar.gz: eac2a46a2d09df7f7cc25c687b066f0803d4e770 + thrift-0.14.2.tar.gz: daf3640f5f18ddb7c194133903b6882df93c5d51 diff --git a/thrift.rpmlintrc b/thrift.rpmlintrc index f29f4bc..b0fed1a 100644 --- a/thrift.rpmlintrc +++ b/thrift.rpmlintrc @@ -1 +1,4 @@ addFilter("E: non-versioned-file-in-library-package.*/usr/include/") +addFilter("E: useless-provides") +addFilter("E: incoherent-version-in-name") +addFilter("E: executable-in-library-package") diff --git a/thrift.spec b/thrift.spec index 8ac9fff..54568e2 100644 --- a/thrift.spec +++ b/thrift.spec @@ -1,4 +1,3 @@ - %{?perl_default_filter} %global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ @@ -27,8 +26,8 @@ # NOTE: thrift versions their libraries by package version, so each version # change is a SONAME change and dependencies need to be rebuilt Name: thrift -Version: 0.18.1 -Release: 2 +Version: 0.14.2 +Release: 1 Summary: Software framework for cross-language services development Group: System/Libraries # Parts of the source are used under the BSD and zlib licenses, but @@ -39,7 +38,7 @@ Group: System/Libraries # ./lib/py/compat/win32/stdint.h is 2-clause BSD # ./compiler/cpp/src/md5.[ch] are zlib License: ASL 2.0 and BSD and zlib -URL: https://thrift.apache.org/ +URL: https://thrift.apache.org Source0: https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz @@ -58,6 +57,7 @@ Patch2: configure-java-prefix.patch %if 0%{?want_java} > 0 BuildRequires: ant >= 1.7 %endif + BuildRequires: cmake BuildRequires: bison BuildRequires: boost-devel @@ -73,6 +73,7 @@ BuildRequires: qt5-devel BuildRequires: texlive BuildRequires: zlib-devel + %if 0%{?want_golang} > 0 BuildRequires: golang Requires: golang @@ -165,7 +166,7 @@ Provides: perl(Thrift) = %{version}-%{release} BuildRequires: perl(Bit::Vector) BuildRequires: perl(Class::Accessor) BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl-generators +#BuildRequires: perl-generators Requires: perl(Bit::Vector) Requires: perl(Encode) Requires: perl(HTTP::Request) @@ -289,6 +290,9 @@ sed -i 's|-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java|-Dinstall.javadoc.path # use unversioned doc dirs where appropriate (via _pkgdocdir macro) export PYTHON=%{_bindir}/python3 +#export CC=/opt/llvm16/bin/clang +#export CXX=/opt/llvm16/bin/clang++ + %cmake \ -DBUILD_NODEJS=OFF \ -DBUILD_JAVASCRIPT=OFF \ @@ -336,7 +340,7 @@ find %{buildroot} -name \*.jar -a \! -name \*thrift\* -exec rm -f '{}' \; # Remove inneeded perl files find %{buildroot} -name \*.pod -exec rm -f '{}' \; find %{buildroot} -name .packlist -exec rm -f '{}' \; -rm -r %{buildroot}%{_libdir}/perl5 +#rm -r %{buildroot}%{_libdir}/perl5 # Ensure all python scripts are executable find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod 755