The package rpms/thrift.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/thrift.git/commit/?id=c4ec814e715...
https://src.fedoraproject.org/cgit/rpms/thrift.git/commit/?id=339818f39ff...
https://src.fedoraproject.org/cgit/rpms/thrift.git/commit/?id=a429a0696aa....
Change:
-%ifarch %{mono_arches}
-%ifarch %{mono_arches}
+%ifarch %{mono_arches}
Thanks.
Full change:
============
commit 1b0847d5b99f02177ab38a4653aefa2338625c0d
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Tue Aug 20 14:04:30 2019 -0400
Fix FTBFS (by removing Java support) and fix Python3 issues (rhbz#1738810 and
rhbz#1533306)
diff --git a/thrift.spec b/thrift.spec
index 2787d7f..6883df4 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -11,6 +11,15 @@
# We should be able to enable this in the future
%global want_d 0
+# Can't do anything with java with all the build deps in modules
+%global want_java 0
+
+%if 0%{?want_java} == 0
+%global java_configure --without-java
+%else
+%global java_configure --with-java
+%endif
+
# Thrift's Ruby support depends on Mongrel. Since Mongrel is
# deprecated in Fedora, we can't support Ruby bindings for Thrift
# unless and until Thrift is patched to use a different HTTP server.
@@ -50,7 +59,7 @@
Name: thrift
Version: 0.10.0
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -89,7 +98,9 @@ Patch5: python3.patch
# subpackages, to facilitate enabling or disabling individual language
# bindings in the future
+%if 0%{?want_java} > 0
BuildRequires: ant >= 1.7
+%endif
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@@ -204,6 +215,7 @@ BuildRequires: php-devel
The php-%{name} package contains PHP bindings for %{name}.
%endif
+%if 0%{?want_java} > 0
%package -n lib%{name}-javadoc
Summary: API documentation for java-%{name}
Requires: lib%{name}-java = %{version}-%{release}
@@ -240,6 +252,7 @@ BuildArch: noarch
%description -n lib%{name}-java
The lib%{name}-java package contains Java bindings for %{name}.
+%endif
%if 0%{?want_ruby} > 0
%package -n ruby-%{name}
@@ -291,6 +304,7 @@ Obsoletes: python2-fb303 < 0.10.0-14%{?dist}
%description -n python3-fb303
The python3-fb303 package contains Python bindings for fb303.
+%if 0%{?want_java} > 0
%package -n fb303-java
Summary: Java bindings for fb303
Requires: java-headless >= 1:1.6.0
@@ -303,6 +317,7 @@ BuildArch: noarch
%description -n fb303-java
The fb303-java package contains Java bindings for fb303.
+%endif
%prep
%autosetup -p1
@@ -329,6 +344,10 @@ sed -i 's|libfb303_so_LDFLAGS =
$(SHARED_LDFLAGS)|libfb303_so_LDFLAGS = $(SHARED
sed -i 's|ANT_VALID=.*|ANT_VALID=1|' aclocal/ax_javac_and_java.m4
sed -i 's|ANT_VALID=.*|ANT_VALID=1|' contrib/fb303/aclocal/ax_javac_and_java.m4
+# explicitly set python3
+shopt -s globstar
+sed -i -E 's(a)^(#!.*/env) *python *$@\1 python3@' **/*.py
+
%build
export PY_PREFIX=%{_prefix}
export PERL_PREFIX=%{_prefix}
@@ -374,7 +393,7 @@ sh ./bootstrap.sh
# use unversioned doc dirs where appropriate (via _pkgdocdir macro)
export PYTHON=%{_bindir}/python3
-%configure --disable-dependency-tracking --disable-static --with-boost=/usr
%{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} --with-py3
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+%configure --disable-dependency-tracking --disable-static --with-boost=/usr
%{java_configure} %{ruby_configure} %{erlang_configure} %{golang_configure}
%{php_configure} --with-py3
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
# eliminate unused direct shlib dependencies
sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool
@@ -386,14 +405,18 @@ make %{?_smp_mflags}
cd contrib/fb303
sed -i '/^[.][/]configure.*/d' bootstrap.sh
sh bootstrap.sh
- %configure --disable-static --with-java --without-php --with-py3 --libdir=%{_libdir}
+ %configure --disable-static %{java_configure} --without-php --with-py3
--libdir=%{_libdir}
make %{?_smp_mflags}
- (
- cd java
- ant dist
- )
)
+# build fb303 java
+%if 0%{?want_java} > 0
+(
+ cd contrib/fb303/java
+ ant dist
+)
+%endif
+
%install
%make_install
find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -401,14 +424,13 @@ find %{buildroot} -name fastbinary.so | xargs -r chmod 755
find %{buildroot} -name \*.erl -or -name \*.hrl -or -name \*.app | xargs -r chmod 644
# Remove javadocs jar
+%if 0%{?want_java} > 0
find %{buildroot}/%{_javadir} -name lib%{name}-javadoc.jar -exec rm -f '{}' \;
-
# Add POM file and depmap
mkdir -p %{buildroot}%{_mavenpomdir}
-
install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-libthrift.pom
-
%add_maven_depmap JPP-libthrift.pom libthrift.jar
+%endif
# Remove bundled jar files
find %{buildroot} -name \*.jar -a \! -name \*thrift\* -exec rm -f '{}' \;
@@ -434,15 +456,18 @@ find %{buildroot} -name Thread.h -exec chmod a-x '{}' \;
(
cd contrib/fb303
make DESTDIR=%{buildroot} install
- (
- cd java
- ant -Dinstall.path=%{buildroot}%{_javadir}
-Dinstall.javadoc.path=%{buildroot}%{_javadocdir}/fb303 install
- )
)
+# install fb303 java
+%if 0%{?want_java} > 0
+(
+ cd contrib/fb303/java
+ ant -Dinstall.path=%{buildroot}%{_javadir}
-Dinstall.javadoc.path=%{buildroot}%{_javadocdir}/fb303 install
+)
# install maven pom and depmaps for fb303
install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-libfb303.pom
%add_maven_depmap JPP-libfb303.pom libfb303.jar -f "fb303"
+%endif
# Ensure all python scripts are executable
find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod
755
@@ -503,12 +528,14 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \;
-print | xargs -r
%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
%doc LICENSE NOTICE
+%if 0%{?want_java} > 0
%files -n lib%{name}-javadoc
%{_javadocdir}/%{name}
%doc LICENSE NOTICE
%files -n lib%{name}-java -f .mfiles
%doc LICENSE NOTICE
+%endif
%files -n fb303
%{_datarootdir}/fb303
@@ -525,10 +552,15 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \;
-print | xargs -r
%{python3_sitelib}/%{name}_fb303-%{version}-py%{python3_version}.egg-info
%doc LICENSE NOTICE
+%if 0%{?want_java} > 0
%files -n fb303-java -f .mfiles-fb303
%doc LICENSE NOTICE
+%endif
%changelog
+* Tue Aug 20 2019 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-19
+- Fix FTBFS (by removing Java support) and fix Python3 issues (rhbz#1738810 and
rhbz#1533306)
+
* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-18
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 8d3e48896b4d259588e2e6943b9a35f0c504b34f
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Tue Aug 20 08:48:25 2019 +0200
Revert "thrift fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1676140"
This reverts commit 3f15a694dbea566c94faff611bfcb8c87572c552.
Unretirement request:
https://pagure.io/releng/issue/8634
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f5a770c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/0.9.1.tar.gz
+/thrift-0.10.0.tar.gz
diff --git a/THRIFT-4177.patch b/THRIFT-4177.patch
new file mode 100644
index 0000000..c0c331b
--- /dev/null
+++ b/THRIFT-4177.patch
@@ -0,0 +1,27 @@
+diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc
b/compiler/cpp/src/thrift/generate/t_java_generator.cc
+index fb581e4..90dfa06 100644
+--- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
++++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
+@@ -4657,8 +4657,9 @@ void
t_java_generator::generate_deep_copy_non_container(ofstream& out,
+ std::string dest_name,
+ t_type* type) {
+ (void)dest_name;
++ type = get_true_type(type);
+ if (type->is_base_type() || type->is_enum() || type->is_typedef()) {
+- if (((t_base_type*)type)->is_binary()) {
++ if (type->is_binary()) {
+ out << "org.apache.thrift.TBaseHelper.copyBinary(" <<
source_name << ")";
+ } else {
+ // everything else can be copied directly
+diff --git a/compiler/cpp/src/thrift/parse/t_type.h
b/compiler/cpp/src/thrift/parse/t_type.h
+index 30f8c1f7..3a6d1e04 100644
+--- a/compiler/cpp/src/thrift/parse/t_type.h
++++ b/compiler/cpp/src/thrift/parse/t_type.h
+@@ -47,6 +47,7 @@ public:
+ virtual bool is_void() const { return false; }
+ virtual bool is_base_type() const { return false; }
+ virtual bool is_string() const { return false; }
++ virtual bool is_binary() const { return false; }
+ virtual bool is_bool() const { return false; }
+ virtual bool is_typedef() const { return false; }
+ virtual bool is_enum() const { return false; }
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100644
index 0000000..52ecda4
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#
http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+./cleanup.sh
+if test -d lib/php/src/ext/thrift_protocol ; then
+ if phpize -v >/dev/null 2>/dev/null ; then
+ (cd lib/php/src/ext/thrift_protocol && phpize)
+ fi
+fi
+
+set -e
+
+# libtoolize is called "glibtoolize" on OSX.
+if libtoolize --version 1 >/dev/null 2>/dev/null; then
+ LIBTOOLIZE=libtoolize
+elif glibtoolize --version 1 >/dev/null 2>/dev/null; then
+ LIBTOOLIZE=glibtoolize
+else
+ echo >&2 "Couldn't find libtoolize!"
+ exit 1
+fi
+
+# we require automake 1.13 or later
+# check must happen externally due to use of newer macro
+AUTOMAKE_VERSION=`automake --version | grep automake | egrep -o
'([0-9]{1,}\.)+[0-9]{1,}'`
+if [ "$AUTOMAKE_VERSION" \< "1.13" ]; then
+ echo >&2 "automake version $AUTOMAKE_VERSION is too old (need 1.13 or
later)"
+ exit 1
+fi
+
+autoscan
+$LIBTOOLIZE --copy --automake
+aclocal -I ./aclocal
+autoheader
+autoconf
+automake --copy --add-missing --foreign
diff --git a/configure-java-prefix.patch b/configure-java-prefix.patch
new file mode 100644
index 0000000..ebd542f
--- /dev/null
+++ b/configure-java-prefix.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 0972abf..77107fc 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,10 +34,7 @@ AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
+ AS_IF([test "x$PY_PREFIX" = x], [PY_PREFIX="/usr"])
+
+ AC_ARG_VAR([JAVA_PREFIX], [Prefix for installing the Java lib jar.
+- Default = "/usr/local/lib"])
+-AS_IF([test "x$JAVA_PREFIX" != x],
[JAVA_PREFIX="$JAVA_PREFIX/usr/local/lib"],
+- [test "x$PREFIX" != x],
[JAVA_PREFIX="$PREFIX/usr/local/lib"],
+- [JAVA_PREFIX="/usr/local/lib"])
++ Default = "/usr/share/java"])
+
+ AC_ARG_VAR([RUBY_PREFIX], [Prefix for installing Ruby modules.
+ (Normal --prefix is ignored for Ruby because
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 3838ac0..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-thrift fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1676140
diff --git a/fb303-0.10.0-buildxml.patch b/fb303-0.10.0-buildxml.patch
new file mode 100644
index 0000000..eb3825a
--- /dev/null
+++ b/fb303-0.10.0-buildxml.patch
@@ -0,0 +1,158 @@
+diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml
+index 8f2fa51..d89f05e 100755
+--- a/contrib/fb303/java/build.xml
++++ b/contrib/fb303/java/build.xml
+@@ -17,8 +17,7 @@
+ specific language governing permissions and limitations
+ under the License.
+ -->
+-<project name="libfb303" default="dist" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="libfb303" default="dist"
basedir=".">
+
+ <!-- project wide settings. All directories relative to basedir -->
+ <property name="thrift.root"
location="${basedir}/../../../"/>
+@@ -38,8 +37,8 @@
+ </condition>
+ <property name="version"
value="${thrift.version}-snapshot"/>
+
+- <property name="fb303.final.name"
value="${fb303.artifactid}-${version}"/>
+- <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift-${version}.jar"/>
++ <property name="fb303.final.name"
value="${fb303.artifactid}"/>
++ <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift.jar"/>
+
+ <property name="src" value="${basedir}/src"/>
+ <property name="gen" value="${basedir}/gen-java"/>
+@@ -50,7 +49,7 @@
+ <property name="fb303.jar.file"
location="${build.dir}/${fb303.final.name}.jar"/>
+ <property name="fb303.pom.xml"
location="${build.dir}/${fb303.final.name}.pom"/>
+
+- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
++ <target name="init" depends="setup.init"
unless="init.finished">
+ <property name="init.finished" value="true"/>
+ </target>
+
+@@ -72,13 +71,21 @@
+ <!-- compile the base and thrift generated code and jar them -->
+ <target name="dist" depends="init,generate">
+ <echo message="Building ${fb303.final.name}.jar"/>
+- <javac destdir="${build.classes.dir}" debug="on">
++ <javac destdir="${build.classes.dir}" debug="on"
includeantruntime="false" >
+ <classpath>
+ <pathelement location="${thrift.java.libthrift}"/>
+- <fileset dir="${thrift.root}/lib/java/build/lib">
+- <include name="*.jar"/>
+- </fileset>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
++ </fileset>
+ </classpath>
++
+ <src path="${src}"/>
+ <src path="${gen}"/>
+ <include name="**/*.java"/>
+@@ -99,97 +106,4 @@
+ <delete dir="${build.dir}"/>
+ <delete dir="${gen}"/>
+ </target>
+-
+- <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check"
unless="mvn.ant.tasks.found">
+- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
+- </target>
+-
+- <target name="mvn.ant.tasks.check">
+- <condition property="mvn.ant.tasks.found">
+- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
+- </condition>
+- </target>
+-
+- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
+- <echo message="${mvn.ant.task.jar}"/>
+- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
+- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
+-
+- <!-- remote repositories used to download dependencies from -->
+- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
+- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
+-
+- <!-- Pom file information -->
+- <artifact:pom id="pom"
+- groupId="${thrift.groupid}"
+- artifactId="${fb303.artifactid}"
+- version="${version}"
+- url="http://thrift.apache.org"
+- name="Apache Thrift"
+- description="Thrift is a software framework for scalable cross-language
services development."
+- packaging="pom"
+- >
+- <remoteRepository refid="central"/>
+- <remoteRepository refid="apache"/>
+- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
+- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
+-
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
+-
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
+- />
+- <!-- Thrift Developers -->
+- <developer id="mcslee" name="Mark Slee"/>
+- <developer id="dreiss" name="David Reiss"/>
+- <developer id="aditya" name="Aditya Agarwal"/>
+- <developer id="marck" name="Marc Kwiatkowski"/>
+- <developer id="jwang" name="James Wang"/>
+- <developer id="cpiro" name="Chris Piro"/>
+- <developer id="bmaurer" name="Ben Maurer"/>
+- <developer id="kclark" name="Kevin Clark"/>
+- <developer id="jake" name="Jake Luciani"/>
+- <developer id="bryanduxbury" name="Bryan Duxbury"/>
+- <developer id="esteve" name="Esteve Fernandez"/>
+- <developer id="todd" name="Todd Lipcon"/>
+- <developer id="geechorama" name="Andrew McGeachie"/>
+- <developer id="molinaro" name="Anthony Molinaro"/>
+- <developer id="roger" name="Roger Meier"/>
+- <developer id="jfarrell" name="Jake Farrell"/>
+- <developer id="jensg" name="Jens Geyer"/>
+- <developer id="carl" name="Carl Yeksigian"/>
+-
+- <!-- Thrift dependencies list -->
+- <dependency groupId="org.apache.thrift"
artifactId="libthrift" version="${version}"/>
+- </artifact:pom>
+-
+- <!-- Generate the pom file -->
+- <artifact:writepom pomRefId="pom"
file="${fb303.pom.xml}"/>
+-
+- <property name="mvn.finished" value="true"/>
+- </target>
+-
+- <macrodef name="signAndDeploy">
+- <!-- Sign and deploy jars to apache repo -->
+- <attribute name="file"/>
+- <attribute name="classifier" default=""/>
+- <attribute name="packaging" default="jar"/>
+- <attribute name="pom" default=""/>
+- <sequential>
+- <artifact:mvn fork="true">
+- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
+- <arg value="-DrepositoryId=${maven-repository-id}"/>
+- <arg value="-Durl=${maven-repository-url}"/>
+- <arg value="-DpomFile=@{pom}"/>
+- <arg value="-Dfile=@{file}"/>
+- <arg value="-Dclassifier=@{classifier}"/>
+- <arg value="-Dpackaging=@{packaging}"/>
+- <arg value="-Pgpg"/>
+- </artifact:mvn>
+- </sequential>
+- </macrodef>
+-
+- <target name="publish" depends="clean,dist">
+- <!-- Compile, packages and then send release to apache maven repo -->
+- <!-- run with: ant -Drelease=true publish-->
+- <signAndDeploy file="${fb303.pom.xml}" packaging="pom"
classifier="" pom="${fb303.pom.xml}"/>
+- <signAndDeploy file="${fb303.jar.file}" packaging="jar"
classifier="" pom="${fb303.pom.xml}"/>
+- </target>
+ </project>
diff --git a/fix-ppc64le-builds.patch b/fix-ppc64le-builds.patch
new file mode 100644
index 0000000..f56ad86
--- /dev/null
+++ b/fix-ppc64le-builds.patch
@@ -0,0 +1,13 @@
+diff --git a/aclocal/ax_boost_base.m4 b/aclocal/ax_boost_base.m4
+index b496020..30ee0df 100644
+--- a/aclocal/ax_boost_base.m4
++++ b/aclocal/ax_boost_base.m4
+@@ -92,7 +92,7 @@ if test "x$want_boost" = "xyes"; then
+ libsubdirs="lib"
+ ax_arch=`uname -m`
+ case $ax_arch in
+- x86_64|ppc64|s390x|sparc64|aarch64)
++ x86_64|ppc64|ppc64le|s390x|sparc64|aarch64)
+ libsubdirs="lib64 lib lib64"
+ ;;
+ esac
diff --git a/libfb303-0.10.0.pom b/libfb303-0.10.0.pom
new file mode 100644
index 0000000..c3fddde
--- /dev/null
+++ b/libfb303-0.10.0.pom
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ <version>0.10.0</version>
+ <packaging>pom</packaging>
+ <name>Apache Thrift</name>
+ <description>Thrift is a software framework for scalable cross-language services
development.</description>
+ <url>http://thrift.apache.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>mcslee</id>
+ <name>Mark Slee</name>
+ </developer>
+ <developer>
+ <id>dreiss</id>
+ <name>David Reiss</name>
+ </developer>
+ <developer>
+ <id>aditya</id>
+ <name>Aditya Agarwal</name>
+ </developer>
+ <developer>
+ <id>marck</id>
+ <name>Marc Kwiatkowski</name>
+ </developer>
+ <developer>
+ <id>jwang</id>
+ <name>James Wang</name>
+ </developer>
+ <developer>
+ <id>cpiro</id>
+ <name>Chris Piro</name>
+ </developer>
+ <developer>
+ <id>bmaurer</id>
+ <name>Ben Maurer</name>
+ </developer>
+ <developer>
+ <id>kclark</id>
+ <name>Kevin Clark</name>
+ </developer>
+ <developer>
+ <id>jake</id>
+ <name>Jake Luciani</name>
+ </developer>
+ <developer>
+ <id>bryanduxbury</id>
+ <name>Bryan Duxbury</name>
+ </developer>
+ <developer>
+ <id>esteve</id>
+ <name>Esteve Fernandez</name>
+ </developer>
+ <developer>
+ <id>todd</id>
+ <name>Todd Lipcon</name>
+ </developer>
+ <developer>
+ <id>geechorama</id>
+ <name>Andrew McGeachie</name>
+ </developer>
+ <developer>
+ <id>molinaro</id>
+ <name>Anthony Molinaro</name>
+ </developer>
+ <developer>
+ <id>roger</id>
+ <name>Roger Meier</name>
+ </developer>
+ <developer>
+ <id>jfarrell</id>
+ <name>Jake Farrell</name>
+ </developer>
+ <developer>
+ <id>jensg</id>
+ <name>Jens Geyer</name>
+ </developer>
+ <developer>
+ <id>carl</id>
+ <name>Carl Yeksigian</name>
+ </developer>
+ </developers>
+ <scm>
+
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
+
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
+ <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.10.0</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/libthrift-0.10.0.pom b/libthrift-0.10.0.pom
new file mode 100644
index 0000000..7c5f61d
--- /dev/null
+++ b/libthrift-0.10.0.pom
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.10.0</version>
+ <packaging>pom</packaging>
+ <name>Apache Thrift</name>
+ <description>Thrift is a software framework for scalable cross-language services
development.</description>
+ <url>http://thrift.apache.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>mcslee</id>
+ <name>Mark Slee</name>
+ </developer>
+ <developer>
+ <id>dreiss</id>
+ <name>David Reiss</name>
+ </developer>
+ <developer>
+ <id>aditya</id>
+ <name>Aditya Agarwal</name>
+ </developer>
+ <developer>
+ <id>marck</id>
+ <name>Marc Kwiatkowski</name>
+ </developer>
+ <developer>
+ <id>jwang</id>
+ <name>James Wang</name>
+ </developer>
+ <developer>
+ <id>cpiro</id>
+ <name>Chris Piro</name>
+ </developer>
+ <developer>
+ <id>bmaurer</id>
+ <name>Ben Maurer</name>
+ </developer>
+ <developer>
+ <id>kclark</id>
+ <name>Kevin Clark</name>
+ </developer>
+ <developer>
+ <id>jake</id>
+ <name>Jake Luciani</name>
+ </developer>
+ <developer>
+ <id>bryanduxbury</id>
+ <name>Bryan Duxbury</name>
+ </developer>
+ <developer>
+ <id>esteve</id>
+ <name>Esteve Fernandez</name>
+ </developer>
+ <developer>
+ <id>todd</id>
+ <name>Todd Lipcon</name>
+ </developer>
+ <developer>
+ <id>geechorama</id>
+ <name>Andrew McGeachie</name>
+ </developer>
+ <developer>
+ <id>molinaro</id>
+ <name>Anthony Molinaro</name>
+ </developer>
+ <developer>
+ <id>roger</id>
+ <name>Roger Meier</name>
+ </developer>
+ <developer>
+ <id>jfarrell</id>
+ <name>Jake Farrell</name>
+ </developer>
+ <developer>
+ <id>jensg</id>
+ <name>Jens Geyer</name>
+ </developer>
+ <developer>
+ <id>carl</id>
+ <name>Carl Yeksigian</name>
+ </developer>
+ </developers>
+ <scm>
+
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
+
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
+ <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 0000000..c2908fd
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,72 @@
+diff --git a/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
b/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
+index 4b1c257..df1c8cc 100644
+--- a/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
++++ b/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
+@@ -57,24 +57,24 @@ def service_ctrl(
+ msg = fb_status_string(status)
+ if (len(status_details)):
+ msg += " - %s" % status_details
+- print msg
++ print(msg)
+
+ if (status == fb_status.ALIVE):
+ return 2
+ else:
+ return 3
+ except:
+- print "Failed to get status"
++ print("Failed to get status")
+ return 3
+
+ # scalar commands
+ if command in ["version", "alive", "name"]:
+ try:
+ result = fb303_wrapper(command, port, trans_factory, prot_factory)
+- print result
++ print(result)
+ return 0
+ except:
+- print "failed to get ", command
++ print("failed to get ", command)
+ return 3
+
+ # counters
+@@ -82,10 +82,10 @@ def service_ctrl(
+ try:
+ counters = fb303_wrapper('counters', port, trans_factory,
prot_factory)
+ for counter in counters:
+- print "%s: %d" % (counter, counters[counter])
++ print("%s: %d" % (counter, counters[counter]))
+ return 0
+ except:
+- print "failed to get counters"
++ print("failed to get counters")
+ return 3
+
+ # Only root should be able to run the following commands
+@@ -96,19 +96,19 @@ def service_ctrl(
+ fb303_wrapper(command, port, trans_factory, prot_factory)
+ return 0
+ except:
+- print "failed to tell the service to ", command
++ print("failed to tell the service to ", command)
+ return 3
+ else:
+ if command in ["stop", "reload"]:
+- print "root privileges are required to stop or reload the
service."
++ print("root privileges are required to stop or reload the
service.")
+ return 4
+
+- print "The following commands are available:"
++ print("The following commands are available:")
+ for command in ["counters", "name", "version",
"alive", "status"]:
+- print "\t%s" % command
+- print "The following commands are available for users with root
privileges:"
++ print("\t%s" % command)
++ print("The following commands are available for users with root
privileges:")
+ for command in ["stop", "reload"]:
+- print "\t%s" % command
++ print("\t%s" % command)
+
+ return 0
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..f7d47e8
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (thrift-0.10.0.tar.gz) =
3695cf0fb0e4080b02446ab694fb61476997d8b181942dd6fe1e3e7cf0dcf990b4184ea33f9d0bc290b96200f702cf1ac1579e36b6b5bfe9ba8914b2d2938ddc
diff --git a/thrift-0.10.0-buildxml.patch b/thrift-0.10.0-buildxml.patch
new file mode 100644
index 0000000..8931c03
--- /dev/null
+++ b/thrift-0.10.0-buildxml.patch
@@ -0,0 +1,235 @@
+diff --git a/lib/java/build.xml b/lib/java/build.xml
+index 40e5284..db1ce54 100644
+--- a/lib/java/build.xml
++++ b/lib/java/build.xml
+@@ -17,8 +17,7 @@
+ specific language governing permissions and limitations
+ under the License.
+ -->
+-<project name="libthrift" default="dist" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="libthrift" default="dist"
basedir=".">
+
+ <description>Thrift Build File</description>
+ <property name="thrift.root" location="../../"/>
+@@ -67,8 +66,15 @@
+ <property name="pom.xml"
location="${build.dir}/${final.name}.pom"/>
+
+ <path id="compile.classpath">
+- <fileset dir="${build.lib.dir}">
+- <include name="**/*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
+ </fileset>
+ </path>
+
+@@ -78,11 +84,14 @@
+ <pathelement location="${build.test.dir}"/>
+ <pathelement location="${jar.file}"/>
+ <pathelement location="${test.jar.file}"/>
+-
++ <fileset dir="/usr/share/java">
++ <include name="junit.jar"/>
++ <include name="slf4j/log4j12.jar"/>
++ </fileset>
+ </path>
+
+ <!-- Tasks -->
+- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
++ <target name="init" depends="setup.init"
unless="init.finished">
+ <property name="init.finished" value="true"/>
+ </target>
+
+@@ -295,120 +304,12 @@
+ </target>
+
+ <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check,proxy"
unless="mvn.ant.tasks.found">
+- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
+ </target>
+
+ <target name="mvn.ant.tasks.check">
+- <condition property="mvn.ant.tasks.found">
+- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
+- </condition>
+ </target>
+
+- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
+- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
+- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
+-
+- <!-- remote repositories used to download dependencies from -->
+- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
+- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
+-
+- <!-- Pom file information -->
+- <artifact:pom id="pom"
+- groupId="${thrift.groupid}"
+- artifactId="${thrift.artifactid}"
+- version="${version}"
+- url="http://thrift.apache.org"
+- name="Apache Thrift"
+- description="Thrift is a software framework for scalable cross-language
services development."
+- packaging="pom"
+- >
+- <remoteRepository refid="central"/>
+- <remoteRepository refid="apache"/>
+- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
+- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
+-
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
+-
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
+- />
+- <!-- Thrift Developers -->
+- <developer id="mcslee" name="Mark Slee"/>
+- <developer id="dreiss" name="David Reiss"/>
+- <developer id="aditya" name="Aditya Agarwal"/>
+- <developer id="marck" name="Marc Kwiatkowski"/>
+- <developer id="jwang" name="James Wang"/>
+- <developer id="cpiro" name="Chris Piro"/>
+- <developer id="bmaurer" name="Ben Maurer"/>
+- <developer id="kclark" name="Kevin Clark"/>
+- <developer id="jake" name="Jake Luciani"/>
+- <developer id="bryanduxbury" name="Bryan Duxbury"/>
+- <developer id="esteve" name="Esteve Fernandez"/>
+- <developer id="todd" name="Todd Lipcon"/>
+- <developer id="geechorama" name="Andrew McGeachie"/>
+- <developer id="molinaro" name="Anthony Molinaro"/>
+- <developer id="roger" name="Roger Meier"/>
+- <developer id="jfarrell" name="Jake Farrell"/>
+- <developer id="jensg" name="Jens Geyer"/>
+- <developer id="carl" name="Carl Yeksigian"/>
+-
+- <!-- Thrift dependencies list -->
+- <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="${slf4j.version}"/>
+- <dependency groupId="javax.servlet"
artifactId="servlet-api" version="${servlet.version}"
scope="provided"/>
+- <dependency groupId="org.apache.httpcomponents"
artifactId="httpclient" version="${httpclient.version}"/>
+- <dependency groupId="org.apache.httpcomponents"
artifactId="httpcore" version="${httpcore.version}"/>
+- </artifact:pom>
+-
+- <!-- Generate the pom file -->
+- <artifact:writepom pomRefId="pom" file="${pom.xml}"/>
+-
+- <!-- Download the dependencies -->
+- <artifact:dependencies filesetId="build-dependency-jars"
pomRefId="pom"/>
+-
+- <!-- Copy the dependencies to the build/lib dir -->
+- <copy todir="${build.dir}/lib">
+- <fileset refid="build-dependency-jars"/>
+- <mapper type="flatten"/>
+- </copy>
+-
+- <!-- Dependencies needed for testing -->
+- <artifact:dependencies filesetId="test-dependency-jars"
useScope="runtime">
+- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12"
version="${slf4j.version}"/>
+- <dependency groupId="junit" artifactId="junit"
version="4.4"/>
+- </artifact:dependencies>
+-
+- <!-- Copy the test dependencies to the build/lib dir -->
+- <copy todir="${build.dir}/lib">
+- <fileset refid="test-dependency-jars"/>
+- <mapper type="flatten"/>
+- </copy>
+-
+- <property name="mvn.finished" value="true"/>
++ <target name="mvn.init" unless="mvn.finished">
+ </target>
+
+- <macrodef name="signAndDeploy">
+- <!-- Sign and deploy jars to apache repo -->
+- <attribute name="file"/>
+- <attribute name="classifier" default=""/>
+- <attribute name="packaging" default="jar"/>
+- <attribute name="pom" default=""/>
+- <sequential>
+- <artifact:mvn fork="true">
+- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file"/>
+- <arg value="-DrepositoryId=${maven-repository-id}"/>
+- <arg value="-Durl=${maven-repository-url}"/>
+- <arg value="-DpomFile=@{pom}"/>
+- <arg value="-Dfile=@{file}"/>
+- <arg value="-Dclassifier=@{classifier}"/>
+- <arg value="-Dpackaging=@{packaging}"/>
+- <arg value="-Pgpg"/>
+- </artifact:mvn>
+- </sequential>
+- </macrodef>
+-
+- <target name="publish"
depends="clean,init,test,dist,javadoc,pack.src">
+- <!-- Compile, package, test and then send release to apache maven repo -->
+- <!-- run with: ant -Drelease=true publish-->
+- <signAndDeploy file="${pom.xml}" packaging="pom"
classifier="" pom="${pom.xml}"/>
+- <signAndDeploy file="${jar.file}" classifier=""
pom="${pom.xml}"/>
+- <signAndDeploy file="${javadoc.jar.file}"
classifier="javadoc" pom="${pom.xml}"/>
+- <signAndDeploy file="${source.jar.file}" classifier="sources"
pom="${pom.xml}"/>
+- </target>
+ </project>
+diff --git a/tutorial/java/build.xml b/tutorial/java/build.xml
+index 7638d5b..c5ca703 100644
+--- a/tutorial/java/build.xml
++++ b/tutorial/java/build.xml
+@@ -29,13 +29,33 @@
+ <include name="*.jar" />
+ <exclude name="-test.jar" />
+ </fileset>
+- <fileset dir="../../lib/java/build/lib">
+- <include name="*.jar" />
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
+ </fileset>
+ </path>
+ <path id="build.classpath">
+- <path refid="libs.classpath" />
+ <pathelement path="${gen}" />
++ <fileset dir="../../lib/java/build">
++ <include name="*.jar" />
++ <exclude name="-test.jar" />
++ </fileset>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
++ </fileset>
+ </path>
+ <path id="tutorial.classpath">
+ <path refid="build.classpath" />
+diff --git a/tutorial/js/build.xml b/tutorial/js/build.xml
+index a9a9ad4..2fddf0c 100644
+--- a/tutorial/js/build.xml
++++ b/tutorial/js/build.xml
+@@ -35,8 +35,16 @@
+ <include name="*.jar" />
+ <exclude name="-test.jar" />
+ </fileset>
+- <fileset dir="../../lib/java/build/lib">
+- <include name="*.jar" />
++
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
+ </fileset>
+ </path>
+ <path id="build.classpath">
diff --git a/thrift.spec b/thrift.spec
new file mode 100644
index 0000000..2787d7f
--- /dev/null
+++ b/thrift.spec
@@ -0,0 +1,716 @@
+%global php_extdir %(php-config --extension-dir 2>/dev/null || echo
"undefined")
+
+%{?perl_default_filter}
+%global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so|%{php_extdir}/.*\\.so)$
+
+%global have_mongrel 0
+
+# erlang-jsx is available in F19 but orphaned in F22
+%global have_jsx 0
+
+# We should be able to enable this in the future
+%global want_d 0
+
+# Thrift's Ruby support depends on Mongrel. Since Mongrel is
+# deprecated in Fedora, we can't support Ruby bindings for Thrift
+# unless and until Thrift is patched to use a different HTTP server.
+%if 0%{?have_mongrel} == 0
+%global ruby_configure --without-ruby
+%global with_ruby 0
+%else
+%global ruby_configure --with-ruby
+%global want_ruby 1
+%endif
+
+# Thrift's Erlang support depends on the JSX library, which is not
+# currently available in Fedora.
+
+%if 0%{?have_jsx} == 0
+%global erlang_configure --without-erlang
+%global want_erlang 0
+%else
+%global erlang_configure --with-erlang
+%global want_erlang 1
+%endif
+
+# PHP appears broken in Thrift 0.9.1
+%global want_php 0
+
+%if 0%{?want_php} == 0
+%global php_langname %{nil}
+%global php_configure --without-php
+%else
+%global php_langname PHP,\
+%global php_configure --with-php
+%endif
+
+# Thrift's GO support doesn't build under Fedora
+%global want_golang 0
+%global golang_configure --without-go
+
+Name: thrift
+Version: 0.10.0
+Release: 18%{?dist}
+Summary: Software framework for cross-language services development
+
+# Parts of the source are used under the BSD and zlib licenses, but
+# these are OK for inclusion in an Apache 2.0-licensed whole:
+#
https://www.apache.org/legal/3party.html
+
+# Here's the breakdown:
+# ./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/
+
+Source0:
https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
+
+Source1:
https://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/li...
+Source2:
https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh
+
+Source3:
https://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libf...
+
+# this patch is adapted from Gil Cattaneo's thrift-0.7.0 package
+Patch0: %{name}-%{version}-buildxml.patch
+# for fb303, excise maven ant tasks; build against system libraries; etc.
+Patch1: fb303-%{version}-buildxml.patch
+# fix configure.ac insistence on using /usr/local/lib for JAVA_PREFIX
+Patch2: configure-java-prefix.patch
+# fix for ppc64le builds not linking to /usr/lib64 directory
+Patch3: fix-ppc64le-builds.patch
+# fix for s390x build; incorporates fix for THRIFT-4177 with some code from THRIFT-4136
+Patch4: THRIFT-4177.patch
+
+# Update fb303 for python3
+Patch5: python3.patch
+
+
+# BuildRequires for language-specific bindings are listed under these
+# subpackages, to facilitate enabling or disabling individual language
+# bindings in the future
+
+BuildRequires: ant >= 1.7
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: boost-devel
+BuildRequires: boost-static
+BuildRequires: flex
+BuildRequires: flex-devel
+BuildRequires: gcc-c++
+BuildRequires: glib2-devel
+BuildRequires: libevent-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libtool
+BuildRequires: openssl-devel
+BuildRequires: qt-devel
+BuildRequires: texlive
+BuildRequires: zlib-devel
+
+%if 0%{?want_golang} > 0
+BuildRequires: golang
+Requires: golang
+%endif
+
+%description
+
+The Apache Thrift software framework for cross-language services
+development combines a software stack with a code generation engine to
+build services that work efficiently and seamlessly between C++, Java,
+Python, %{?php_langname}and other languages.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+Requires: boost-devel
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package qt
+Summary: Qt support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description qt
+The %{name}-qt package contains Qt bindings for %{name}.
+
+%package glib
+Summary: GLib support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description glib
+The %{name}-qt package contains GLib bindings for %{name}.
+
+%package -n python3-%{name}
+Summary: Python 3 support for %{name}
+BuildRequires: python3-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python3
+Obsoletes: python-%{name} < 0.10.0-1%{?dist}
+Obsoletes: python2-%{name} < 0.10.0-14%{?dist}
+
+%description -n python3-%{name}
+The python3-%{name} package contains Python bindings for %{name}.
+
+%package -n perl-%{name}
+Summary: Perl support for %{name}
+Provides: perl(Thrift) = %{version}-%{release}
+BuildRequires: perl(Bit::Vector)
+BuildRequires: perl(Class::Accessor)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl-generators
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(Bit::Vector)
+Requires: perl(Encode)
+Requires: perl(HTTP::Request)
+Requires: perl(IO::Select)
+Requires: perl(IO::Socket::INET)
+Requires: perl(IO::String)
+Requires: perl(LWP::UserAgent)
+Requires: perl(POSIX)
+Requires: perl(base)
+Requires: perl(constant)
+Requires: perl(strict)
+Requires: perl(utf8)
+Requires: perl(warnings)
+BuildArch: noarch
+
+%description -n perl-%{name}
+The perl-%{name} package contains Perl bindings for %{name}.
+
+%if %{?want_d}
+%package -n d-%{name}
+Summary: D support for %{name}
+BuildRequires: ldc
+
+%description -n d-%{name}
+The d-%{name} package contains D bindings for %{name}.
+%endif
+
+%if 0%{?want_php} != 0
+%package -n php-%{name}
+Summary: PHP support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
+Requires: php(language) >= 5.3.0
+Requires: php-date
+Requires: php-json
+BuildRequires: php-devel
+
+%description -n php-%{name}
+The php-%{name} package contains PHP bindings for %{name}.
+%endif
+
+%package -n lib%{name}-javadoc
+Summary: API documentation for java-%{name}
+Requires: lib%{name}-java = %{version}-%{release}
+BuildArch: noarch
+
+%description -n lib%{name}-javadoc
+The lib%{name}-javadoc package contains API documentation for the
+Java bindings for %{name}.
+
+%package -n lib%{name}-java
+Summary: Java support for %{name}
+
+BuildRequires: apache-commons-codec
+BuildRequires: apache-commons-lang
+BuildRequires: apache-commons-logging
+BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core
+BuildRequires: java-devel
+BuildRequires: javapackages-tools
+BuildRequires: javapackages-local
+BuildRequires: junit
+BuildRequires: log4j
+BuildRequires: slf4j
+# javax.servlet-api 3.1.0 is provided by glassfish-servlet-api
+BuildRequires: mvn(javax.servlet:javax.servlet-api) = 3.1.0
+
+Requires: java-headless >= 1:1.6.0
+Requires: javapackages-tools
+Requires: mvn(org.slf4j:slf4j-api)
+Requires: mvn(commons-lang:commons-lang)
+Requires: mvn(org.apache.httpcomponents:httpclient)
+Requires: mvn(org.apache.httpcomponents:httpcore)
+BuildArch: noarch
+
+%description -n lib%{name}-java
+The lib%{name}-java package contains Java bindings for %{name}.
+
+%if 0%{?want_ruby} > 0
+%package -n ruby-%{name}
+Summary: Ruby support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: ruby(release)
+BuildRequires: ruby-devel
+
+%description -n ruby-%{name}
+The ruby-%{name} package contains Ruby bindings for %{name}.
+%endif
+
+%if 0%{?want_erlang} > 0
+%package -n erlang-%{name}
+Summary: Erlang support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: erlang
+Requires: erlang-jsx
+BuildRequires: erlang
+BuildRequires: erlang-rebar
+
+%description -n erlang-%{name}
+The erlang-%{name} package contains Erlang bindings for %{name}.
+%endif
+
+%package -n fb303
+Summary: Basic interface for Thrift services
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description -n fb303
+fb303 is the shared root of all Thrift services; it provides a
+standard interface to monitoring, dynamic options and configuration,
+uptime reports, activity, etc.
+
+%package -n fb303-devel
+Summary: Development files for fb303
+Requires: fb303%{?_isa} = %{version}-%{release}
+
+%description -n fb303-devel
+The fb303-devel package contains header files for fb303
+
+%package -n python3-fb303
+Summary: Python 3 bindings for fb303
+Requires: fb303%{?_isa} = %{version}-%{release}
+BuildRequires: python3-devel
+Obsoletes: python-fb303 < 0.10.0-1%{?dist}
+Obsoletes: python2-fb303 < 0.10.0-14%{?dist}
+
+%description -n python3-fb303
+The python3-fb303 package contains Python bindings for fb303.
+
+%package -n fb303-java
+Summary: Java bindings for fb303
+Requires: java-headless >= 1:1.6.0
+Requires: javapackages-tools
+Requires: mvn(org.slf4j:slf4j-api)
+Requires: mvn(commons-lang:commons-lang)
+Requires: mvn(org.apache.httpcomponents:httpclient)
+Requires: mvn(org.apache.httpcomponents:httpcore)
+BuildArch: noarch
+
+%description -n fb303-java
+The fb303-java package contains Java bindings for fb303.
+
+%prep
+%autosetup -p1
+
+%{?!el5:sed -i -e 's/^AC_PROG_LIBTOOL/LT_INIT/g' configure.ac}
+
+# avoid spurious executable permissions in debuginfo package
+find . -name \*.cpp -or -name \*.cc -or -name \*.h | xargs -r chmod 644
+
+cp -p %{SOURCE2} bootstrap.sh
+
+# work around linking issues
+echo 'libthrift_c_glib_la_LIBADD = $(GLIB_LIBS) $(GOBJECT_LIBS) -L../cpp/.libs '
>> lib/c_glib/Makefile.am
+echo 'libthriftqt_la_LIBADD = $(QT_LIBS) -lthrift -L.libs' >>
lib/cpp/Makefile.am
+echo 'libthriftz_la_LIBADD = $(ZLIB_LIBS) -lthrift -L.libs' >>
lib/cpp/Makefile.am
+echo 'EXTRA_libthriftqt_la_DEPENDENCIES = libthrift.la' >>
lib/cpp/Makefile.am
+echo 'EXTRA_libthriftz_la_DEPENDENCIES = libthrift.la' >>
lib/cpp/Makefile.am
+
+# echo 'libfb303_so_LIBADD = -lthrift -L../../../lib/cpp/.libs' >>
contrib/fb303/cpp/Makefile.am
+
+sed -i 's|libfb303_so_LDFLAGS = $(SHARED_LDFLAGS)|libfb303_so_LDFLAGS =
$(SHARED_LDFLAGS) -lthrift -L../../../lib/cpp/.libs -Wl,--as-needed|g'
contrib/fb303/cpp/Makefile.am
+
+# fix broken upstream check for ant version; we enforce this with BuildRequires, so no
need to check here
+sed -i 's|ANT_VALID=.*|ANT_VALID=1|' aclocal/ax_javac_and_java.m4
+sed -i 's|ANT_VALID=.*|ANT_VALID=1|' contrib/fb303/aclocal/ax_javac_and_java.m4
+
+%build
+export PY_PREFIX=%{_prefix}
+export PERL_PREFIX=%{_prefix}
+export PHP_PREFIX=%{php_extdir}
+export JAVA_PREFIX=%{_javadir}
+export RUBY_PREFIX=%{_prefix}
+export GLIB_LIBS=$(pkg-config --libs glib-2.0)
+export GLIB_CFLAGS=$(pkg-config --cflags glib-2.0)
+export GOBJECT_LIBS=$(pkg-config --libs gobject-2.0)
+export GOBJECT_CFLAGS=$(pkg-config --cflags gobject-2.0)
+
+find %{_builddir} -name rebar -exec rm -f '{}' \;
+find . -name Makefile\* -exec sed -i -e 's/[.][/]rebar/rebar/g' {} \;
+
+# install javadocs in proper places
+sed -i
's|-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java|-Dinstall.javadoc.path=$(DESTDIR)%{_javadocdir}/%{name}|'
lib/java/Makefile.*
+
+# build a jar without a version number
+sed -i 's|${thrift.artifactid}-${version}|${thrift.artifactid}|'
lib/java/build.xml
+
+# Proper permissions for Erlang files
+sed -i 's|$(INSTALL) $$p|$(INSTALL) --mode 644 $$p|g' lib/erl/Makefile.am
+
+# Build fb303 jars against the in-situ copy of thrift
+sed -i 's|$(thrift_home)/bin/thrift|../../../compiler/cpp/thrift|g' \
+ contrib/fb303/cpp/Makefile.am \
+ contrib/fb303/py/Makefile.am
+
+sed -i 's|$(prefix)/lib$|%{_libdir}|g' contrib/fb303/cpp/Makefile.am
+
+sed -i 's|$(thrift_home)/include/thrift|../../../lib/cpp/src|g' \
+ contrib/fb303/cpp/Makefile.am
+
+# Create a straightforward makefile for Java fb303
+echo "all:
+ ant
+install: build/libfb303.jar
+ mkdir -p %{buildroot}%{_javadir}
+ /usr/bin/install -c -m 644 build/libfb303.jar %{buildroot}%{_javadir}
+" > contrib/fb303/java/Makefile
+
+sh ./bootstrap.sh
+
+# use unversioned doc dirs where appropriate (via _pkgdocdir macro)
+export PYTHON=%{_bindir}/python3
+%configure --disable-dependency-tracking --disable-static --with-boost=/usr
%{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} --with-py3
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+
+# eliminate unused direct shlib dependencies
+sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool
+
+make %{?_smp_mflags}
+
+# build fb303
+(
+ cd contrib/fb303
+ sed -i '/^[.][/]configure.*/d' bootstrap.sh
+ sh bootstrap.sh
+ %configure --disable-static --with-java --without-php --with-py3 --libdir=%{_libdir}
+ make %{?_smp_mflags}
+ (
+ cd java
+ ant dist
+ )
+)
+
+%install
+%make_install
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name fastbinary.so | xargs -r chmod 755
+find %{buildroot} -name \*.erl -or -name \*.hrl -or -name \*.app | xargs -r chmod 644
+
+# Remove javadocs jar
+find %{buildroot}/%{_javadir} -name lib%{name}-javadoc.jar -exec rm -f '{}' \;
+
+# Add POM file and depmap
+mkdir -p %{buildroot}%{_mavenpomdir}
+
+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-libthrift.pom
+
+%add_maven_depmap JPP-libthrift.pom libthrift.jar
+
+# Remove bundled jar files
+find %{buildroot} -name \*.jar -a \! -name \*thrift\* -exec rm -f '{}' \;
+
+# Move perl files into appropriate places
+find %{buildroot} -name \*.pod -exec rm -f '{}' \;
+find %{buildroot} -name .packlist -exec rm -f '{}' \;
+find %{buildroot}/usr/lib/perl5 -type d -empty -delete
+mkdir -p %{buildroot}/%{perl_vendorlib}/
+mv %{buildroot}/usr/lib/perl5/* %{buildroot}/%{perl_vendorlib}
+
+%if 0%{?want_php} != 0
+
+# Move arch-independent php files into the appropriate place
+mkdir -p %{buildroot}/%{_datadir}/php/
+mv %{buildroot}/%{php_extdir}/Thrift %{buildroot}/%{_datadir}/php/
+%endif # want_php
+
+# Fix permissions on Thread.h
+find %{buildroot} -name Thread.h -exec chmod a-x '{}' \;
+
+# install fb303
+(
+ cd contrib/fb303
+ make DESTDIR=%{buildroot} install
+ (
+ cd java
+ ant -Dinstall.path=%{buildroot}%{_javadir}
-Dinstall.javadoc.path=%{buildroot}%{_javadocdir}/fb303 install
+ )
+)
+
+# install maven pom and depmaps for fb303
+install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-libfb303.pom
+%add_maven_depmap JPP-libfb303.pom libfb303.jar -f "fb303"
+
+# Ensure all python scripts are executable
+find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod
755
+
+%ldconfig_scriptlets
+
+%files
+%doc LICENSE NOTICE
+%{_bindir}/thrift
+%{_libdir}/libthrift-%{version}.so
+%{_libdir}/libthriftz-%{version}.so
+%{_libdir}/libthriftnb-%{version}.so
+
+%files glib
+%{_libdir}/libthrift_c_glib.so
+%{_libdir}/libthrift_c_glib.so.*
+
+%files qt
+%{_libdir}/libthriftqt.so
+%{_libdir}/libthriftqt-%{version}.so
+
+%files devel
+%{_includedir}/thrift
+%exclude %{_includedir}/thrift/fb303
+%{_libdir}/*.so
+%{_libdir}/*.so.0
+%{_libdir}/*.so.0.0.0
+%exclude %{_libdir}/lib*-%{version}.so
+%exclude %{_libdir}/libfb303.so
+%{_libdir}/pkgconfig/thrift-z.pc
+%{_libdir}/pkgconfig/thrift-qt.pc
+%{_libdir}/pkgconfig/thrift-nb.pc
+%{_libdir}/pkgconfig/thrift.pc
+%{_libdir}/pkgconfig/thrift_c_glib.pc
+%doc LICENSE NOTICE
+
+%files -n perl-%{name}
+%{perl_vendorlib}/Thrift
+%{perl_vendorlib}/Thrift.pm
+%doc LICENSE NOTICE
+
+%if 0%{?want_php} != 0
+%files -n php-%{name}
+%config(noreplace) /etc/php.d/thrift_protocol.ini
+%{_datadir}/php/Thrift/
+%{php_extdir}/thrift_protocol.so
+%doc LICENSE NOTICE
+%endif
+
+%if %{?want_erlang} > 0
+%files -n erlang-%{name}
+%{_libdir}/erlang/lib/%{name}-%{version}/
+%doc LICENSE NOTICE
+%endif
+
+%files -n python3-%{name}
+%{python3_sitearch}/%{name}
+%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
+%doc LICENSE NOTICE
+
+%files -n lib%{name}-javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
+
+%files -n lib%{name}-java -f .mfiles
+%doc LICENSE NOTICE
+
+%files -n fb303
+%{_datarootdir}/fb303
+%doc LICENSE NOTICE
+
+%files -n fb303-devel
+%{_libdir}/libfb303.so
+%{_includedir}/thrift/fb303
+%doc LICENSE NOTICE
+
+%files -n python3-fb303
+%{python3_sitelib}/fb303
+%{python3_sitelib}/fb303_scripts
+%{python3_sitelib}/%{name}_fb303-%{version}-py%{python3_version}.egg-info
+%doc LICENSE NOTICE
+
+%files -n fb303-java -f .mfiles-fb303
+%doc LICENSE NOTICE
+
+%changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-18
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Jun 01 2019 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-17
+- Perl 5.30 rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-16
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jul 18 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-15
+- Rebuild to address transient error
+
+* Wed Jul 18 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-14
+- Migrate to python3; rhbz#1533306
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-13
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 29 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-12
+- Perl 5.28 rebuild
+
+* Wed May 30 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-11
+- Fix FTBFS; update servlet-api dependency (rhbz#1581175)
+
+* Thu Mar 08 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-10
+- Add gcc-c++ BuildRequires
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Dec 22 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-8
+- Fix for rhbz#1507518
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 06 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-5
+- Fix FTBFS in rawhide: add BR javapackages-local
+
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-4
+- Perl 5.26 rebuild
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.10.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
+* Mon Mar 13 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-2
+- Build TNonblockingServer, remove useless man page, and use java-headless
+
+* Tue Mar 07 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-1
+- Update to thrift 0.10.0
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.9.1-17.6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-17.5
+-
https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
+
+* Tue May 17 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-17.4
+- Perl 5.24 rebuild
+
+* Wed Mar 30 2016 Petr Pisar <ppisar(a)redhat.com> - 0.9.1-17.3
+- Adapt to GCC 6 (bug #1306671)
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.9.1-17.2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Jan 16 2016 Jonathan Wakely <jwakely(a)redhat.com> - 0.9.1-17.1
+- Rebuilt for Boost 1.60
+
+* Mon Nov 23 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.9.1-17
+- Fix release
+
+* Wed Oct 21 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.9.1-16.6
+- Backport THRIFT-2214 fix to get package built on aarch64.
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 0.9.1-16.5
+- Rebuilt for Boost 1.59
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-16.4
+- Rebuilt for
https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 0.9.1-16.3
+- rebuild for Boost 1.58
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-16.2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Jun 06 2015 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-16.1
+- Perl 5.22 rebuild
+
+* Fri Apr 24 2015 Michal Srb <msrb(a)redhat.com> - 0.9.1-16
+- Fix FTBFS (Resolves: rhbz#1195364)
+
+* Mon Apr 20 2015 Will Benton <willb(a)redhat.com> - 0.9.1-15
+- Dropped Erlang support for F22 and above, since erlang-jsx is orphaned
+
+* Wed Apr 8 2015 Hakel Gumar <hguemar(a)fedoraproject.org> - 0.9.1-14
+- Split Qt4/GLib runtimes into separate subpackages
+- Drop mono support, it's broken and not even shipped (and it pulls mono-core)
+
+* Mon Jan 26 2015 Petr Machata <pmachata(a)redhat.com> - 0.9.1-13.3
+- Rebuild for boost 1.57.0
+* Thu Aug 28 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-13.2
+- Perl 5.20 rebuild
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-13.1
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Jun 27 2014 Petr Pisar <ppisar(a)redhat.com> - 0.9.1-13
+- Use add_maven_depmap-generated file lists (bug #1107448)
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-12.2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 23 2014 Petr Machata <pmachata(a)redhat.com> - 0.9.1-12.1
+- Rebuild for boost 1.55.0
+
+* Mon May 05 2014 Lubomir Rintel <lkundrak(a)v3.sk> - 0.9.1-12
+- Fix EPEL build
+
+* Fri Feb 21 2014 willb <willb@redhat> - 0.9.1-11
+- fix BZ 1068561
+
+* Fri Dec 20 2013 willb <willb@redhat> - 0.9.1-10
+- fix BZ 1045544
+
+* Wed Oct 16 2013 willb <willb@redhat> - 0.9.1-9
+- Remove spurious dependencies
+- Move some versioned shared libraries from -devel
+
+* Wed Oct 16 2013 Dan Hork <dan[at]danny.cz> - 0.9.1-8
+- Mono available only on selected arches
+
+* Sun Oct 13 2013 willb <willb@redhat> - 0.9.1-7
+- minor specfile cleanups
+
+* Fri Oct 11 2013 willb <willb@redhat> - 0.9.1-6
+- added thrift man page
+- integrated fb303
+- fixed many fb303 library dependency problems
+
+* Tue Oct 1 2013 willb <willb@redhat> - 0.9.1-5
+- fixed extension library linking when an older thrift package is not
+ already installed
+- fixed extension library dependencies in Makefile
+
+* Tue Oct 1 2013 willb <willb@redhat> - 0.9.1-4
+- addresses rpmlint warnings and errors
+- properly links glib, qt, and z extension libraries
+
+* Mon Sep 30 2013 willb <willb@redhat> - 0.9.1-3
+- adds QT support
+- clarified multiple licensing
+- uses parallel make
+- removes obsolete M4 macros
+- specifies canonical location for source archive
+
+* Tue Sep 24 2013 willb <willb@redhat> - 0.9.1-2
+- fixes for i686
+- fixes bogus requires for Java package
+
+* Fri Sep 20 2013 willb <willb@redhat> - 0.9.1-1
+- updated to upstream version 0.9.1
+- disables PHP support, which FTBFS in this version
+
+* Fri Sep 20 2013 willb <willb@redhat> - 0.9.0-5
+- patch build xml to generate unversioned jars instead of moving after the fact
+- unversioned doc dirs on Fedora versions where this is appropriate
+- replaced some stray hardcoded paths with macros
+- thanks to Gil for the above observations and suggestions for fixes
+
+* Thu Aug 22 2013 willb <willb@redhat> - 0.9.0-4
+- removed version number from jar name (obs pmackinn)
+
+* Thu Aug 22 2013 willb <willb@redhat> - 0.9.0-3
+- Fixes for F19 and Erlang support
+
+* Thu Aug 15 2013 willb <willb@redhat> - 0.9.0-2
+- Incorporates feedback from comments on review request
+
+* Mon Jul 1 2013 willb <willb@redhat> - 0.9.0-1
+- Initial package
commit 3f15a694dbea566c94faff611bfcb8c87572c552
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 16:44:55 2019 +0000
thrift fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1676140
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f5a770c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/0.9.1.tar.gz
-/thrift-0.10.0.tar.gz
diff --git a/THRIFT-4177.patch b/THRIFT-4177.patch
deleted file mode 100644
index c0c331b..0000000
--- a/THRIFT-4177.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc
b/compiler/cpp/src/thrift/generate/t_java_generator.cc
-index fb581e4..90dfa06 100644
---- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
-+++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
-@@ -4657,8 +4657,9 @@ void
t_java_generator::generate_deep_copy_non_container(ofstream& out,
- std::string dest_name,
- t_type* type) {
- (void)dest_name;
-+ type = get_true_type(type);
- if (type->is_base_type() || type->is_enum() || type->is_typedef()) {
-- if (((t_base_type*)type)->is_binary()) {
-+ if (type->is_binary()) {
- out << "org.apache.thrift.TBaseHelper.copyBinary(" <<
source_name << ")";
- } else {
- // everything else can be copied directly
-diff --git a/compiler/cpp/src/thrift/parse/t_type.h
b/compiler/cpp/src/thrift/parse/t_type.h
-index 30f8c1f7..3a6d1e04 100644
---- a/compiler/cpp/src/thrift/parse/t_type.h
-+++ b/compiler/cpp/src/thrift/parse/t_type.h
-@@ -47,6 +47,7 @@ public:
- virtual bool is_void() const { return false; }
- virtual bool is_base_type() const { return false; }
- virtual bool is_string() const { return false; }
-+ virtual bool is_binary() const { return false; }
- virtual bool is_bool() const { return false; }
- virtual bool is_typedef() const { return false; }
- virtual bool is_enum() const { return false; }
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100644
index 52ecda4..0000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#
http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-./cleanup.sh
-if test -d lib/php/src/ext/thrift_protocol ; then
- if phpize -v >/dev/null 2>/dev/null ; then
- (cd lib/php/src/ext/thrift_protocol && phpize)
- fi
-fi
-
-set -e
-
-# libtoolize is called "glibtoolize" on OSX.
-if libtoolize --version 1 >/dev/null 2>/dev/null; then
- LIBTOOLIZE=libtoolize
-elif glibtoolize --version 1 >/dev/null 2>/dev/null; then
- LIBTOOLIZE=glibtoolize
-else
- echo >&2 "Couldn't find libtoolize!"
- exit 1
-fi
-
-# we require automake 1.13 or later
-# check must happen externally due to use of newer macro
-AUTOMAKE_VERSION=`automake --version | grep automake | egrep -o
'([0-9]{1,}\.)+[0-9]{1,}'`
-if [ "$AUTOMAKE_VERSION" \< "1.13" ]; then
- echo >&2 "automake version $AUTOMAKE_VERSION is too old (need 1.13 or
later)"
- exit 1
-fi
-
-autoscan
-$LIBTOOLIZE --copy --automake
-aclocal -I ./aclocal
-autoheader
-autoconf
-automake --copy --add-missing --foreign
diff --git a/configure-java-prefix.patch b/configure-java-prefix.patch
deleted file mode 100644
index ebd542f..0000000
--- a/configure-java-prefix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0972abf..77107fc 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,10 +34,7 @@ AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
- AS_IF([test "x$PY_PREFIX" = x], [PY_PREFIX="/usr"])
-
- AC_ARG_VAR([JAVA_PREFIX], [Prefix for installing the Java lib jar.
-- Default = "/usr/local/lib"])
--AS_IF([test "x$JAVA_PREFIX" != x],
[JAVA_PREFIX="$JAVA_PREFIX/usr/local/lib"],
-- [test "x$PREFIX" != x],
[JAVA_PREFIX="$PREFIX/usr/local/lib"],
-- [JAVA_PREFIX="/usr/local/lib"])
-+ Default = "/usr/share/java"])
-
- AC_ARG_VAR([RUBY_PREFIX], [Prefix for installing Ruby modules.
- (Normal --prefix is ignored for Ruby because
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..3838ac0
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+thrift fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1676140
diff --git a/fb303-0.10.0-buildxml.patch b/fb303-0.10.0-buildxml.patch
deleted file mode 100644
index eb3825a..0000000
--- a/fb303-0.10.0-buildxml.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml
-index 8f2fa51..d89f05e 100755
---- a/contrib/fb303/java/build.xml
-+++ b/contrib/fb303/java/build.xml
-@@ -17,8 +17,7 @@
- specific language governing permissions and limitations
- under the License.
- -->
--<project name="libfb303" default="dist" basedir="."
-- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-+<project name="libfb303" default="dist"
basedir=".">
-
- <!-- project wide settings. All directories relative to basedir -->
- <property name="thrift.root"
location="${basedir}/../../../"/>
-@@ -38,8 +37,8 @@
- </condition>
- <property name="version"
value="${thrift.version}-snapshot"/>
-
-- <property name="fb303.final.name"
value="${fb303.artifactid}-${version}"/>
-- <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift-${version}.jar"/>
-+ <property name="fb303.final.name"
value="${fb303.artifactid}"/>
-+ <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift.jar"/>
-
- <property name="src" value="${basedir}/src"/>
- <property name="gen" value="${basedir}/gen-java"/>
-@@ -50,7 +49,7 @@
- <property name="fb303.jar.file"
location="${build.dir}/${fb303.final.name}.jar"/>
- <property name="fb303.pom.xml"
location="${build.dir}/${fb303.final.name}.pom"/>
-
-- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
-+ <target name="init" depends="setup.init"
unless="init.finished">
- <property name="init.finished" value="true"/>
- </target>
-
-@@ -72,13 +71,21 @@
- <!-- compile the base and thrift generated code and jar them -->
- <target name="dist" depends="init,generate">
- <echo message="Building ${fb303.final.name}.jar"/>
-- <javac destdir="${build.classes.dir}" debug="on">
-+ <javac destdir="${build.classes.dir}" debug="on"
includeantruntime="false" >
- <classpath>
- <pathelement location="${thrift.java.libthrift}"/>
-- <fileset dir="${thrift.root}/lib/java/build/lib">
-- <include name="*.jar"/>
-- </fileset>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="glassfish-servlet-api.jar"/>
-+ </fileset>
- </classpath>
-+
- <src path="${src}"/>
- <src path="${gen}"/>
- <include name="**/*.java"/>
-@@ -99,97 +106,4 @@
- <delete dir="${build.dir}"/>
- <delete dir="${gen}"/>
- </target>
--
-- <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check"
unless="mvn.ant.tasks.found">
-- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
-- </target>
--
-- <target name="mvn.ant.tasks.check">
-- <condition property="mvn.ant.tasks.found">
-- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
-- </condition>
-- </target>
--
-- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
-- <echo message="${mvn.ant.task.jar}"/>
-- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
-- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
--
-- <!-- remote repositories used to download dependencies from -->
-- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
-- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
--
-- <!-- Pom file information -->
-- <artifact:pom id="pom"
-- groupId="${thrift.groupid}"
-- artifactId="${fb303.artifactid}"
-- version="${version}"
-- url="http://thrift.apache.org"
-- name="Apache Thrift"
-- description="Thrift is a software framework for scalable cross-language
services development."
-- packaging="pom"
-- >
-- <remoteRepository refid="central"/>
-- <remoteRepository refid="apache"/>
-- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
-- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
--
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
--
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
-- />
-- <!-- Thrift Developers -->
-- <developer id="mcslee" name="Mark Slee"/>
-- <developer id="dreiss" name="David Reiss"/>
-- <developer id="aditya" name="Aditya Agarwal"/>
-- <developer id="marck" name="Marc Kwiatkowski"/>
-- <developer id="jwang" name="James Wang"/>
-- <developer id="cpiro" name="Chris Piro"/>
-- <developer id="bmaurer" name="Ben Maurer"/>
-- <developer id="kclark" name="Kevin Clark"/>
-- <developer id="jake" name="Jake Luciani"/>
-- <developer id="bryanduxbury" name="Bryan Duxbury"/>
-- <developer id="esteve" name="Esteve Fernandez"/>
-- <developer id="todd" name="Todd Lipcon"/>
-- <developer id="geechorama" name="Andrew McGeachie"/>
-- <developer id="molinaro" name="Anthony Molinaro"/>
-- <developer id="roger" name="Roger Meier"/>
-- <developer id="jfarrell" name="Jake Farrell"/>
-- <developer id="jensg" name="Jens Geyer"/>
-- <developer id="carl" name="Carl Yeksigian"/>
--
-- <!-- Thrift dependencies list -->
-- <dependency groupId="org.apache.thrift"
artifactId="libthrift" version="${version}"/>
-- </artifact:pom>
--
-- <!-- Generate the pom file -->
-- <artifact:writepom pomRefId="pom"
file="${fb303.pom.xml}"/>
--
-- <property name="mvn.finished" value="true"/>
-- </target>
--
-- <macrodef name="signAndDeploy">
-- <!-- Sign and deploy jars to apache repo -->
-- <attribute name="file"/>
-- <attribute name="classifier" default=""/>
-- <attribute name="packaging" default="jar"/>
-- <attribute name="pom" default=""/>
-- <sequential>
-- <artifact:mvn fork="true">
-- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
-- <arg value="-DrepositoryId=${maven-repository-id}"/>
-- <arg value="-Durl=${maven-repository-url}"/>
-- <arg value="-DpomFile=@{pom}"/>
-- <arg value="-Dfile=@{file}"/>
-- <arg value="-Dclassifier=@{classifier}"/>
-- <arg value="-Dpackaging=@{packaging}"/>
-- <arg value="-Pgpg"/>
-- </artifact:mvn>
-- </sequential>
-- </macrodef>
--
-- <target name="publish" depends="clean,dist">
-- <!-- Compile, packages and then send release to apache maven repo -->
-- <!-- run with: ant -Drelease=true publish-->
-- <signAndDeploy file="${fb303.pom.xml}" packaging="pom"
classifier="" pom="${fb303.pom.xml}"/>
-- <signAndDeploy file="${fb303.jar.file}" packaging="jar"
classifier="" pom="${fb303.pom.xml}"/>
-- </target>
- </project>
diff --git a/fix-ppc64le-builds.patch b/fix-ppc64le-builds.patch
deleted file mode 100644
index f56ad86..0000000
--- a/fix-ppc64le-builds.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/aclocal/ax_boost_base.m4 b/aclocal/ax_boost_base.m4
-index b496020..30ee0df 100644
---- a/aclocal/ax_boost_base.m4
-+++ b/aclocal/ax_boost_base.m4
-@@ -92,7 +92,7 @@ if test "x$want_boost" = "xyes"; then
- libsubdirs="lib"
- ax_arch=`uname -m`
- case $ax_arch in
-- x86_64|ppc64|s390x|sparc64|aarch64)
-+ x86_64|ppc64|ppc64le|s390x|sparc64|aarch64)
- libsubdirs="lib64 lib lib64"
- ;;
- esac
diff --git a/libfb303-0.10.0.pom b/libfb303-0.10.0.pom
deleted file mode 100644
index c3fddde..0000000
--- a/libfb303-0.10.0.pom
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libfb303</artifactId>
- <version>0.10.0</version>
- <packaging>pom</packaging>
- <name>Apache Thrift</name>
- <description>Thrift is a software framework for scalable cross-language services
development.</description>
- <url>http://thrift.apache.org</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- <developers>
- <developer>
- <id>mcslee</id>
- <name>Mark Slee</name>
- </developer>
- <developer>
- <id>dreiss</id>
- <name>David Reiss</name>
- </developer>
- <developer>
- <id>aditya</id>
- <name>Aditya Agarwal</name>
- </developer>
- <developer>
- <id>marck</id>
- <name>Marc Kwiatkowski</name>
- </developer>
- <developer>
- <id>jwang</id>
- <name>James Wang</name>
- </developer>
- <developer>
- <id>cpiro</id>
- <name>Chris Piro</name>
- </developer>
- <developer>
- <id>bmaurer</id>
- <name>Ben Maurer</name>
- </developer>
- <developer>
- <id>kclark</id>
- <name>Kevin Clark</name>
- </developer>
- <developer>
- <id>jake</id>
- <name>Jake Luciani</name>
- </developer>
- <developer>
- <id>bryanduxbury</id>
- <name>Bryan Duxbury</name>
- </developer>
- <developer>
- <id>esteve</id>
- <name>Esteve Fernandez</name>
- </developer>
- <developer>
- <id>todd</id>
- <name>Todd Lipcon</name>
- </developer>
- <developer>
- <id>geechorama</id>
- <name>Andrew McGeachie</name>
- </developer>
- <developer>
- <id>molinaro</id>
- <name>Anthony Molinaro</name>
- </developer>
- <developer>
- <id>roger</id>
- <name>Roger Meier</name>
- </developer>
- <developer>
- <id>jfarrell</id>
- <name>Jake Farrell</name>
- </developer>
- <developer>
- <id>jensg</id>
- <name>Jens Geyer</name>
- </developer>
- <developer>
- <id>carl</id>
- <name>Carl Yeksigian</name>
- </developer>
- </developers>
- <scm>
-
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
-
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
- <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.10.0</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/libthrift-0.10.0.pom b/libthrift-0.10.0.pom
deleted file mode 100644
index 7c5f61d..0000000
--- a/libthrift-0.10.0.pom
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.10.0</version>
- <packaging>pom</packaging>
- <name>Apache Thrift</name>
- <description>Thrift is a software framework for scalable cross-language services
development.</description>
- <url>http://thrift.apache.org</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- <developers>
- <developer>
- <id>mcslee</id>
- <name>Mark Slee</name>
- </developer>
- <developer>
- <id>dreiss</id>
- <name>David Reiss</name>
- </developer>
- <developer>
- <id>aditya</id>
- <name>Aditya Agarwal</name>
- </developer>
- <developer>
- <id>marck</id>
- <name>Marc Kwiatkowski</name>
- </developer>
- <developer>
- <id>jwang</id>
- <name>James Wang</name>
- </developer>
- <developer>
- <id>cpiro</id>
- <name>Chris Piro</name>
- </developer>
- <developer>
- <id>bmaurer</id>
- <name>Ben Maurer</name>
- </developer>
- <developer>
- <id>kclark</id>
- <name>Kevin Clark</name>
- </developer>
- <developer>
- <id>jake</id>
- <name>Jake Luciani</name>
- </developer>
- <developer>
- <id>bryanduxbury</id>
- <name>Bryan Duxbury</name>
- </developer>
- <developer>
- <id>esteve</id>
- <name>Esteve Fernandez</name>
- </developer>
- <developer>
- <id>todd</id>
- <name>Todd Lipcon</name>
- </developer>
- <developer>
- <id>geechorama</id>
- <name>Andrew McGeachie</name>
- </developer>
- <developer>
- <id>molinaro</id>
- <name>Anthony Molinaro</name>
- </developer>
- <developer>
- <id>roger</id>
- <name>Roger Meier</name>
- </developer>
- <developer>
- <id>jfarrell</id>
- <name>Jake Farrell</name>
- </developer>
- <developer>
- <id>jensg</id>
- <name>Jens Geyer</name>
- </developer>
- <developer>
- <id>carl</id>
- <name>Carl Yeksigian</name>
- </developer>
- </developers>
- <scm>
-
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
-
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
- <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.12</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.1</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/python3.patch b/python3.patch
deleted file mode 100644
index c2908fd..0000000
--- a/python3.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
b/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
-index 4b1c257..df1c8cc 100644
---- a/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
-+++ b/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
-@@ -57,24 +57,24 @@ def service_ctrl(
- msg = fb_status_string(status)
- if (len(status_details)):
- msg += " - %s" % status_details
-- print msg
-+ print(msg)
-
- if (status == fb_status.ALIVE):
- return 2
- else:
- return 3
- except:
-- print "Failed to get status"
-+ print("Failed to get status")
- return 3
-
- # scalar commands
- if command in ["version", "alive", "name"]:
- try:
- result = fb303_wrapper(command, port, trans_factory, prot_factory)
-- print result
-+ print(result)
- return 0
- except:
-- print "failed to get ", command
-+ print("failed to get ", command)
- return 3
-
- # counters
-@@ -82,10 +82,10 @@ def service_ctrl(
- try:
- counters = fb303_wrapper('counters', port, trans_factory,
prot_factory)
- for counter in counters:
-- print "%s: %d" % (counter, counters[counter])
-+ print("%s: %d" % (counter, counters[counter]))
- return 0
- except:
-- print "failed to get counters"
-+ print("failed to get counters")
- return 3
-
- # Only root should be able to run the following commands
-@@ -96,19 +96,19 @@ def service_ctrl(
- fb303_wrapper(command, port, trans_factory, prot_factory)
- return 0
- except:
-- print "failed to tell the service to ", command
-+ print("failed to tell the service to ", command)
- return 3
- else:
- if command in ["stop", "reload"]:
-- print "root privileges are required to stop or reload the
service."
-+ print("root privileges are required to stop or reload the
service.")
- return 4
-
-- print "The following commands are available:"
-+ print("The following commands are available:")
- for command in ["counters", "name", "version",
"alive", "status"]:
-- print "\t%s" % command
-- print "The following commands are available for users with root
privileges:"
-+ print("\t%s" % command)
-+ print("The following commands are available for users with root
privileges:")
- for command in ["stop", "reload"]:
-- print "\t%s" % command
-+ print("\t%s" % command)
-
- return 0
-
diff --git a/sources b/sources
deleted file mode 100644
index f7d47e8..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (thrift-0.10.0.tar.gz) =
3695cf0fb0e4080b02446ab694fb61476997d8b181942dd6fe1e3e7cf0dcf990b4184ea33f9d0bc290b96200f702cf1ac1579e36b6b5bfe9ba8914b2d2938ddc
diff --git a/thrift-0.10.0-buildxml.patch b/thrift-0.10.0-buildxml.patch
deleted file mode 100644
index 8931c03..0000000
--- a/thrift-0.10.0-buildxml.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff --git a/lib/java/build.xml b/lib/java/build.xml
-index 40e5284..db1ce54 100644
---- a/lib/java/build.xml
-+++ b/lib/java/build.xml
-@@ -17,8 +17,7 @@
- specific language governing permissions and limitations
- under the License.
- -->
--<project name="libthrift" default="dist" basedir="."
-- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-+<project name="libthrift" default="dist"
basedir=".">
-
- <description>Thrift Build File</description>
- <property name="thrift.root" location="../../"/>
-@@ -67,8 +66,15 @@
- <property name="pom.xml"
location="${build.dir}/${final.name}.pom"/>
-
- <path id="compile.classpath">
-- <fileset dir="${build.lib.dir}">
-- <include name="**/*.jar"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="glassfish-servlet-api.jar"/>
- </fileset>
- </path>
-
-@@ -78,11 +84,14 @@
- <pathelement location="${build.test.dir}"/>
- <pathelement location="${jar.file}"/>
- <pathelement location="${test.jar.file}"/>
--
-+ <fileset dir="/usr/share/java">
-+ <include name="junit.jar"/>
-+ <include name="slf4j/log4j12.jar"/>
-+ </fileset>
- </path>
-
- <!-- Tasks -->
-- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
-+ <target name="init" depends="setup.init"
unless="init.finished">
- <property name="init.finished" value="true"/>
- </target>
-
-@@ -295,120 +304,12 @@
- </target>
-
- <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check,proxy"
unless="mvn.ant.tasks.found">
-- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
- </target>
-
- <target name="mvn.ant.tasks.check">
-- <condition property="mvn.ant.tasks.found">
-- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
-- </condition>
- </target>
-
-- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
-- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
-- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
--
-- <!-- remote repositories used to download dependencies from -->
-- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
-- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
--
-- <!-- Pom file information -->
-- <artifact:pom id="pom"
-- groupId="${thrift.groupid}"
-- artifactId="${thrift.artifactid}"
-- version="${version}"
-- url="http://thrift.apache.org"
-- name="Apache Thrift"
-- description="Thrift is a software framework for scalable cross-language
services development."
-- packaging="pom"
-- >
-- <remoteRepository refid="central"/>
-- <remoteRepository refid="apache"/>
-- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
-- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
--
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
--
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
-- />
-- <!-- Thrift Developers -->
-- <developer id="mcslee" name="Mark Slee"/>
-- <developer id="dreiss" name="David Reiss"/>
-- <developer id="aditya" name="Aditya Agarwal"/>
-- <developer id="marck" name="Marc Kwiatkowski"/>
-- <developer id="jwang" name="James Wang"/>
-- <developer id="cpiro" name="Chris Piro"/>
-- <developer id="bmaurer" name="Ben Maurer"/>
-- <developer id="kclark" name="Kevin Clark"/>
-- <developer id="jake" name="Jake Luciani"/>
-- <developer id="bryanduxbury" name="Bryan Duxbury"/>
-- <developer id="esteve" name="Esteve Fernandez"/>
-- <developer id="todd" name="Todd Lipcon"/>
-- <developer id="geechorama" name="Andrew McGeachie"/>
-- <developer id="molinaro" name="Anthony Molinaro"/>
-- <developer id="roger" name="Roger Meier"/>
-- <developer id="jfarrell" name="Jake Farrell"/>
-- <developer id="jensg" name="Jens Geyer"/>
-- <developer id="carl" name="Carl Yeksigian"/>
--
-- <!-- Thrift dependencies list -->
-- <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="${slf4j.version}"/>
-- <dependency groupId="javax.servlet"
artifactId="servlet-api" version="${servlet.version}"
scope="provided"/>
-- <dependency groupId="org.apache.httpcomponents"
artifactId="httpclient" version="${httpclient.version}"/>
-- <dependency groupId="org.apache.httpcomponents"
artifactId="httpcore" version="${httpcore.version}"/>
-- </artifact:pom>
--
-- <!-- Generate the pom file -->
-- <artifact:writepom pomRefId="pom" file="${pom.xml}"/>
--
-- <!-- Download the dependencies -->
-- <artifact:dependencies filesetId="build-dependency-jars"
pomRefId="pom"/>
--
-- <!-- Copy the dependencies to the build/lib dir -->
-- <copy todir="${build.dir}/lib">
-- <fileset refid="build-dependency-jars"/>
-- <mapper type="flatten"/>
-- </copy>
--
-- <!-- Dependencies needed for testing -->
-- <artifact:dependencies filesetId="test-dependency-jars"
useScope="runtime">
-- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12"
version="${slf4j.version}"/>
-- <dependency groupId="junit" artifactId="junit"
version="4.4"/>
-- </artifact:dependencies>
--
-- <!-- Copy the test dependencies to the build/lib dir -->
-- <copy todir="${build.dir}/lib">
-- <fileset refid="test-dependency-jars"/>
-- <mapper type="flatten"/>
-- </copy>
--
-- <property name="mvn.finished" value="true"/>
-+ <target name="mvn.init" unless="mvn.finished">
- </target>
-
-- <macrodef name="signAndDeploy">
-- <!-- Sign and deploy jars to apache repo -->
-- <attribute name="file"/>
-- <attribute name="classifier" default=""/>
-- <attribute name="packaging" default="jar"/>
-- <attribute name="pom" default=""/>
-- <sequential>
-- <artifact:mvn fork="true">
-- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file"/>
-- <arg value="-DrepositoryId=${maven-repository-id}"/>
-- <arg value="-Durl=${maven-repository-url}"/>
-- <arg value="-DpomFile=@{pom}"/>
-- <arg value="-Dfile=@{file}"/>
-- <arg value="-Dclassifier=@{classifier}"/>
-- <arg value="-Dpackaging=@{packaging}"/>
-- <arg value="-Pgpg"/>
-- </artifact:mvn>
-- </sequential>
-- </macrodef>
--
-- <target name="publish"
depends="clean,init,test,dist,javadoc,pack.src">
-- <!-- Compile, package, test and then send release to apache maven repo -->
-- <!-- run with: ant -Drelease=true publish-->
-- <signAndDeploy file="${pom.xml}" packaging="pom"
classifier="" pom="${pom.xml}"/>
-- <signAndDeploy file="${jar.file}" classifier=""
pom="${pom.xml}"/>
-- <signAndDeploy file="${javadoc.jar.file}"
classifier="javadoc" pom="${pom.xml}"/>
-- <signAndDeploy file="${source.jar.file}" classifier="sources"
pom="${pom.xml}"/>
-- </target>
- </project>
-diff --git a/tutorial/java/build.xml b/tutorial/java/build.xml
-index 7638d5b..c5ca703 100644
---- a/tutorial/java/build.xml
-+++ b/tutorial/java/build.xml
-@@ -29,13 +29,33 @@
- <include name="*.jar" />
- <exclude name="-test.jar" />
- </fileset>
-- <fileset dir="../../lib/java/build/lib">
-- <include name="*.jar" />
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="glassfish-servlet-api.jar"/>
- </fileset>
- </path>
- <path id="build.classpath">
-- <path refid="libs.classpath" />
- <pathelement path="${gen}" />
-+ <fileset dir="../../lib/java/build">
-+ <include name="*.jar" />
-+ <exclude name="-test.jar" />
-+ </fileset>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="glassfish-servlet-api.jar"/>
-+ </fileset>
- </path>
- <path id="tutorial.classpath">
- <path refid="build.classpath" />
-diff --git a/tutorial/js/build.xml b/tutorial/js/build.xml
-index a9a9ad4..2fddf0c 100644
---- a/tutorial/js/build.xml
-+++ b/tutorial/js/build.xml
-@@ -35,8 +35,16 @@
- <include name="*.jar" />
- <exclude name="-test.jar" />
- </fileset>
-- <fileset dir="../../lib/java/build/lib">
-- <include name="*.jar" />
-+
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="glassfish-servlet-api.jar"/>
- </fileset>
- </path>
- <path id="build.classpath">
diff --git a/thrift.spec b/thrift.spec
deleted file mode 100644
index 2787d7f..0000000
--- a/thrift.spec
+++ /dev/null
@@ -1,716 +0,0 @@
-%global php_extdir %(php-config --extension-dir 2>/dev/null || echo
"undefined")
-
-%{?perl_default_filter}
-%global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so|%{php_extdir}/.*\\.so)$
-
-%global have_mongrel 0
-
-# erlang-jsx is available in F19 but orphaned in F22
-%global have_jsx 0
-
-# We should be able to enable this in the future
-%global want_d 0
-
-# Thrift's Ruby support depends on Mongrel. Since Mongrel is
-# deprecated in Fedora, we can't support Ruby bindings for Thrift
-# unless and until Thrift is patched to use a different HTTP server.
-%if 0%{?have_mongrel} == 0
-%global ruby_configure --without-ruby
-%global with_ruby 0
-%else
-%global ruby_configure --with-ruby
-%global want_ruby 1
-%endif
-
-# Thrift's Erlang support depends on the JSX library, which is not
-# currently available in Fedora.
-
-%if 0%{?have_jsx} == 0
-%global erlang_configure --without-erlang
-%global want_erlang 0
-%else
-%global erlang_configure --with-erlang
-%global want_erlang 1
-%endif
-
-# PHP appears broken in Thrift 0.9.1
-%global want_php 0
-
-%if 0%{?want_php} == 0
-%global php_langname %{nil}
-%global php_configure --without-php
-%else
-%global php_langname PHP,\
-%global php_configure --with-php
-%endif
-
-# Thrift's GO support doesn't build under Fedora
-%global want_golang 0
-%global golang_configure --without-go
-
-Name: thrift
-Version: 0.10.0
-Release: 18%{?dist}
-Summary: Software framework for cross-language services development
-
-# Parts of the source are used under the BSD and zlib licenses, but
-# these are OK for inclusion in an Apache 2.0-licensed whole:
-#
https://www.apache.org/legal/3party.html
-
-# Here's the breakdown:
-# ./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/
-
-Source0:
https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
-
-Source1:
https://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/li...
-Source2:
https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh
-
-Source3:
https://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libf...
-
-# this patch is adapted from Gil Cattaneo's thrift-0.7.0 package
-Patch0: %{name}-%{version}-buildxml.patch
-# for fb303, excise maven ant tasks; build against system libraries; etc.
-Patch1: fb303-%{version}-buildxml.patch
-# fix configure.ac insistence on using /usr/local/lib for JAVA_PREFIX
-Patch2: configure-java-prefix.patch
-# fix for ppc64le builds not linking to /usr/lib64 directory
-Patch3: fix-ppc64le-builds.patch
-# fix for s390x build; incorporates fix for THRIFT-4177 with some code from THRIFT-4136
-Patch4: THRIFT-4177.patch
-
-# Update fb303 for python3
-Patch5: python3.patch
-
-
-# BuildRequires for language-specific bindings are listed under these
-# subpackages, to facilitate enabling or disabling individual language
-# bindings in the future
-
-BuildRequires: ant >= 1.7
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: bison
-BuildRequires: boost-devel
-BuildRequires: boost-static
-BuildRequires: flex
-BuildRequires: flex-devel
-BuildRequires: gcc-c++
-BuildRequires: glib2-devel
-BuildRequires: libevent-devel
-BuildRequires: libstdc++-devel
-BuildRequires: libtool
-BuildRequires: openssl-devel
-BuildRequires: qt-devel
-BuildRequires: texlive
-BuildRequires: zlib-devel
-
-%if 0%{?want_golang} > 0
-BuildRequires: golang
-Requires: golang
-%endif
-
-%description
-
-The Apache Thrift software framework for cross-language services
-development combines a software stack with a code generation engine to
-build services that work efficiently and seamlessly between C++, Java,
-Python, %{?php_langname}and other languages.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig
-Requires: boost-devel
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-%package qt
-Summary: Qt support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description qt
-The %{name}-qt package contains Qt bindings for %{name}.
-
-%package glib
-Summary: GLib support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description glib
-The %{name}-qt package contains GLib bindings for %{name}.
-
-%package -n python3-%{name}
-Summary: Python 3 support for %{name}
-BuildRequires: python3-devel
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python3
-Obsoletes: python-%{name} < 0.10.0-1%{?dist}
-Obsoletes: python2-%{name} < 0.10.0-14%{?dist}
-
-%description -n python3-%{name}
-The python3-%{name} package contains Python bindings for %{name}.
-
-%package -n perl-%{name}
-Summary: Perl support for %{name}
-Provides: perl(Thrift) = %{version}-%{release}
-BuildRequires: perl(Bit::Vector)
-BuildRequires: perl(Class::Accessor)
-BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl-generators
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: perl(Bit::Vector)
-Requires: perl(Encode)
-Requires: perl(HTTP::Request)
-Requires: perl(IO::Select)
-Requires: perl(IO::Socket::INET)
-Requires: perl(IO::String)
-Requires: perl(LWP::UserAgent)
-Requires: perl(POSIX)
-Requires: perl(base)
-Requires: perl(constant)
-Requires: perl(strict)
-Requires: perl(utf8)
-Requires: perl(warnings)
-BuildArch: noarch
-
-%description -n perl-%{name}
-The perl-%{name} package contains Perl bindings for %{name}.
-
-%if %{?want_d}
-%package -n d-%{name}
-Summary: D support for %{name}
-BuildRequires: ldc
-
-%description -n d-%{name}
-The d-%{name} package contains D bindings for %{name}.
-%endif
-
-%if 0%{?want_php} != 0
-%package -n php-%{name}
-Summary: PHP support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: php(zend-abi) = %{php_zend_api}
-Requires: php(api) = %{php_core_api}
-Requires: php(language) >= 5.3.0
-Requires: php-date
-Requires: php-json
-BuildRequires: php-devel
-
-%description -n php-%{name}
-The php-%{name} package contains PHP bindings for %{name}.
-%endif
-
-%package -n lib%{name}-javadoc
-Summary: API documentation for java-%{name}
-Requires: lib%{name}-java = %{version}-%{release}
-BuildArch: noarch
-
-%description -n lib%{name}-javadoc
-The lib%{name}-javadoc package contains API documentation for the
-Java bindings for %{name}.
-
-%package -n lib%{name}-java
-Summary: Java support for %{name}
-
-BuildRequires: apache-commons-codec
-BuildRequires: apache-commons-lang
-BuildRequires: apache-commons-logging
-BuildRequires: httpcomponents-client
-BuildRequires: httpcomponents-core
-BuildRequires: java-devel
-BuildRequires: javapackages-tools
-BuildRequires: javapackages-local
-BuildRequires: junit
-BuildRequires: log4j
-BuildRequires: slf4j
-# javax.servlet-api 3.1.0 is provided by glassfish-servlet-api
-BuildRequires: mvn(javax.servlet:javax.servlet-api) = 3.1.0
-
-Requires: java-headless >= 1:1.6.0
-Requires: javapackages-tools
-Requires: mvn(org.slf4j:slf4j-api)
-Requires: mvn(commons-lang:commons-lang)
-Requires: mvn(org.apache.httpcomponents:httpclient)
-Requires: mvn(org.apache.httpcomponents:httpcore)
-BuildArch: noarch
-
-%description -n lib%{name}-java
-The lib%{name}-java package contains Java bindings for %{name}.
-
-%if 0%{?want_ruby} > 0
-%package -n ruby-%{name}
-Summary: Ruby support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: ruby(release)
-BuildRequires: ruby-devel
-
-%description -n ruby-%{name}
-The ruby-%{name} package contains Ruby bindings for %{name}.
-%endif
-
-%if 0%{?want_erlang} > 0
-%package -n erlang-%{name}
-Summary: Erlang support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: erlang
-Requires: erlang-jsx
-BuildRequires: erlang
-BuildRequires: erlang-rebar
-
-%description -n erlang-%{name}
-The erlang-%{name} package contains Erlang bindings for %{name}.
-%endif
-
-%package -n fb303
-Summary: Basic interface for Thrift services
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description -n fb303
-fb303 is the shared root of all Thrift services; it provides a
-standard interface to monitoring, dynamic options and configuration,
-uptime reports, activity, etc.
-
-%package -n fb303-devel
-Summary: Development files for fb303
-Requires: fb303%{?_isa} = %{version}-%{release}
-
-%description -n fb303-devel
-The fb303-devel package contains header files for fb303
-
-%package -n python3-fb303
-Summary: Python 3 bindings for fb303
-Requires: fb303%{?_isa} = %{version}-%{release}
-BuildRequires: python3-devel
-Obsoletes: python-fb303 < 0.10.0-1%{?dist}
-Obsoletes: python2-fb303 < 0.10.0-14%{?dist}
-
-%description -n python3-fb303
-The python3-fb303 package contains Python bindings for fb303.
-
-%package -n fb303-java
-Summary: Java bindings for fb303
-Requires: java-headless >= 1:1.6.0
-Requires: javapackages-tools
-Requires: mvn(org.slf4j:slf4j-api)
-Requires: mvn(commons-lang:commons-lang)
-Requires: mvn(org.apache.httpcomponents:httpclient)
-Requires: mvn(org.apache.httpcomponents:httpcore)
-BuildArch: noarch
-
-%description -n fb303-java
-The fb303-java package contains Java bindings for fb303.
-
-%prep
-%autosetup -p1
-
-%{?!el5:sed -i -e 's/^AC_PROG_LIBTOOL/LT_INIT/g' configure.ac}
-
-# avoid spurious executable permissions in debuginfo package
-find . -name \*.cpp -or -name \*.cc -or -name \*.h | xargs -r chmod 644
-
-cp -p %{SOURCE2} bootstrap.sh
-
-# work around linking issues
-echo 'libthrift_c_glib_la_LIBADD = $(GLIB_LIBS) $(GOBJECT_LIBS) -L../cpp/.libs '
>> lib/c_glib/Makefile.am
-echo 'libthriftqt_la_LIBADD = $(QT_LIBS) -lthrift -L.libs' >>
lib/cpp/Makefile.am
-echo 'libthriftz_la_LIBADD = $(ZLIB_LIBS) -lthrift -L.libs' >>
lib/cpp/Makefile.am
-echo 'EXTRA_libthriftqt_la_DEPENDENCIES = libthrift.la' >>
lib/cpp/Makefile.am
-echo 'EXTRA_libthriftz_la_DEPENDENCIES = libthrift.la' >>
lib/cpp/Makefile.am
-
-# echo 'libfb303_so_LIBADD = -lthrift -L../../../lib/cpp/.libs' >>
contrib/fb303/cpp/Makefile.am
-
-sed -i 's|libfb303_so_LDFLAGS = $(SHARED_LDFLAGS)|libfb303_so_LDFLAGS =
$(SHARED_LDFLAGS) -lthrift -L../../../lib/cpp/.libs -Wl,--as-needed|g'
contrib/fb303/cpp/Makefile.am
-
-# fix broken upstream check for ant version; we enforce this with BuildRequires, so no
need to check here
-sed -i 's|ANT_VALID=.*|ANT_VALID=1|' aclocal/ax_javac_and_java.m4
-sed -i 's|ANT_VALID=.*|ANT_VALID=1|' contrib/fb303/aclocal/ax_javac_and_java.m4
-
-%build
-export PY_PREFIX=%{_prefix}
-export PERL_PREFIX=%{_prefix}
-export PHP_PREFIX=%{php_extdir}
-export JAVA_PREFIX=%{_javadir}
-export RUBY_PREFIX=%{_prefix}
-export GLIB_LIBS=$(pkg-config --libs glib-2.0)
-export GLIB_CFLAGS=$(pkg-config --cflags glib-2.0)
-export GOBJECT_LIBS=$(pkg-config --libs gobject-2.0)
-export GOBJECT_CFLAGS=$(pkg-config --cflags gobject-2.0)
-
-find %{_builddir} -name rebar -exec rm -f '{}' \;
-find . -name Makefile\* -exec sed -i -e 's/[.][/]rebar/rebar/g' {} \;
-
-# install javadocs in proper places
-sed -i
's|-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java|-Dinstall.javadoc.path=$(DESTDIR)%{_javadocdir}/%{name}|'
lib/java/Makefile.*
-
-# build a jar without a version number
-sed -i 's|${thrift.artifactid}-${version}|${thrift.artifactid}|'
lib/java/build.xml
-
-# Proper permissions for Erlang files
-sed -i 's|$(INSTALL) $$p|$(INSTALL) --mode 644 $$p|g' lib/erl/Makefile.am
-
-# Build fb303 jars against the in-situ copy of thrift
-sed -i 's|$(thrift_home)/bin/thrift|../../../compiler/cpp/thrift|g' \
- contrib/fb303/cpp/Makefile.am \
- contrib/fb303/py/Makefile.am
-
-sed -i 's|$(prefix)/lib$|%{_libdir}|g' contrib/fb303/cpp/Makefile.am
-
-sed -i 's|$(thrift_home)/include/thrift|../../../lib/cpp/src|g' \
- contrib/fb303/cpp/Makefile.am
-
-# Create a straightforward makefile for Java fb303
-echo "all:
- ant
-install: build/libfb303.jar
- mkdir -p %{buildroot}%{_javadir}
- /usr/bin/install -c -m 644 build/libfb303.jar %{buildroot}%{_javadir}
-" > contrib/fb303/java/Makefile
-
-sh ./bootstrap.sh
-
-# use unversioned doc dirs where appropriate (via _pkgdocdir macro)
-export PYTHON=%{_bindir}/python3
-%configure --disable-dependency-tracking --disable-static --with-boost=/usr
%{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} --with-py3
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
-
-# eliminate unused direct shlib dependencies
-sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool
-
-make %{?_smp_mflags}
-
-# build fb303
-(
- cd contrib/fb303
- sed -i '/^[.][/]configure.*/d' bootstrap.sh
- sh bootstrap.sh
- %configure --disable-static --with-java --without-php --with-py3 --libdir=%{_libdir}
- make %{?_smp_mflags}
- (
- cd java
- ant dist
- )
-)
-
-%install
-%make_install
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-find %{buildroot} -name fastbinary.so | xargs -r chmod 755
-find %{buildroot} -name \*.erl -or -name \*.hrl -or -name \*.app | xargs -r chmod 644
-
-# Remove javadocs jar
-find %{buildroot}/%{_javadir} -name lib%{name}-javadoc.jar -exec rm -f '{}' \;
-
-# Add POM file and depmap
-mkdir -p %{buildroot}%{_mavenpomdir}
-
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-libthrift.pom
-
-%add_maven_depmap JPP-libthrift.pom libthrift.jar
-
-# Remove bundled jar files
-find %{buildroot} -name \*.jar -a \! -name \*thrift\* -exec rm -f '{}' \;
-
-# Move perl files into appropriate places
-find %{buildroot} -name \*.pod -exec rm -f '{}' \;
-find %{buildroot} -name .packlist -exec rm -f '{}' \;
-find %{buildroot}/usr/lib/perl5 -type d -empty -delete
-mkdir -p %{buildroot}/%{perl_vendorlib}/
-mv %{buildroot}/usr/lib/perl5/* %{buildroot}/%{perl_vendorlib}
-
-%if 0%{?want_php} != 0
-
-# Move arch-independent php files into the appropriate place
-mkdir -p %{buildroot}/%{_datadir}/php/
-mv %{buildroot}/%{php_extdir}/Thrift %{buildroot}/%{_datadir}/php/
-%endif # want_php
-
-# Fix permissions on Thread.h
-find %{buildroot} -name Thread.h -exec chmod a-x '{}' \;
-
-# install fb303
-(
- cd contrib/fb303
- make DESTDIR=%{buildroot} install
- (
- cd java
- ant -Dinstall.path=%{buildroot}%{_javadir}
-Dinstall.javadoc.path=%{buildroot}%{_javadocdir}/fb303 install
- )
-)
-
-# install maven pom and depmaps for fb303
-install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-libfb303.pom
-%add_maven_depmap JPP-libfb303.pom libfb303.jar -f "fb303"
-
-# Ensure all python scripts are executable
-find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod
755
-
-%ldconfig_scriptlets
-
-%files
-%doc LICENSE NOTICE
-%{_bindir}/thrift
-%{_libdir}/libthrift-%{version}.so
-%{_libdir}/libthriftz-%{version}.so
-%{_libdir}/libthriftnb-%{version}.so
-
-%files glib
-%{_libdir}/libthrift_c_glib.so
-%{_libdir}/libthrift_c_glib.so.*
-
-%files qt
-%{_libdir}/libthriftqt.so
-%{_libdir}/libthriftqt-%{version}.so
-
-%files devel
-%{_includedir}/thrift
-%exclude %{_includedir}/thrift/fb303
-%{_libdir}/*.so
-%{_libdir}/*.so.0
-%{_libdir}/*.so.0.0.0
-%exclude %{_libdir}/lib*-%{version}.so
-%exclude %{_libdir}/libfb303.so
-%{_libdir}/pkgconfig/thrift-z.pc
-%{_libdir}/pkgconfig/thrift-qt.pc
-%{_libdir}/pkgconfig/thrift-nb.pc
-%{_libdir}/pkgconfig/thrift.pc
-%{_libdir}/pkgconfig/thrift_c_glib.pc
-%doc LICENSE NOTICE
-
-%files -n perl-%{name}
-%{perl_vendorlib}/Thrift
-%{perl_vendorlib}/Thrift.pm
-%doc LICENSE NOTICE
-
-%if 0%{?want_php} != 0
-%files -n php-%{name}
-%config(noreplace) /etc/php.d/thrift_protocol.ini
-%{_datadir}/php/Thrift/
-%{php_extdir}/thrift_protocol.so
-%doc LICENSE NOTICE
-%endif
-
-%if %{?want_erlang} > 0
-%files -n erlang-%{name}
-%{_libdir}/erlang/lib/%{name}-%{version}/
-%doc LICENSE NOTICE
-%endif
-
-%files -n python3-%{name}
-%{python3_sitearch}/%{name}
-%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
-%doc LICENSE NOTICE
-
-%files -n lib%{name}-javadoc
-%{_javadocdir}/%{name}
-%doc LICENSE NOTICE
-
-%files -n lib%{name}-java -f .mfiles
-%doc LICENSE NOTICE
-
-%files -n fb303
-%{_datarootdir}/fb303
-%doc LICENSE NOTICE
-
-%files -n fb303-devel
-%{_libdir}/libfb303.so
-%{_includedir}/thrift/fb303
-%doc LICENSE NOTICE
-
-%files -n python3-fb303
-%{python3_sitelib}/fb303
-%{python3_sitelib}/fb303_scripts
-%{python3_sitelib}/%{name}_fb303-%{version}-py%{python3_version}.egg-info
-%doc LICENSE NOTICE
-
-%files -n fb303-java -f .mfiles-fb303
-%doc LICENSE NOTICE
-
-%changelog
-* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-18
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Jun 01 2019 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-17
-- Perl 5.30 rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-16
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jul 18 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-15
-- Rebuild to address transient error
-
-* Wed Jul 18 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-14
-- Migrate to python3; rhbz#1533306
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-13
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 29 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-12
-- Perl 5.28 rebuild
-
-* Wed May 30 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-11
-- Fix FTBFS; update servlet-api dependency (rhbz#1581175)
-
-* Thu Mar 08 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-10
-- Add gcc-c++ BuildRequires
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-9
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Dec 22 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-8
-- Fix for rhbz#1507518
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-6
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jul 06 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-5
-- Fix FTBFS in rawhide: add BR javapackages-local
-
-* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-4
-- Perl 5.26 rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.10.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Mon Mar 13 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-2
-- Build TNonblockingServer, remove useless man page, and use java-headless
-
-* Tue Mar 07 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-1
-- Update to thrift 0.10.0
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.9.1-17.6
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-17.5
--
https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
-
-* Tue May 17 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-17.4
-- Perl 5.24 rebuild
-
-* Wed Mar 30 2016 Petr Pisar <ppisar(a)redhat.com> - 0.9.1-17.3
-- Adapt to GCC 6 (bug #1306671)
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.9.1-17.2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 16 2016 Jonathan Wakely <jwakely(a)redhat.com> - 0.9.1-17.1
-- Rebuilt for Boost 1.60
-
-* Mon Nov 23 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.9.1-17
-- Fix release
-
-* Wed Oct 21 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.9.1-16.6
-- Backport THRIFT-2214 fix to get package built on aarch64.
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 0.9.1-16.5
-- Rebuilt for Boost 1.59
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-16.4
-- Rebuilt for
https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 0.9.1-16.3
-- rebuild for Boost 1.58
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-16.2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jun 06 2015 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-16.1
-- Perl 5.22 rebuild
-
-* Fri Apr 24 2015 Michal Srb <msrb(a)redhat.com> - 0.9.1-16
-- Fix FTBFS (Resolves: rhbz#1195364)
-
-* Mon Apr 20 2015 Will Benton <willb(a)redhat.com> - 0.9.1-15
-- Dropped Erlang support for F22 and above, since erlang-jsx is orphaned
-
-* Wed Apr 8 2015 Hakel Gumar <hguemar(a)fedoraproject.org> - 0.9.1-14
-- Split Qt4/GLib runtimes into separate subpackages
-- Drop mono support, it's broken and not even shipped (and it pulls mono-core)
-
-* Mon Jan 26 2015 Petr Machata <pmachata(a)redhat.com> - 0.9.1-13.3
-- Rebuild for boost 1.57.0
-* Thu Aug 28 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-13.2
-- Perl 5.20 rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-13.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Jun 27 2014 Petr Pisar <ppisar(a)redhat.com> - 0.9.1-13
-- Use add_maven_depmap-generated file lists (bug #1107448)
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-12.2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri May 23 2014 Petr Machata <pmachata(a)redhat.com> - 0.9.1-12.1
-- Rebuild for boost 1.55.0
-
-* Mon May 05 2014 Lubomir Rintel <lkundrak(a)v3.sk> - 0.9.1-12
-- Fix EPEL build
-
-* Fri Feb 21 2014 willb <willb@redhat> - 0.9.1-11
-- fix BZ 1068561
-
-* Fri Dec 20 2013 willb <willb@redhat> - 0.9.1-10
-- fix BZ 1045544
-
-* Wed Oct 16 2013 willb <willb@redhat> - 0.9.1-9
-- Remove spurious dependencies
-- Move some versioned shared libraries from -devel
-
-* Wed Oct 16 2013 Dan Hork <dan[at]danny.cz> - 0.9.1-8
-- Mono available only on selected arches
-
-* Sun Oct 13 2013 willb <willb@redhat> - 0.9.1-7
-- minor specfile cleanups
-
-* Fri Oct 11 2013 willb <willb@redhat> - 0.9.1-6
-- added thrift man page
-- integrated fb303
-- fixed many fb303 library dependency problems
-
-* Tue Oct 1 2013 willb <willb@redhat> - 0.9.1-5
-- fixed extension library linking when an older thrift package is not
- already installed
-- fixed extension library dependencies in Makefile
-
-* Tue Oct 1 2013 willb <willb@redhat> - 0.9.1-4
-- addresses rpmlint warnings and errors
-- properly links glib, qt, and z extension libraries
-
-* Mon Sep 30 2013 willb <willb@redhat> - 0.9.1-3
-- adds QT support
-- clarified multiple licensing
-- uses parallel make
-- removes obsolete M4 macros
-- specifies canonical location for source archive
-
-* Tue Sep 24 2013 willb <willb@redhat> - 0.9.1-2
-- fixes for i686
-- fixes bogus requires for Java package
-
-* Fri Sep 20 2013 willb <willb@redhat> - 0.9.1-1
-- updated to upstream version 0.9.1
-- disables PHP support, which FTBFS in this version
-
-* Fri Sep 20 2013 willb <willb@redhat> - 0.9.0-5
-- patch build xml to generate unversioned jars instead of moving after the fact
-- unversioned doc dirs on Fedora versions where this is appropriate
-- replaced some stray hardcoded paths with macros
-- thanks to Gil for the above observations and suggestions for fixes
-
-* Thu Aug 22 2013 willb <willb@redhat> - 0.9.0-4
-- removed version number from jar name (obs pmackinn)
-
-* Thu Aug 22 2013 willb <willb@redhat> - 0.9.0-3
-- Fixes for F19 and Erlang support
-
-* Thu Aug 15 2013 willb <willb@redhat> - 0.9.0-2
-- Incorporates feedback from comments on review request
-
-* Mon Jul 1 2013 willb <willb@redhat> - 0.9.0-1
-- Initial package
commit e014bd753de86cecd6af7c3f9cc27c1af964a8b9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 27 01:23:10 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/thrift.spec b/thrift.spec
index 29979be..2787d7f 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -529,6 +529,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-18
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Sat Jun 01 2019 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-17
- Perl 5.30 rebuild
commit 23934e6948fe2e4b94cede4c3ac7e797726a6708
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Sat Jun 1 20:22:28 2019 +0200
Perl 5.30 rebuild
diff --git a/thrift.spec b/thrift.spec
index 3e5a7b1..29979be 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -529,6 +529,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Sat Jun 01 2019 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-17
+- Perl 5.30 rebuild
+
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-16
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 945537dbf9e66e8ab26849a77d7bf4da69dffb9d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Feb 3 09:47:29 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/thrift.spec b/thrift.spec
index 065538b..3e5a7b1 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -529,6 +529,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-16
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Wed Jul 18 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-15
- Rebuild to address transient error
commit 45572459a334a494f48586fa11d42829f78d05d9
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:18:27 2019 +0100
Remove obsolete Group tag
References:
https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/thrift.spec b/thrift.spec
index 58da4d9..065538b 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -84,7 +84,6 @@ Patch4: THRIFT-4177.patch
# Update fb303 for python3
Patch5: python3.patch
-Group: Development/Libraries
# BuildRequires for language-specific bindings are listed under these
# subpackages, to facilitate enabling or disabling individual language
commit c168bd9f744717ded0127e886806ea80aaa94cec
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jan 22 18:41:09 2019 +0100
Remove obsolete ldconfig scriptlets
References:
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/thrift.spec b/thrift.spec
index 3d0dc8a..58da4d9 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -448,9 +448,7 @@ install -pm 644 %{SOURCE3}
%{buildroot}%{_mavenpomdir}/JPP-libfb303.pom
# Ensure all python scripts are executable
find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod
755
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
%doc LICENSE NOTICE
commit 8e3a938d6bebfdda8df5f9734b19875f333413dc
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Wed Jul 18 02:33:10 2018 -0400
Rebuild to address transient error
diff --git a/thrift.spec b/thrift.spec
index 3c7e5ad..3d0dc8a 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -532,6 +532,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Wed Jul 18 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-15
+- Rebuild to address transient error
+
* Wed Jul 18 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-14
- Migrate to python3; rhbz#1533306
commit 4cdd59c42d142ed2b7b0088b3569d93c486a0855
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Wed Jul 18 01:59:18 2018 -0400
Migrate to python3; rhbz#1533306
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 0000000..c2908fd
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,72 @@
+diff --git a/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
b/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
+index 4b1c257..df1c8cc 100644
+--- a/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
++++ b/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
+@@ -57,24 +57,24 @@ def service_ctrl(
+ msg = fb_status_string(status)
+ if (len(status_details)):
+ msg += " - %s" % status_details
+- print msg
++ print(msg)
+
+ if (status == fb_status.ALIVE):
+ return 2
+ else:
+ return 3
+ except:
+- print "Failed to get status"
++ print("Failed to get status")
+ return 3
+
+ # scalar commands
+ if command in ["version", "alive", "name"]:
+ try:
+ result = fb303_wrapper(command, port, trans_factory, prot_factory)
+- print result
++ print(result)
+ return 0
+ except:
+- print "failed to get ", command
++ print("failed to get ", command)
+ return 3
+
+ # counters
+@@ -82,10 +82,10 @@ def service_ctrl(
+ try:
+ counters = fb303_wrapper('counters', port, trans_factory,
prot_factory)
+ for counter in counters:
+- print "%s: %d" % (counter, counters[counter])
++ print("%s: %d" % (counter, counters[counter]))
+ return 0
+ except:
+- print "failed to get counters"
++ print("failed to get counters")
+ return 3
+
+ # Only root should be able to run the following commands
+@@ -96,19 +96,19 @@ def service_ctrl(
+ fb303_wrapper(command, port, trans_factory, prot_factory)
+ return 0
+ except:
+- print "failed to tell the service to ", command
++ print("failed to tell the service to ", command)
+ return 3
+ else:
+ if command in ["stop", "reload"]:
+- print "root privileges are required to stop or reload the
service."
++ print("root privileges are required to stop or reload the
service.")
+ return 4
+
+- print "The following commands are available:"
++ print("The following commands are available:")
+ for command in ["counters", "name", "version",
"alive", "status"]:
+- print "\t%s" % command
+- print "The following commands are available for users with root
privileges:"
++ print("\t%s" % command)
++ print("The following commands are available for users with root
privileges:")
+ for command in ["stop", "reload"]:
+- print "\t%s" % command
++ print("\t%s" % command)
+
+ return 0
+
diff --git a/thrift.spec b/thrift.spec
index f25dff9..3c7e5ad 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,7 +1,7 @@
%global php_extdir %(php-config --extension-dir 2>/dev/null || echo
"undefined")
%{?perl_default_filter}
-%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{php_extdir}/.*\\.so)$
+%global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so|%{php_extdir}/.*\\.so)$
%global have_mongrel 0
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -81,6 +81,9 @@ Patch3: fix-ppc64le-builds.patch
# fix for s390x build; incorporates fix for THRIFT-4177 with some code from THRIFT-4136
Patch4: THRIFT-4177.patch
+# Update fb303 for python3
+Patch5: python3.patch
+
Group: Development/Libraries
# BuildRequires for language-specific bindings are listed under these
@@ -141,15 +144,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description glib
The %{name}-qt package contains GLib bindings for %{name}.
-%package -n python2-%{name}
-Summary: Python 2 support for %{name}
-BuildRequires: python2-devel
+%package -n python3-%{name}
+Summary: Python 3 support for %{name}
+BuildRequires: python3-devel
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python2
+Requires: python3
Obsoletes: python-%{name} < 0.10.0-1%{?dist}
+Obsoletes: python2-%{name} < 0.10.0-14%{?dist}
-%description -n python2-%{name}
-The python2-%{name} package contains Python bindings for %{name}.
+%description -n python3-%{name}
+The python3-%{name} package contains Python bindings for %{name}.
%package -n perl-%{name}
Summary: Perl support for %{name}
@@ -278,14 +282,15 @@ Requires: fb303%{?_isa} = %{version}-%{release}
%description -n fb303-devel
The fb303-devel package contains header files for fb303
-%package -n python2-fb303
-Summary: Python 2 bindings for fb303
+%package -n python3-fb303
+Summary: Python 3 bindings for fb303
Requires: fb303%{?_isa} = %{version}-%{release}
-BuildRequires: python2-devel
+BuildRequires: python3-devel
Obsoletes: python-fb303 < 0.10.0-1%{?dist}
+Obsoletes: python2-fb303 < 0.10.0-14%{?dist}
-%description -n python2-fb303
-The python2-fb303 package contains Python bindings for fb303.
+%description -n python3-fb303
+The python3-fb303 package contains Python bindings for fb303.
%package -n fb303-java
Summary: Java bindings for fb303
@@ -369,7 +374,8 @@ install: build/libfb303.jar
sh ./bootstrap.sh
# use unversioned doc dirs where appropriate (via _pkgdocdir macro)
-%configure --disable-dependency-tracking --disable-static --with-boost=/usr
%{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure}
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+export PYTHON=%{_bindir}/python3
+%configure --disable-dependency-tracking --disable-static --with-boost=/usr
%{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} --with-py3
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
# eliminate unused direct shlib dependencies
sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool
@@ -381,7 +387,7 @@ make %{?_smp_mflags}
cd contrib/fb303
sed -i '/^[.][/]configure.*/d' bootstrap.sh
sh bootstrap.sh
- %configure --disable-static --with-java --without-php --libdir=%{_libdir}
+ %configure --disable-static --with-java --without-php --with-py3 --libdir=%{_libdir}
make %{?_smp_mflags}
(
cd java
@@ -495,9 +501,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%endif
-%files -n python2-%{name}
-%{python2_sitearch}/%{name}
-%{python2_sitearch}/%{name}-%{version}-py%{python2_version}.egg-info
+%files -n python3-%{name}
+%{python3_sitearch}/%{name}
+%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
%doc LICENSE NOTICE
%files -n lib%{name}-javadoc
@@ -516,16 +522,19 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \;
-print | xargs -r
%{_includedir}/thrift/fb303
%doc LICENSE NOTICE
-%files -n python2-fb303
-%{python2_sitelib}/fb303
-%{python2_sitelib}/fb303_scripts
-%{python2_sitelib}/%{name}_fb303-%{version}-py%{python2_version}.egg-info
+%files -n python3-fb303
+%{python3_sitelib}/fb303
+%{python3_sitelib}/fb303_scripts
+%{python3_sitelib}/%{name}_fb303-%{version}-py%{python3_version}.egg-info
%doc LICENSE NOTICE
%files -n fb303-java -f .mfiles-fb303
%doc LICENSE NOTICE
%changelog
+* Wed Jul 18 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-14
+- Migrate to python3; rhbz#1533306
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-13
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit dc4d73bb498edbdaaef5b5b71eb19e42fe97f35b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 07:32:35 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/thrift.spec b/thrift.spec
index 27042a4..f25dff9 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -526,6 +526,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-13
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Fri Jun 29 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-12
- Perl 5.28 rebuild
commit d348efa593ca1782e4b95411e0282e8b8776e87c
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Fri Jun 29 22:09:31 2018 +0200
Perl 5.28 rebuild
diff --git a/thrift.spec b/thrift.spec
index 79bcf18..27042a4 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -526,6 +526,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Fri Jun 29 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-12
+- Perl 5.28 rebuild
+
* Wed May 30 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-11
- Fix FTBFS; update servlet-api dependency (rhbz#1581175)
commit 0e241cd08ab3fdbd25806a3560a8448b8665a13c
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Wed May 30 19:41:09 2018 -0400
Fix FTBFS; update servlet-api dependency (rhbz#1581175)
diff --git a/fb303-0.10.0-buildxml.patch b/fb303-0.10.0-buildxml.patch
index bbff5ec..eb3825a 100644
--- a/fb303-0.10.0-buildxml.patch
+++ b/fb303-0.10.0-buildxml.patch
@@ -51,7 +51,7 @@ index 8f2fa51..d89f05e 100755
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.0-api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
+ </fileset>
</classpath>
+
diff --git a/thrift-0.10.0-buildxml.patch b/thrift-0.10.0-buildxml.patch
index db4b497..8931c03 100644
--- a/thrift-0.10.0-buildxml.patch
+++ b/thrift-0.10.0-buildxml.patch
@@ -26,7 +26,7 @@ index 40e5284..db1ce54 100644
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.1-api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
</fileset>
</path>
@@ -187,7 +187,7 @@ index 7638d5b..c5ca703 100644
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.1-api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
</fileset>
</path>
<path id="build.classpath">
@@ -205,7 +205,7 @@ index 7638d5b..c5ca703 100644
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.1-api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
+ </fileset>
</path>
<path id="tutorial.classpath">
@@ -229,7 +229,7 @@ index a9a9ad4..2fddf0c 100644
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.1-api.jar"/>
++ <include name="glassfish-servlet-api.jar"/>
</fileset>
</path>
<path id="build.classpath">
diff --git a/thrift.spec b/thrift.spec
index 8a61075..79bcf18 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -224,7 +224,8 @@ BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: log4j
BuildRequires: slf4j
-BuildRequires: tomcat-servlet-3.1-api
+# javax.servlet-api 3.1.0 is provided by glassfish-servlet-api
+BuildRequires: mvn(javax.servlet:javax.servlet-api) = 3.1.0
Requires: java-headless >= 1:1.6.0
Requires: javapackages-tools
@@ -525,6 +526,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Wed May 30 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-11
+- Fix FTBFS; update servlet-api dependency (rhbz#1581175)
+
* Thu Mar 08 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-10
- Add gcc-c++ BuildRequires
commit f02e4292b522aba1cd33ee2a2fbc5351867fab4f
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Wed Mar 7 20:20:31 2018 -0500
Add gcc-c++ BuildRequires
diff --git a/thrift.spec b/thrift.spec
index c1ac0b2..8a61075 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -95,6 +95,7 @@ BuildRequires: boost-devel
BuildRequires: boost-static
BuildRequires: flex
BuildRequires: flex-devel
+BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libevent-devel
BuildRequires: libstdc++-devel
@@ -524,6 +525,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Thu Mar 08 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-10
+- Add gcc-c++ BuildRequires
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 047ca65adf45476d2eb831d3170918a6f36e3ebc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 9 18:54:58 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/thrift.spec b/thrift.spec
index d55b290..c1ac0b2 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -524,6 +524,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Fri Dec 22 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-8
- Fix for rhbz#1507518
commit 69be3d5433487deb16a91aab19bb898e1e9b153e
Merge: bf1bea7 123a89d
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Fri Dec 22 00:02:08 2017 -0500
Merge branch 'f26' into f27
diff --cc thrift.spec
index 254fc63,1e17eb6..d55b290
--- a/thrift.spec
+++ b/thrift.spec
@@@ -522,18 -523,9 +524,21 @@@ find %{buildroot} -name \*.py -exec gre
%doc LICENSE NOTICE
%changelog
+ * Fri Dec 22 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-8
+ - Fix for rhbz#1507518
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.0-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 06 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-5
+- Fix FTBFS in rawhide: add BR javapackages-local
+
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-4
+- Perl 5.26 rebuild
+
* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.10.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
commit 123a89d00cab36f9b3de46c8397af09f97e69dbc
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Thu Dec 21 23:46:44 2017 -0500
Fix for rhbz#1507518
diff --git a/THRIFT-4177.patch b/THRIFT-4177.patch
new file mode 100644
index 0000000..c0c331b
--- /dev/null
+++ b/THRIFT-4177.patch
@@ -0,0 +1,27 @@
+diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc
b/compiler/cpp/src/thrift/generate/t_java_generator.cc
+index fb581e4..90dfa06 100644
+--- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
++++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
+@@ -4657,8 +4657,9 @@ void
t_java_generator::generate_deep_copy_non_container(ofstream& out,
+ std::string dest_name,
+ t_type* type) {
+ (void)dest_name;
++ type = get_true_type(type);
+ if (type->is_base_type() || type->is_enum() || type->is_typedef()) {
+- if (((t_base_type*)type)->is_binary()) {
++ if (type->is_binary()) {
+ out << "org.apache.thrift.TBaseHelper.copyBinary(" <<
source_name << ")";
+ } else {
+ // everything else can be copied directly
+diff --git a/compiler/cpp/src/thrift/parse/t_type.h
b/compiler/cpp/src/thrift/parse/t_type.h
+index 30f8c1f7..3a6d1e04 100644
+--- a/compiler/cpp/src/thrift/parse/t_type.h
++++ b/compiler/cpp/src/thrift/parse/t_type.h
+@@ -47,6 +47,7 @@ public:
+ virtual bool is_void() const { return false; }
+ virtual bool is_base_type() const { return false; }
+ virtual bool is_string() const { return false; }
++ virtual bool is_binary() const { return false; }
+ virtual bool is_bool() const { return false; }
+ virtual bool is_typedef() const { return false; }
+ virtual bool is_enum() const { return false; }
diff --git a/thrift.spec b/thrift.spec
index 0a6a20a..1e17eb6 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 3%{?dist}
+Release: 8%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -78,6 +78,8 @@ Patch1: fb303-%{version}-buildxml.patch
Patch2: configure-java-prefix.patch
# fix for ppc64le builds not linking to /usr/lib64 directory
Patch3: fix-ppc64le-builds.patch
+# fix for s390x build; incorporates fix for THRIFT-4177 with some code from THRIFT-4136
+Patch4: THRIFT-4177.patch
Group: Development/Libraries
@@ -521,6 +523,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Fri Dec 22 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-8
+- Fix for rhbz#1507518
+
* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.10.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
commit bf1bea70d24d2d58e96c1481bf99b28e3e182954
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 09:23:30 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/thrift.spec b/thrift.spec
index eabb738..254fc63 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -522,6 +522,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit d7dd118cbf37ae2ecd9ad99d4bded5591c9da4da
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 20:15:05 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/thrift.spec b/thrift.spec
index b36f813..eabb738 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -522,6 +522,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Thu Jul 06 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-5
- Fix FTBFS in rawhide: add BR javapackages-local
commit 16021f27d1b6bbf4902caf4300474a7c298a617e
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Thu Jul 6 15:46:47 2017 -0400
Fix FTBFS in rawhide: add BR javapackages-local
diff --git a/thrift.spec b/thrift.spec
index 383540a..b36f813 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -217,6 +217,7 @@ BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
BuildRequires: java-devel
BuildRequires: javapackages-tools
+BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: log4j
BuildRequires: slf4j
@@ -521,6 +522,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Thu Jul 06 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-5
+- Fix FTBFS in rawhide: add BR javapackages-local
+
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-4
- Perl 5.26 rebuild
commit 708e41e0995a9752294e35533cdfca38167ec144
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Mon Jun 5 01:34:25 2017 +0200
Perl 5.26 rebuild
diff --git a/thrift.spec b/thrift.spec
index 0a6a20a..383540a 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -521,6 +521,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.10.0-4
+- Perl 5.26 rebuild
+
* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.10.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
commit 8948eb896e08f639000f6a154ab73b2126f4232a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Mon May 15 20:29:34 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
diff --git a/thrift.spec b/thrift.spec
index 115c611..0a6a20a 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -521,6 +521,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.10.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
* Mon Mar 13 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-2
- Build TNonblockingServer, remove useless man page, and use java-headless
commit bf1db3ac977dffbd43c0a533b9c0fbfe259653d8
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Tue Mar 14 05:22:22 2017 -0400
Fix ppc64le builds
diff --git a/fix-ppc64le-builds.patch b/fix-ppc64le-builds.patch
new file mode 100644
index 0000000..f56ad86
--- /dev/null
+++ b/fix-ppc64le-builds.patch
@@ -0,0 +1,13 @@
+diff --git a/aclocal/ax_boost_base.m4 b/aclocal/ax_boost_base.m4
+index b496020..30ee0df 100644
+--- a/aclocal/ax_boost_base.m4
++++ b/aclocal/ax_boost_base.m4
+@@ -92,7 +92,7 @@ if test "x$want_boost" = "xyes"; then
+ libsubdirs="lib"
+ ax_arch=`uname -m`
+ case $ax_arch in
+- x86_64|ppc64|s390x|sparc64|aarch64)
++ x86_64|ppc64|ppc64le|s390x|sparc64|aarch64)
+ libsubdirs="lib64 lib lib64"
+ ;;
+ esac
diff --git a/thrift.spec b/thrift.spec
index 6b6181e..115c611 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -76,6 +76,8 @@ Patch0: %{name}-%{version}-buildxml.patch
Patch1: fb303-%{version}-buildxml.patch
# fix configure.ac insistence on using /usr/local/lib for JAVA_PREFIX
Patch2: configure-java-prefix.patch
+# fix for ppc64le builds not linking to /usr/lib64 directory
+Patch3: fix-ppc64le-builds.patch
Group: Development/Libraries
commit 9cb9bef0ac753d27b507e552fd9475a5e576ba95
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Mon Mar 13 19:58:01 2017 -0400
Build TNonblockingServer, remove useless man page, and use java-headless
diff --git a/manpage.1.ex b/manpage.1.ex
deleted file mode 100644
index 160f57b..0000000
--- a/manpage.1.ex
+++ /dev/null
@@ -1,60 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH THRIFT SECTION "June 27, 2010"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-thrift \- program to do something
-.SH SYNOPSIS
-.B thrift
-.RI [ options ] " files" ...
-.br
-.B bar
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B thrift
-and
-.B bar
-commands.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBthrift\fP is a program that...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-For a complete description, see the Info files.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.SH SEE ALSO
-.BR bar (1),
-.BR baz (1).
-.br
-The programs are documented fully by
-.IR "The Rise and Fall of a Fooish Bar" ,
-available via the Info system.
-.SH AUTHOR
-thrift was written by <upstream author>.
-.PP
-This manual page was written by Krzysztof Krzyaniak (eloy) <eloy(a)debian.org>,
-for the Debian project (and may be used by others).
-
diff --git a/thrift.spec b/thrift.spec
index 9eee937..6b6181e 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -50,7 +50,7 @@
Name: thrift
Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -68,8 +68,7 @@ Source0:
https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.t
Source1:
https://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/li...
Source2:
https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh
-Source3:
https://gitorious.org/pkg-scribe/thrift-deb-pkg/raw/master:debian/manpage...
-Source4:
https://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libf...
+Source3:
https://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libf...
# this patch is adapted from Gil Cattaneo's thrift-0.7.0 package
Patch0: %{name}-%{version}-buildxml.patch
@@ -89,9 +88,11 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
BuildRequires: boost-devel
+BuildRequires: boost-static
BuildRequires: flex
BuildRequires: flex-devel
BuildRequires: glib2-devel
+BuildRequires: libevent-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: openssl-devel
@@ -281,7 +282,7 @@ The python2-fb303 package contains Python bindings for fb303.
%package -n fb303-java
Summary: Java bindings for fb303
-Requires: java >= 1:1.6.0
+Requires: java-headless >= 1:1.6.0
Requires: javapackages-tools
Requires: mvn(org.slf4j:slf4j-api)
Requires: mvn(commons-lang:commons-lang)
@@ -292,7 +293,6 @@ BuildArch: noarch
%description -n fb303-java
The fb303-java package contains Java bindings for fb303.
-%global _default_patch_fuzz 2
%prep
%autosetup -p1
@@ -362,7 +362,7 @@ install: build/libfb303.jar
sh ./bootstrap.sh
# use unversioned doc dirs where appropriate (via _pkgdocdir macro)
-%configure --disable-dependency-tracking --disable-static --without-libevent
--with-boost=/usr %{ruby_configure} %{erlang_configure} %{golang_configure}
%{php_configure} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+%configure --disable-dependency-tracking --disable-static --with-boost=/usr
%{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure}
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
# eliminate unused direct shlib dependencies
sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool
@@ -388,11 +388,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name fastbinary.so | xargs -r chmod 755
find %{buildroot} -name \*.erl -or -name \*.hrl -or -name \*.app | xargs -r chmod 644
-# install man page
-mkdir -p %{buildroot}%{_mandir}/man1
-cp %{SOURCE3} %{buildroot}%{_mandir}/man1/thrift.1
-gzip -9v %{buildroot}%{_mandir}/man1/thrift.1
-
# Remove javadocs jar
find %{buildroot}/%{_javadir} -name lib%{name}-javadoc.jar -exec rm -f '{}' \;
@@ -434,7 +429,7 @@ find %{buildroot} -name Thread.h -exec chmod a-x '{}' \;
)
# install maven pom and depmaps for fb303
-install -pm 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP-libfb303.pom
+install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-libfb303.pom
%add_maven_depmap JPP-libfb303.pom libfb303.jar -f "fb303"
# Ensure all python scripts are executable
@@ -449,7 +444,7 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%{_bindir}/thrift
%{_libdir}/libthrift-%{version}.so
%{_libdir}/libthriftz-%{version}.so
-%{_mandir}/man1/thrift.1.gz
+%{_libdir}/libthriftnb-%{version}.so
%files glib
%{_libdir}/libthrift_c_glib.so
@@ -469,6 +464,7 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%exclude %{_libdir}/libfb303.so
%{_libdir}/pkgconfig/thrift-z.pc
%{_libdir}/pkgconfig/thrift-qt.pc
+%{_libdir}/pkgconfig/thrift-nb.pc
%{_libdir}/pkgconfig/thrift.pc
%{_libdir}/pkgconfig/thrift_c_glib.pc
%doc LICENSE NOTICE
@@ -523,6 +519,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Mon Mar 13 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-2
+- Build TNonblockingServer, remove useless man page, and use java-headless
+
* Tue Mar 07 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-1
- Update to thrift 0.10.0
commit 3632b2acecabf21eb686d4105edf7be2e2c7efb5
Author: Christopher Tubbs <ctubbsii(a)apache.org>
Date: Tue Mar 7 17:20:17 2017 -0500
Update to thrift 0.10.0
diff --git a/.gitignore b/.gitignore
index 8f68e6a..f5a770c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/0.9.1.tar.gz
+/thrift-0.10.0.tar.gz
diff --git a/bootstrap.sh b/bootstrap.sh
index 0c2b886..52ecda4 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -38,6 +38,14 @@ else
exit 1
fi
+# we require automake 1.13 or later
+# check must happen externally due to use of newer macro
+AUTOMAKE_VERSION=`automake --version | grep automake | egrep -o
'([0-9]{1,}\.)+[0-9]{1,}'`
+if [ "$AUTOMAKE_VERSION" \< "1.13" ]; then
+ echo >&2 "automake version $AUTOMAKE_VERSION is too old (need 1.13 or
later)"
+ exit 1
+fi
+
autoscan
$LIBTOOLIZE --copy --automake
aclocal -I ./aclocal
diff --git a/configure-java-prefix.patch b/configure-java-prefix.patch
new file mode 100644
index 0000000..ebd542f
--- /dev/null
+++ b/configure-java-prefix.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 0972abf..77107fc 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,10 +34,7 @@ AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
+ AS_IF([test "x$PY_PREFIX" = x], [PY_PREFIX="/usr"])
+
+ AC_ARG_VAR([JAVA_PREFIX], [Prefix for installing the Java lib jar.
+- Default = "/usr/local/lib"])
+-AS_IF([test "x$JAVA_PREFIX" != x],
[JAVA_PREFIX="$JAVA_PREFIX/usr/local/lib"],
+- [test "x$PREFIX" != x],
[JAVA_PREFIX="$PREFIX/usr/local/lib"],
+- [JAVA_PREFIX="/usr/local/lib"])
++ Default = "/usr/share/java"])
+
+ AC_ARG_VAR([RUBY_PREFIX], [Prefix for installing Ruby modules.
+ (Normal --prefix is ignored for Ruby because
diff --git a/fb303-0.10.0-buildxml.patch b/fb303-0.10.0-buildxml.patch
new file mode 100644
index 0000000..bbff5ec
--- /dev/null
+++ b/fb303-0.10.0-buildxml.patch
@@ -0,0 +1,158 @@
+diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml
+index 8f2fa51..d89f05e 100755
+--- a/contrib/fb303/java/build.xml
++++ b/contrib/fb303/java/build.xml
+@@ -17,8 +17,7 @@
+ specific language governing permissions and limitations
+ under the License.
+ -->
+-<project name="libfb303" default="dist" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="libfb303" default="dist"
basedir=".">
+
+ <!-- project wide settings. All directories relative to basedir -->
+ <property name="thrift.root"
location="${basedir}/../../../"/>
+@@ -38,8 +37,8 @@
+ </condition>
+ <property name="version"
value="${thrift.version}-snapshot"/>
+
+- <property name="fb303.final.name"
value="${fb303.artifactid}-${version}"/>
+- <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift-${version}.jar"/>
++ <property name="fb303.final.name"
value="${fb303.artifactid}"/>
++ <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift.jar"/>
+
+ <property name="src" value="${basedir}/src"/>
+ <property name="gen" value="${basedir}/gen-java"/>
+@@ -50,7 +49,7 @@
+ <property name="fb303.jar.file"
location="${build.dir}/${fb303.final.name}.jar"/>
+ <property name="fb303.pom.xml"
location="${build.dir}/${fb303.final.name}.pom"/>
+
+- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
++ <target name="init" depends="setup.init"
unless="init.finished">
+ <property name="init.finished" value="true"/>
+ </target>
+
+@@ -72,13 +71,21 @@
+ <!-- compile the base and thrift generated code and jar them -->
+ <target name="dist" depends="init,generate">
+ <echo message="Building ${fb303.final.name}.jar"/>
+- <javac destdir="${build.classes.dir}" debug="on">
++ <javac destdir="${build.classes.dir}" debug="on"
includeantruntime="false" >
+ <classpath>
+ <pathelement location="${thrift.java.libthrift}"/>
+- <fileset dir="${thrift.root}/lib/java/build/lib">
+- <include name="*.jar"/>
+- </fileset>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.0-api.jar"/>
++ </fileset>
+ </classpath>
++
+ <src path="${src}"/>
+ <src path="${gen}"/>
+ <include name="**/*.java"/>
+@@ -99,97 +106,4 @@
+ <delete dir="${build.dir}"/>
+ <delete dir="${gen}"/>
+ </target>
+-
+- <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check"
unless="mvn.ant.tasks.found">
+- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
+- </target>
+-
+- <target name="mvn.ant.tasks.check">
+- <condition property="mvn.ant.tasks.found">
+- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
+- </condition>
+- </target>
+-
+- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
+- <echo message="${mvn.ant.task.jar}"/>
+- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
+- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
+-
+- <!-- remote repositories used to download dependencies from -->
+- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
+- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
+-
+- <!-- Pom file information -->
+- <artifact:pom id="pom"
+- groupId="${thrift.groupid}"
+- artifactId="${fb303.artifactid}"
+- version="${version}"
+- url="http://thrift.apache.org"
+- name="Apache Thrift"
+- description="Thrift is a software framework for scalable cross-language
services development."
+- packaging="pom"
+- >
+- <remoteRepository refid="central"/>
+- <remoteRepository refid="apache"/>
+- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
+- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
+-
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
+-
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
+- />
+- <!-- Thrift Developers -->
+- <developer id="mcslee" name="Mark Slee"/>
+- <developer id="dreiss" name="David Reiss"/>
+- <developer id="aditya" name="Aditya Agarwal"/>
+- <developer id="marck" name="Marc Kwiatkowski"/>
+- <developer id="jwang" name="James Wang"/>
+- <developer id="cpiro" name="Chris Piro"/>
+- <developer id="bmaurer" name="Ben Maurer"/>
+- <developer id="kclark" name="Kevin Clark"/>
+- <developer id="jake" name="Jake Luciani"/>
+- <developer id="bryanduxbury" name="Bryan Duxbury"/>
+- <developer id="esteve" name="Esteve Fernandez"/>
+- <developer id="todd" name="Todd Lipcon"/>
+- <developer id="geechorama" name="Andrew McGeachie"/>
+- <developer id="molinaro" name="Anthony Molinaro"/>
+- <developer id="roger" name="Roger Meier"/>
+- <developer id="jfarrell" name="Jake Farrell"/>
+- <developer id="jensg" name="Jens Geyer"/>
+- <developer id="carl" name="Carl Yeksigian"/>
+-
+- <!-- Thrift dependencies list -->
+- <dependency groupId="org.apache.thrift"
artifactId="libthrift" version="${version}"/>
+- </artifact:pom>
+-
+- <!-- Generate the pom file -->
+- <artifact:writepom pomRefId="pom"
file="${fb303.pom.xml}"/>
+-
+- <property name="mvn.finished" value="true"/>
+- </target>
+-
+- <macrodef name="signAndDeploy">
+- <!-- Sign and deploy jars to apache repo -->
+- <attribute name="file"/>
+- <attribute name="classifier" default=""/>
+- <attribute name="packaging" default="jar"/>
+- <attribute name="pom" default=""/>
+- <sequential>
+- <artifact:mvn fork="true">
+- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
+- <arg value="-DrepositoryId=${maven-repository-id}"/>
+- <arg value="-Durl=${maven-repository-url}"/>
+- <arg value="-DpomFile=@{pom}"/>
+- <arg value="-Dfile=@{file}"/>
+- <arg value="-Dclassifier=@{classifier}"/>
+- <arg value="-Dpackaging=@{packaging}"/>
+- <arg value="-Pgpg"/>
+- </artifact:mvn>
+- </sequential>
+- </macrodef>
+-
+- <target name="publish" depends="clean,dist">
+- <!-- Compile, packages and then send release to apache maven repo -->
+- <!-- run with: ant -Drelease=true publish-->
+- <signAndDeploy file="${fb303.pom.xml}" packaging="pom"
classifier="" pom="${fb303.pom.xml}"/>
+- <signAndDeploy file="${fb303.jar.file}" packaging="jar"
classifier="" pom="${fb303.pom.xml}"/>
+- </target>
+ </project>
diff --git a/fb303-0.9.1-buildxml.patch b/fb303-0.9.1-buildxml.patch
deleted file mode 100644
index ec51503..0000000
--- a/fb303-0.9.1-buildxml.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml
-index 8f2fa51..d89f05e 100755
---- a/contrib/fb303/java/build.xml
-+++ b/contrib/fb303/java/build.xml
-@@ -17,8 +17,7 @@
- specific language governing permissions and limitations
- under the License.
- -->
--<project name="libfb303" default="dist" basedir="."
-- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-+<project name="libfb303" default="dist"
basedir=".">
-
- <!-- project wide settings. All directories relative to basedir -->
- <property name="thrift.root"
location="${basedir}/../../../"/>
-@@ -26,7 +25,7 @@
- <property name="interface.dir" value="${basedir}/../if"/>
- <property name="thrift.java.dir"
location="${thrift.root}/lib/java"/>
- <property name="build.tools.dir"
location="${thrift.java.dir}/build/tools/"/>
-- <property name="thrift_compiler"
value="${thrift.root}/compiler/cpp/thrift"/>
-+ <property name="thrift_compiler"
value="${thrift.root}/compiler/cpp/thrift"/>
-
- <!-- inherit from the java build file for version and other properties -->
- <property file="${thrift.java.dir}/build.properties" />
-@@ -38,8 +37,8 @@
- </condition>
- <property name="version"
value="${thrift.version}-snapshot"/>
-
-- <property name="fb303.final.name"
value="${fb303.artifactid}-${version}"/>
-- <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift-${version}.jar"/>
-+ <property name="fb303.final.name"
value="${fb303.artifactid}"/>
-+ <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift.jar"/>
-
- <property name="src" value="${basedir}/src"/>
- <property name="gen" value="${basedir}/gen-java"/>
-@@ -50,7 +49,7 @@
- <property name="fb303.jar.file"
location="${build.dir}/${fb303.final.name}.jar"/>
- <property name="fb303.pom.xml"
location="${build.dir}/${fb303.final.name}.pom"/>
-
-- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
-+ <target name="init" depends="setup.init"
unless="init.finished">
- <property name="init.finished" value="true"/>
- </target>
-
-@@ -72,13 +71,21 @@
- <!-- compile the base and thrift generated code and jar them -->
- <target name="dist" depends="init,generate">
- <echo message="Building ${fb303.final.name}.jar"/>
-- <javac destdir="${build.classes.dir}" debug="on">
-+ <javac destdir="${build.classes.dir}" debug="on"
includeantruntime="false" >
- <classpath>
- <pathelement location="${thrift.java.libthrift}"/>
-- <fileset dir="${thrift.root}/lib/java/build/lib">
-- <include name="*.jar"/>
-- </fileset>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.0-api.jar"/>
-+ </fileset>
- </classpath>
-+
- <src path="${src}"/>
- <src path="${gen}"/>
- <include name="**/*.java"/>
-@@ -99,97 +106,4 @@
- <delete dir="${build.dir}"/>
- <delete dir="${gen}"/>
- </target>
--
-- <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check"
unless="mvn.ant.tasks.found">
-- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
-- </target>
--
-- <target name="mvn.ant.tasks.check">
-- <condition property="mvn.ant.tasks.found">
-- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
-- </condition>
-- </target>
--
-- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
-- <echo message="${mvn.ant.task.jar}"/>
-- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
-- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
--
-- <!-- remote repositories used to download dependencies from -->
-- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
-- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
--
-- <!-- Pom file information -->
-- <artifact:pom id="pom"
-- groupId="${thrift.groupid}"
-- artifactId="${fb303.artifactid}"
-- version="${version}"
-- url="http://thrift.apache.org"
-- name="Apache Thrift"
-- description="Thrift is a software framework for scalable cross-language
services development."
-- packaging="pom"
-- >
-- <remoteRepository refid="central"/>
-- <remoteRepository refid="apache"/>
-- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
-- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
--
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
--
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
-- />
-- <!-- Thrift Developers -->
-- <developer id="mcslee" name="Mark Slee"/>
-- <developer id="dreiss" name="David Reiss"/>
-- <developer id="aditya" name="Aditya Agarwal"/>
-- <developer id="marck" name="Marc Kwiatkowski"/>
-- <developer id="jwang" name="James Wang"/>
-- <developer id="cpiro" name="Chris Piro"/>
-- <developer id="bmaurer" name="Ben Maurer"/>
-- <developer id="kclark" name="Kevin Clark"/>
-- <developer id="jake" name="Jake Luciani"/>
-- <developer id="bryanduxbury" name="Bryan Duxbury"/>
-- <developer id="esteve" name="Esteve Fernandez"/>
-- <developer id="todd" name="Todd Lipcon"/>
-- <developer id="geechorama" name="Andrew McGeachie"/>
-- <developer id="molinaro" name="Anthony Molinaro"/>
-- <developer id="roger" name="Roger Meier"/>
-- <developer id="jfarrell" name="Jake Farrell"/>
-- <developer id="jensg" name="Jens Geyer"/>
-- <developer id="carl" name="Carl Yeksigian"/>
--
-- <!-- Thrift dependencies list -->
-- <dependency groupId="org.apache.thrift"
artifactId="libthrift" version="${version}"/>
-- </artifact:pom>
--
-- <!-- Generate the pom file -->
-- <artifact:writepom pomRefId="pom"
file="${fb303.pom.xml}"/>
--
-- <property name="mvn.finished" value="true"/>
-- </target>
--
-- <macrodef name="signAndDeploy">
-- <!-- Sign and deploy jars to apache repo -->
-- <attribute name="file"/>
-- <attribute name="classifier" default=""/>
-- <attribute name="packaging" default="jar"/>
-- <attribute name="pom" default=""/>
-- <sequential>
-- <artifact:mvn fork="true">
-- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
-- <arg value="-DrepositoryId=${maven-repository-id}"/>
-- <arg value="-Durl=${maven-repository-url}"/>
-- <arg value="-DpomFile=@{pom}"/>
-- <arg value="-Dfile=@{file}"/>
-- <arg value="-Dclassifier=@{classifier}"/>
-- <arg value="-Dpackaging=@{packaging}"/>
-- <arg value="-Pgpg"/>
-- </artifact:mvn>
-- </sequential>
-- </macrodef>
--
-- <target name="publish" depends="clean,dist">
-- <!-- Compile, packages and then send release to apache maven repo -->
-- <!-- run with: ant -Drelease=true publish-->
-- <signAndDeploy file="${fb303.pom.xml}" packaging="pom"
classifier="" pom="${fb303.pom.xml}"/>
-- <signAndDeploy file="${fb303.jar.file}" packaging="jar"
classifier="" pom="${fb303.pom.xml}"/>
-- </target>
- </project>
diff --git a/libfb303-0.10.0.pom b/libfb303-0.10.0.pom
new file mode 100644
index 0000000..c3fddde
--- /dev/null
+++ b/libfb303-0.10.0.pom
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ <version>0.10.0</version>
+ <packaging>pom</packaging>
+ <name>Apache Thrift</name>
+ <description>Thrift is a software framework for scalable cross-language services
development.</description>
+ <url>http://thrift.apache.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>mcslee</id>
+ <name>Mark Slee</name>
+ </developer>
+ <developer>
+ <id>dreiss</id>
+ <name>David Reiss</name>
+ </developer>
+ <developer>
+ <id>aditya</id>
+ <name>Aditya Agarwal</name>
+ </developer>
+ <developer>
+ <id>marck</id>
+ <name>Marc Kwiatkowski</name>
+ </developer>
+ <developer>
+ <id>jwang</id>
+ <name>James Wang</name>
+ </developer>
+ <developer>
+ <id>cpiro</id>
+ <name>Chris Piro</name>
+ </developer>
+ <developer>
+ <id>bmaurer</id>
+ <name>Ben Maurer</name>
+ </developer>
+ <developer>
+ <id>kclark</id>
+ <name>Kevin Clark</name>
+ </developer>
+ <developer>
+ <id>jake</id>
+ <name>Jake Luciani</name>
+ </developer>
+ <developer>
+ <id>bryanduxbury</id>
+ <name>Bryan Duxbury</name>
+ </developer>
+ <developer>
+ <id>esteve</id>
+ <name>Esteve Fernandez</name>
+ </developer>
+ <developer>
+ <id>todd</id>
+ <name>Todd Lipcon</name>
+ </developer>
+ <developer>
+ <id>geechorama</id>
+ <name>Andrew McGeachie</name>
+ </developer>
+ <developer>
+ <id>molinaro</id>
+ <name>Anthony Molinaro</name>
+ </developer>
+ <developer>
+ <id>roger</id>
+ <name>Roger Meier</name>
+ </developer>
+ <developer>
+ <id>jfarrell</id>
+ <name>Jake Farrell</name>
+ </developer>
+ <developer>
+ <id>jensg</id>
+ <name>Jens Geyer</name>
+ </developer>
+ <developer>
+ <id>carl</id>
+ <name>Carl Yeksigian</name>
+ </developer>
+ </developers>
+ <scm>
+
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
+
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
+ <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.10.0</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/libfb303-0.9.1.pom b/libfb303-0.9.1.pom
deleted file mode 100644
index 29d0dff..0000000
--- a/libfb303-0.9.1.pom
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libfb303</artifactId>
- <version>0.9.1</version>
- <packaging>pom</packaging>
- <name>Apache Thrift</name>
- <description>Thrift is a software framework for scalable cross-language services
development.</description>
- <url>http://thrift.apache.org</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- <developers>
- <developer>
- <id>mcslee</id>
- <name>Mark Slee</name>
- </developer>
- <developer>
- <id>dreiss</id>
- <name>David Reiss</name>
- </developer>
- <developer>
- <id>aditya</id>
- <name>Aditya Agarwal</name>
- </developer>
- <developer>
- <id>marck</id>
- <name>Marc Kwiatkowski</name>
- </developer>
- <developer>
- <id>jwang</id>
- <name>James Wang</name>
- </developer>
- <developer>
- <id>cpiro</id>
- <name>Chris Piro</name>
- </developer>
- <developer>
- <id>bmaurer</id>
- <name>Ben Maurer</name>
- </developer>
- <developer>
- <id>kclark</id>
- <name>Kevin Clark</name>
- </developer>
- <developer>
- <id>jake</id>
- <name>Jake Luciani</name>
- </developer>
- <developer>
- <id>bryanduxbury</id>
- <name>Bryan Duxbury</name>
- </developer>
- <developer>
- <id>esteve</id>
- <name>Esteve Fernandez</name>
- </developer>
- <developer>
- <id>todd</id>
- <name>Todd Lipcon</name>
- </developer>
- <developer>
- <id>geechorama</id>
- <name>Andrew McGeachie</name>
- </developer>
- <developer>
- <id>molinaro</id>
- <name>Anthony Molinaro</name>
- </developer>
- <developer>
- <id>roger</id>
- <name>Roger Meier</name>
- </developer>
- <developer>
- <id>jfarrell</id>
- <name>Jake Farrell</name>
- </developer>
- <developer>
- <id>jensg</id>
- <name>Jens Geyer</name>
- </developer>
- <developer>
- <id>carl</id>
- <name>Carl Yeksigian</name>
- </developer>
- </developers>
- <scm>
-
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
-
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
- <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/libthrift-0.10.0.pom b/libthrift-0.10.0.pom
new file mode 100644
index 0000000..7c5f61d
--- /dev/null
+++ b/libthrift-0.10.0.pom
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.10.0</version>
+ <packaging>pom</packaging>
+ <name>Apache Thrift</name>
+ <description>Thrift is a software framework for scalable cross-language services
development.</description>
+ <url>http://thrift.apache.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>mcslee</id>
+ <name>Mark Slee</name>
+ </developer>
+ <developer>
+ <id>dreiss</id>
+ <name>David Reiss</name>
+ </developer>
+ <developer>
+ <id>aditya</id>
+ <name>Aditya Agarwal</name>
+ </developer>
+ <developer>
+ <id>marck</id>
+ <name>Marc Kwiatkowski</name>
+ </developer>
+ <developer>
+ <id>jwang</id>
+ <name>James Wang</name>
+ </developer>
+ <developer>
+ <id>cpiro</id>
+ <name>Chris Piro</name>
+ </developer>
+ <developer>
+ <id>bmaurer</id>
+ <name>Ben Maurer</name>
+ </developer>
+ <developer>
+ <id>kclark</id>
+ <name>Kevin Clark</name>
+ </developer>
+ <developer>
+ <id>jake</id>
+ <name>Jake Luciani</name>
+ </developer>
+ <developer>
+ <id>bryanduxbury</id>
+ <name>Bryan Duxbury</name>
+ </developer>
+ <developer>
+ <id>esteve</id>
+ <name>Esteve Fernandez</name>
+ </developer>
+ <developer>
+ <id>todd</id>
+ <name>Todd Lipcon</name>
+ </developer>
+ <developer>
+ <id>geechorama</id>
+ <name>Andrew McGeachie</name>
+ </developer>
+ <developer>
+ <id>molinaro</id>
+ <name>Anthony Molinaro</name>
+ </developer>
+ <developer>
+ <id>roger</id>
+ <name>Roger Meier</name>
+ </developer>
+ <developer>
+ <id>jfarrell</id>
+ <name>Jake Farrell</name>
+ </developer>
+ <developer>
+ <id>jensg</id>
+ <name>Jens Geyer</name>
+ </developer>
+ <developer>
+ <id>carl</id>
+ <name>Carl Yeksigian</name>
+ </developer>
+ </developers>
+ <scm>
+
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
+
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
+ <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/libthrift-0.9.1.pom b/libthrift-0.9.1.pom
deleted file mode 100644
index 9a146f0..0000000
--- a/libthrift-0.9.1.pom
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
- <packaging>pom</packaging>
- <name>Apache Thrift</name>
- <description>Thrift is a software framework for scalable cross-language services
development.</description>
- <url>http://thrift.apache.org</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- <developers>
- <developer>
- <id>mcslee</id>
- <name>Mark Slee</name>
- </developer>
- <developer>
- <id>dreiss</id>
- <name>David Reiss</name>
- </developer>
- <developer>
- <id>aditya</id>
- <name>Aditya Agarwal</name>
- </developer>
- <developer>
- <id>marck</id>
- <name>Marc Kwiatkowski</name>
- </developer>
- <developer>
- <id>jwang</id>
- <name>James Wang</name>
- </developer>
- <developer>
- <id>cpiro</id>
- <name>Chris Piro</name>
- </developer>
- <developer>
- <id>bmaurer</id>
- <name>Ben Maurer</name>
- </developer>
- <developer>
- <id>kclark</id>
- <name>Kevin Clark</name>
- </developer>
- <developer>
- <id>jake</id>
- <name>Jake Luciani</name>
- </developer>
- <developer>
- <id>bryanduxbury</id>
- <name>Bryan Duxbury</name>
- </developer>
- <developer>
- <id>esteve</id>
- <name>Esteve Fernandez</name>
- </developer>
- <developer>
- <id>todd</id>
- <name>Todd Lipcon</name>
- </developer>
- <developer>
- <id>geechorama</id>
- <name>Andrew McGeachie</name>
- </developer>
- <developer>
- <id>molinaro</id>
- <name>Anthony Molinaro</name>
- </developer>
- <developer>
- <id>roger</id>
- <name>Roger Meier</name>
- </developer>
- <developer>
- <id>jfarrell</id>
- <name>Jake Farrell</name>
- </developer>
- <developer>
- <id>jensg</id>
- <name>Jens Geyer</name>
- </developer>
- <developer>
- <id>carl</id>
- <name>Carl Yeksigian</name>
- </developer>
- </developers>
- <scm>
-
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
-
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
- <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.2.4</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/sources b/sources
index d078a98..f7d47e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-147e8f2d3e48a272559aea554afdaf81 0.9.1.tar.gz
+SHA512 (thrift-0.10.0.tar.gz) =
3695cf0fb0e4080b02446ab694fb61476997d8b181942dd6fe1e3e7cf0dcf990b4184ea33f9d0bc290b96200f702cf1ac1579e36b6b5bfe9ba8914b2d2938ddc
diff --git a/thrift-0.10.0-buildxml.patch b/thrift-0.10.0-buildxml.patch
new file mode 100644
index 0000000..db4b497
--- /dev/null
+++ b/thrift-0.10.0-buildxml.patch
@@ -0,0 +1,235 @@
+diff --git a/lib/java/build.xml b/lib/java/build.xml
+index 40e5284..db1ce54 100644
+--- a/lib/java/build.xml
++++ b/lib/java/build.xml
+@@ -17,8 +17,7 @@
+ specific language governing permissions and limitations
+ under the License.
+ -->
+-<project name="libthrift" default="dist" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="libthrift" default="dist"
basedir=".">
+
+ <description>Thrift Build File</description>
+ <property name="thrift.root" location="../../"/>
+@@ -67,8 +66,15 @@
+ <property name="pom.xml"
location="${build.dir}/${final.name}.pom"/>
+
+ <path id="compile.classpath">
+- <fileset dir="${build.lib.dir}">
+- <include name="**/*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.1-api.jar"/>
+ </fileset>
+ </path>
+
+@@ -78,11 +84,14 @@
+ <pathelement location="${build.test.dir}"/>
+ <pathelement location="${jar.file}"/>
+ <pathelement location="${test.jar.file}"/>
+-
++ <fileset dir="/usr/share/java">
++ <include name="junit.jar"/>
++ <include name="slf4j/log4j12.jar"/>
++ </fileset>
+ </path>
+
+ <!-- Tasks -->
+- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
++ <target name="init" depends="setup.init"
unless="init.finished">
+ <property name="init.finished" value="true"/>
+ </target>
+
+@@ -295,120 +304,12 @@
+ </target>
+
+ <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check,proxy"
unless="mvn.ant.tasks.found">
+- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
+ </target>
+
+ <target name="mvn.ant.tasks.check">
+- <condition property="mvn.ant.tasks.found">
+- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
+- </condition>
+ </target>
+
+- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
+- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
+- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
+-
+- <!-- remote repositories used to download dependencies from -->
+- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
+- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
+-
+- <!-- Pom file information -->
+- <artifact:pom id="pom"
+- groupId="${thrift.groupid}"
+- artifactId="${thrift.artifactid}"
+- version="${version}"
+- url="http://thrift.apache.org"
+- name="Apache Thrift"
+- description="Thrift is a software framework for scalable cross-language
services development."
+- packaging="pom"
+- >
+- <remoteRepository refid="central"/>
+- <remoteRepository refid="apache"/>
+- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
+- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
+-
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
+-
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
+- />
+- <!-- Thrift Developers -->
+- <developer id="mcslee" name="Mark Slee"/>
+- <developer id="dreiss" name="David Reiss"/>
+- <developer id="aditya" name="Aditya Agarwal"/>
+- <developer id="marck" name="Marc Kwiatkowski"/>
+- <developer id="jwang" name="James Wang"/>
+- <developer id="cpiro" name="Chris Piro"/>
+- <developer id="bmaurer" name="Ben Maurer"/>
+- <developer id="kclark" name="Kevin Clark"/>
+- <developer id="jake" name="Jake Luciani"/>
+- <developer id="bryanduxbury" name="Bryan Duxbury"/>
+- <developer id="esteve" name="Esteve Fernandez"/>
+- <developer id="todd" name="Todd Lipcon"/>
+- <developer id="geechorama" name="Andrew McGeachie"/>
+- <developer id="molinaro" name="Anthony Molinaro"/>
+- <developer id="roger" name="Roger Meier"/>
+- <developer id="jfarrell" name="Jake Farrell"/>
+- <developer id="jensg" name="Jens Geyer"/>
+- <developer id="carl" name="Carl Yeksigian"/>
+-
+- <!-- Thrift dependencies list -->
+- <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="${slf4j.version}"/>
+- <dependency groupId="javax.servlet"
artifactId="servlet-api" version="${servlet.version}"
scope="provided"/>
+- <dependency groupId="org.apache.httpcomponents"
artifactId="httpclient" version="${httpclient.version}"/>
+- <dependency groupId="org.apache.httpcomponents"
artifactId="httpcore" version="${httpcore.version}"/>
+- </artifact:pom>
+-
+- <!-- Generate the pom file -->
+- <artifact:writepom pomRefId="pom" file="${pom.xml}"/>
+-
+- <!-- Download the dependencies -->
+- <artifact:dependencies filesetId="build-dependency-jars"
pomRefId="pom"/>
+-
+- <!-- Copy the dependencies to the build/lib dir -->
+- <copy todir="${build.dir}/lib">
+- <fileset refid="build-dependency-jars"/>
+- <mapper type="flatten"/>
+- </copy>
+-
+- <!-- Dependencies needed for testing -->
+- <artifact:dependencies filesetId="test-dependency-jars"
useScope="runtime">
+- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12"
version="${slf4j.version}"/>
+- <dependency groupId="junit" artifactId="junit"
version="4.4"/>
+- </artifact:dependencies>
+-
+- <!-- Copy the test dependencies to the build/lib dir -->
+- <copy todir="${build.dir}/lib">
+- <fileset refid="test-dependency-jars"/>
+- <mapper type="flatten"/>
+- </copy>
+-
+- <property name="mvn.finished" value="true"/>
++ <target name="mvn.init" unless="mvn.finished">
+ </target>
+
+- <macrodef name="signAndDeploy">
+- <!-- Sign and deploy jars to apache repo -->
+- <attribute name="file"/>
+- <attribute name="classifier" default=""/>
+- <attribute name="packaging" default="jar"/>
+- <attribute name="pom" default=""/>
+- <sequential>
+- <artifact:mvn fork="true">
+- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file"/>
+- <arg value="-DrepositoryId=${maven-repository-id}"/>
+- <arg value="-Durl=${maven-repository-url}"/>
+- <arg value="-DpomFile=@{pom}"/>
+- <arg value="-Dfile=@{file}"/>
+- <arg value="-Dclassifier=@{classifier}"/>
+- <arg value="-Dpackaging=@{packaging}"/>
+- <arg value="-Pgpg"/>
+- </artifact:mvn>
+- </sequential>
+- </macrodef>
+-
+- <target name="publish"
depends="clean,init,test,dist,javadoc,pack.src">
+- <!-- Compile, package, test and then send release to apache maven repo -->
+- <!-- run with: ant -Drelease=true publish-->
+- <signAndDeploy file="${pom.xml}" packaging="pom"
classifier="" pom="${pom.xml}"/>
+- <signAndDeploy file="${jar.file}" classifier=""
pom="${pom.xml}"/>
+- <signAndDeploy file="${javadoc.jar.file}"
classifier="javadoc" pom="${pom.xml}"/>
+- <signAndDeploy file="${source.jar.file}" classifier="sources"
pom="${pom.xml}"/>
+- </target>
+ </project>
+diff --git a/tutorial/java/build.xml b/tutorial/java/build.xml
+index 7638d5b..c5ca703 100644
+--- a/tutorial/java/build.xml
++++ b/tutorial/java/build.xml
+@@ -29,13 +29,33 @@
+ <include name="*.jar" />
+ <exclude name="-test.jar" />
+ </fileset>
+- <fileset dir="../../lib/java/build/lib">
+- <include name="*.jar" />
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.1-api.jar"/>
+ </fileset>
+ </path>
+ <path id="build.classpath">
+- <path refid="libs.classpath" />
+ <pathelement path="${gen}" />
++ <fileset dir="../../lib/java/build">
++ <include name="*.jar" />
++ <exclude name="-test.jar" />
++ </fileset>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.1-api.jar"/>
++ </fileset>
+ </path>
+ <path id="tutorial.classpath">
+ <path refid="build.classpath" />
+diff --git a/tutorial/js/build.xml b/tutorial/js/build.xml
+index a9a9ad4..2fddf0c 100644
+--- a/tutorial/js/build.xml
++++ b/tutorial/js/build.xml
+@@ -35,8 +35,16 @@
+ <include name="*.jar" />
+ <exclude name="-test.jar" />
+ </fileset>
+- <fileset dir="../../lib/java/build/lib">
+- <include name="*.jar" />
++
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.1-api.jar"/>
+ </fileset>
+ </path>
+ <path id="build.classpath">
diff --git a/thrift-0.9.1-Adapt-to-GCC-6.patch b/thrift-0.9.1-Adapt-to-GCC-6.patch
deleted file mode 100644
index 1ee09b9..0000000
--- a/thrift-0.9.1-Adapt-to-GCC-6.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 049d078b605900efec98c6a9caceb17cdc10c5e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
-Date: Wed, 30 Mar 2016 14:47:26 +0200
-Subject: [PATCH] Adapt to GCC 6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 6 produces this error:
-
-src/generate/t_java_generator.cc: In member function 'void
t_java_generator::generate_process_async_function(t_service*, t_function*)':
-src/generate/t_java_generator.cc:2830:14: error: operands to ?: have different types
'bool' and 'std::basic_ostream<char>'
- first ? first = false : indent(f_service_) << "else ";
- ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This patch ports relevant part of upstream commit:
-
-t 16a23a6618754a5a87aeb8df99a72516b0272fb3
-Author: Konrad Grochowski <hcorg(a)apache.org>
-Date: Thu Nov 13 15:33:38 2014 +0100
-
- THRIFT-2729: C++ - .clang-format created and applied
-
- Client: C++
- Patch: Konrad Grochowski
-
- make style command added
-
-and:
-
-commit 5f2d34e5ab33651059a085525b3adbab6a877e6f
-Author: Roger Meier <roger(a)apache.org>
-Date: Sat Nov 16 16:43:41 2013 +0100
-
- THRIFT-2229 thrift failed to build on OSX 10.9 GM
-
-that are part of 0.9.3 release.
-
-<https://bugzilla.redhat.com/show_bug.cgi?id=1306671>
-
-Signed-off-by: Petr Psa <ppisar(a)redhat.com>
----
- compiler/cpp/src/generate/t_java_generator.cc | 3 ++-
- compiler/cpp/src/generate/t_rb_generator.cc | 8 ++++----
- tutorial/cpp/CppClient.cpp | 6 +++---
- tutorial/cpp/CppServer.cpp | 16 ++++++++--------
- 4 files changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/compiler/cpp/src/generate/t_java_generator.cc
b/compiler/cpp/src/generate/t_java_generator.cc
-index e443dc0..0f8740e 100644
---- a/compiler/cpp/src/generate/t_java_generator.cc
-+++ b/compiler/cpp/src/generate/t_java_generator.cc
-@@ -2827,7 +2827,8 @@ void t_java_generator::generate_process_async_function(t_service*
tservice,
- bool first = true;
- if (xceptions.size() > 0) {
- for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-- first ? first = false : indent(f_service_) << "else ";
-+ if (x_iter != xceptions.begin())
-+ indent(f_service_) << "else ";
- indent(f_service_) << "if (e instanceof " <<
type_name((*x_iter)->get_type(), false, false)<<") {" << endl;
- indent(f_service_) << indent() << "result." <<
(*x_iter)->get_name() << " = (" <<
type_name((*x_iter)->get_type(), false, false) << ") e;" <<
endl;
- indent(f_service_) << indent() << "result.set" <<
get_cap_name((*x_iter)->get_name()) << get_cap_name("isSet") <<
"(true);" << endl;
-diff --git a/compiler/cpp/src/generate/t_rb_generator.cc
b/compiler/cpp/src/generate/t_rb_generator.cc
-index 082f316..fc679a1 100644
---- a/compiler/cpp/src/generate/t_rb_generator.cc
-+++ b/compiler/cpp/src/generate/t_rb_generator.cc
-@@ -359,21 +359,21 @@ void t_rb_generator::generate_enum(t_enum* tenum) {
-
- // Create a hash mapping values back to their names (as strings) since ruby has no
native enum type
- f_types_.indent() << "VALUE_MAP = {";
-- bool first = true;
- for(c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
- // Populate the hash
- int value = (*c_iter)->get_value();
-- first ? first = false : f_types_ << ", ";
-+ if (c_iter != constants.begin())
-+ f_types_ << ", ";
- f_types_ << value << " => \"" <<
capitalize((*c_iter)->get_name()) << "\"";
- }
- f_types_ << "}" << endl;
-
- // Create a set with valid values for this enum
- f_types_.indent() << "VALID_VALUES = Set.new([";
-- first = true;
- for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
- // Populate the set
-- first ? first = false : f_types_ << ", ";
-+ if (c_iter != constants.begin())
-+ f_types_ << ", ";
- f_types_ << capitalize((*c_iter)->get_name());
- }
- f_types_ << "]).freeze" << endl;
-diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/CppClient.cpp
-index ba71caa..b91df2e 100644
---- a/tutorial/cpp/CppClient.cpp
-+++ b/tutorial/cpp/CppClient.cpp
-@@ -38,9 +38,9 @@ using namespace shared;
- using namespace boost;
-
- int main(int argc, char** argv) {
-- shared_ptr<TTransport> socket(new TSocket("localhost", 9090));
-- shared_ptr<TTransport> transport(new TBufferedTransport(socket));
-- shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-+ boost::shared_ptr<TTransport> socket(new TSocket("localhost", 9090));
-+ boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));
-+ boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
- CalculatorClient client(protocol);
-
- try {
-diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp
-index d0dbad9..f19258c 100644
---- a/tutorial/cpp/CppServer.cpp
-+++ b/tutorial/cpp/CppServer.cpp
-@@ -113,11 +113,11 @@ protected:
-
- int main(int argc, char **argv) {
-
-- shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
-- shared_ptr<CalculatorHandler> handler(new CalculatorHandler());
-- shared_ptr<TProcessor> processor(new CalculatorProcessor(handler));
-- shared_ptr<TServerTransport> serverTransport(new TServerSocket(9090));
-- shared_ptr<TTransportFactory> transportFactory(new
TBufferedTransportFactory());
-+ boost::shared_ptr<TProtocolFactory> protocolFactory(new
TBinaryProtocolFactory());
-+ boost::shared_ptr<CalculatorHandler> handler(new CalculatorHandler());
-+ boost::shared_ptr<TProcessor> processor(new CalculatorProcessor(handler));
-+ boost::shared_ptr<TServerTransport> serverTransport(new TServerSocket(9090));
-+ boost::shared_ptr<TTransportFactory> transportFactory(new
TBufferedTransportFactory());
-
- TSimpleServer server(processor,
- serverTransport,
-@@ -128,10 +128,10 @@ int main(int argc, char **argv) {
- /**
- * Or you could do one of these
-
-- shared_ptr<ThreadManager> threadManager =
-+ boost::shared_ptr<ThreadManager> threadManager =
- ThreadManager::newSimpleThreadManager(workerCount);
-- shared_ptr<PosixThreadFactory> threadFactory =
-- shared_ptr<PosixThreadFactory>(new PosixThreadFactory());
-+ boost::shared_ptr<PosixThreadFactory> threadFactory =
-+ boost::shared_ptr<PosixThreadFactory>(new PosixThreadFactory());
- threadManager->threadFactory(threadFactory);
- threadManager->start();
- TThreadPoolServer server(processor,
---
-2.5.5
-
diff --git a/thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
b/thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
deleted file mode 100644
index 4a7671f..0000000
--- a/thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f4e6e62ea091b94322ecc99756269dbee1c06380 Mon Sep 17 00:00:00 2001
-From: Ben Craig <bencraig(a)apache.org>
-Date: Tue, 5 Nov 2013 19:49:12 -0600
-Subject: [PATCH 081/223] THRIFT-2214: System header sys/param.h is included
- inside the Thrift namespace Client: cpp Patch: Vladimir Strisovsky
-
----
- lib/cpp/src/thrift/protocol/TProtocol.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/cpp/src/thrift/protocol/TProtocol.h
b/lib/cpp/src/thrift/protocol/TProtocol.h
-index d6ecc0f..e72033a 100644
---- a/lib/cpp/src/thrift/protocol/TProtocol.h
-+++ b/lib/cpp/src/thrift/protocol/TProtocol.h
-@@ -75,10 +75,6 @@ static inline To bitwise_cast(From from) {
- }
-
-
--namespace apache { namespace thrift { namespace protocol {
--
--using apache::thrift::transport::TTransport;
--
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
-@@ -140,6 +136,10 @@ using apache::thrift::transport::TTransport;
- # error "Can't define htonll or ntohll!"
- #endif
-
-+namespace apache { namespace thrift { namespace protocol {
-+
-+using apache::thrift::transport::TTransport;
-+
- /**
- * Enumerated definition of the types that the Thrift protocol supports.
- * Take special note of the T_END type which is used specifically to mark
---
-2.6.1
-
diff --git a/thrift-0.9.1-buildxml.patch b/thrift-0.9.1-buildxml.patch
deleted file mode 100644
index d0f8f58..0000000
--- a/thrift-0.9.1-buildxml.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff --git a/lib/java/build.xml b/lib/java/build.xml
-index c2bfd9c..69525e7 100755
---- a/lib/java/build.xml
-+++ b/lib/java/build.xml
-@@ -17,8 +17,7 @@
- specific language governing permissions and limitations
- under the License.
- -->
--<project name="libthrift" default="dist" basedir="."
-- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-+<project name="libthrift" default="dist"
basedir=".">
-
- <description>Thrift Build File</description>
- <property name="thrift.root" location="../../"/>
-@@ -64,8 +63,15 @@
- <property name="pom.xml"
location="${build.dir}/${final.name}.pom"/>
-
- <path id="compile.classpath">
-- <fileset dir="${build.lib.dir}">
-- <include name="**/*.jar"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.1-api.jar"/>
- </fileset>
- </path>
-
-@@ -75,10 +81,14 @@
- <pathelement location="${build.test.dir}"/>
- <pathelement location="${jar.file}"/>
- <pathelement location="${test.jar.file}"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="junit.jar"/>
-+ <include name="slf4j/log4j12.jar"/>
-+ </fileset>
- </path>
-
- <!-- Tasks -->
-- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
-+ <target name="init" depends="setup.init"
unless="init.finished">
- <property name="init.finished" value="true"/>
- </target>
-
-@@ -262,121 +272,12 @@
- </target>
-
- <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check,proxy"
unless="mvn.ant.tasks.found">
-- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
- </target>
-
- <target name="mvn.ant.tasks.check">
-- <condition property="mvn.ant.tasks.found">
-- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
-- </condition>
- </target>
-
-- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
-- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
-- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
--
-- <!-- remote repositories used to download dependencies from -->
-- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
-- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
--
-- <!-- Pom file information -->
-- <artifact:pom id="pom"
-- groupId="${thrift.groupid}"
-- artifactId="${thrift.artifactid}"
-- version="${version}"
-- url="http://thrift.apache.org"
-- name="Apache Thrift"
-- description="Thrift is a software framework for scalable cross-language
services development."
-- packaging="pom"
-- >
-- <remoteRepository refid="central"/>
-- <remoteRepository refid="apache"/>
-- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
-- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
--
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
--
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
-- />
-- <!-- Thrift Developers -->
-- <developer id="mcslee" name="Mark Slee"/>
-- <developer id="dreiss" name="David Reiss"/>
-- <developer id="aditya" name="Aditya Agarwal"/>
-- <developer id="marck" name="Marc Kwiatkowski"/>
-- <developer id="jwang" name="James Wang"/>
-- <developer id="cpiro" name="Chris Piro"/>
-- <developer id="bmaurer" name="Ben Maurer"/>
-- <developer id="kclark" name="Kevin Clark"/>
-- <developer id="jake" name="Jake Luciani"/>
-- <developer id="bryanduxbury" name="Bryan Duxbury"/>
-- <developer id="esteve" name="Esteve Fernandez"/>
-- <developer id="todd" name="Todd Lipcon"/>
-- <developer id="geechorama" name="Andrew McGeachie"/>
-- <developer id="molinaro" name="Anthony Molinaro"/>
-- <developer id="roger" name="Roger Meier"/>
-- <developer id="jfarrell" name="Jake Farrell"/>
-- <developer id="jensg" name="Jens Geyer"/>
-- <developer id="carl" name="Carl Yeksigian"/>
--
-- <!-- Thrift dependencies list -->
-- <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="${slf4j.version}"/>
-- <dependency groupId="org.apache.commons"
artifactId="commons-lang3" version="${commons-lang3.version}"/>
-- <dependency groupId="javax.servlet"
artifactId="servlet-api" version="${servlet.version}"
scope="provided"/>
-- <dependency groupId="org.apache.httpcomponents"
artifactId="httpclient" version="${httpclient.version}"/>
-- <dependency groupId="org.apache.httpcomponents"
artifactId="httpcore" version="${httpcore.version}"/>
-- </artifact:pom>
--
-- <!-- Generate the pom file -->
-- <artifact:writepom pomRefId="pom" file="${pom.xml}"/>
--
-- <!-- Download the dependencies -->
-- <artifact:dependencies filesetId="build-dependency-jars"
pomRefId="pom"/>
--
-- <!-- Copy the dependencies to the build/lib dir -->
-- <copy todir="${build.dir}/lib">
-- <fileset refid="build-dependency-jars"/>
-- <mapper type="flatten"/>
-- </copy>
--
-- <!-- Dependencies needed for testing -->
-- <artifact:dependencies filesetId="test-dependency-jars"
useScope="runtime">
-- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12"
version="1.5.8"/>
-- <dependency groupId="junit" artifactId="junit"
version="4.4"/>
-- </artifact:dependencies>
--
-- <!-- Copy the test dependencies to the build/lib dir -->
-- <copy todir="${build.dir}/lib">
-- <fileset refid="test-dependency-jars"/>
-- <mapper type="flatten"/>
-- </copy>
--
-- <property name="mvn.finished" value="true"/>
-+ <target name="mvn.init" unless="mvn.finished">
- </target>
-
-- <macrodef name="signAndDeploy">
-- <!-- Sign and deploy jars to apache repo -->
-- <attribute name="file"/>
-- <attribute name="classifier" default=""/>
-- <attribute name="packaging" default="jar"/>
-- <attribute name="pom" default=""/>
-- <sequential>
-- <artifact:mvn fork="true">
-- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
-- <arg value="-DrepositoryId=${maven-repository-id}"/>
-- <arg value="-Durl=${maven-repository-url}"/>
-- <arg value="-DpomFile=@{pom}"/>
-- <arg value="-Dfile=@{file}"/>
-- <arg value="-Dclassifier=@{classifier}"/>
-- <arg value="-Dpackaging=@{packaging}"/>
-- <arg value="-Pgpg"/>
-- </artifact:mvn>
-- </sequential>
-- </macrodef>
--
-- <target name="publish"
depends="clean,init,test,dist,javadoc,pack.src">
-- <!-- Compile, package, test and then send release to apache maven repo -->
-- <!-- run with: ant -Drelease=true publish-->
-- <signAndDeploy file="${pom.xml}" packaging="pom"
classifier="" pom="${pom.xml}"/>
-- <signAndDeploy file="${jar.file}" packaging="jar"
classifier="" pom="${pom.xml}"/>
-- <signAndDeploy file="${javadoc.jar.file}" packaging="jar"
classifier="javadoc" pom="${pom.xml}"/>
-- <signAndDeploy file="${source.tar.gz}" packaging="src"
classifier="tar.gz" pom="${pom.xml}"/>
-- </target>
- </project>
-diff --git a/tutorial/java/build.xml b/tutorial/java/build.xml
-index eceeca7..bc6a837 100644
---- a/tutorial/java/build.xml
-+++ b/tutorial/java/build.xml
-@@ -29,13 +29,33 @@
- <include name="*.jar" />
- <exclude name="-test.jar" />
- </fileset>
-- <fileset dir="../../lib/java/build/lib">
-- <include name="*.jar" />
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.1-api.jar"/>
- </fileset>
- </path>
- <path id="build.classpath">
-- <path refid="libs.classpath" />
- <pathelement path="${gen}" />
-+ <fileset dir="../../lib/java/build">
-+ <include name="*.jar" />
-+ <exclude name="-test.jar" />
-+ </fileset>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.1-api.jar"/>
-+ </fileset>
- </path>
- <path id="tutorial.classpath">
- <path refid="build.classpath" />
-@@ -50,8 +70,8 @@
- </target>
-
- <target name="compile" depends="init, generate">
-- <javac srcdir="${gen}" destdir="${build}"
classpathref="libs.classpath" />
-- <javac srcdir="${src}" destdir="${build}"
classpathref="build.classpath" />
-+ <javac srcdir="${gen}" destdir="${build}"
classpathref="libs.classpath" includeantruntime="false" />
-+ <javac srcdir="${src}" destdir="${build}"
classpathref="build.classpath" includeantruntime="false" />
- </target>
-
- <target name="test" depends="tutorial" />
-diff --git a/tutorial/js/build.xml b/tutorial/js/build.xml
-index 73d535d..e3ee1e2 100644
---- a/tutorial/js/build.xml
-+++ b/tutorial/js/build.xml
-@@ -35,8 +35,16 @@
- <include name="*.jar" />
- <exclude name="-test.jar" />
- </fileset>
-- <fileset dir="../../lib/java/build/lib">
-- <include name="*.jar" />
-+
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-codec.jar"/>
-+ <include name="commons-lang.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="httpcomponents/httpcore.jar"/>
-+ <include name="httpcomponents/httpclient.jar"/>
-+ <include name="log4j.jar"/>
-+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.1-api.jar"/>
- </fileset>
- </path>
- <path id="build.classpath">
diff --git a/thrift-0.9.1-rebar.patch b/thrift-0.9.1-rebar.patch
deleted file mode 100644
index 6207c13..0000000
--- a/thrift-0.9.1-rebar.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/lib/erl/rebar.config 2013-08-21 15:39:39.121081905 -0500
-+++ b/lib/erl/rebar.config 2013-08-21 15:43:19.351633734 -0500
-@@ -1,5 +1,4 @@
- {erl_opts, [debug_info]}.
- {lib_dirs, ["deps"]}.
- {deps, [
-- { jsx, "1.2.1", {git,
"git://github.com/talentdeficit/jsx.git", {tag, "v1.2.1"}}}
-- ]}.
-+]}.
diff --git a/thrift.spec b/thrift.spec
index 173aaa1..9eee937 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,22 +1,12 @@
-%global pkg_version 0.9.1
-%global fb303_version 1.0.0.dev0
-%global pkg_rel 17
-
-%global py_version 2.7
-
%global php_extdir %(php-config --extension-dir 2>/dev/null || echo
"undefined")
%{?perl_default_filter}
-%global __provides_exclude_from ^(%{python_sitearch}/.*\\.so|%{php_extdir}/.*\\.so)$
+%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{php_extdir}/.*\\.so)$
%global have_mongrel 0
-%if 0%{?fedora} >= 19 && 0%{?fedora} < 21
# erlang-jsx is available in F19 but orphaned in F22
-%global have_jsx 1
-%else
%global have_jsx 0
-%endif
# We should be able to enable this in the future
%global want_d 0
@@ -58,80 +48,60 @@
%global want_golang 0
%global golang_configure --without-go
-Name: thrift
-Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.6
-Summary: Software framework for cross-language services development
+Name: thrift
+Version: 0.10.0
+Release: 1%{?dist}
+Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
# these are OK for inclusion in an Apache 2.0-licensed whole:
-#
http://www.apache.org/legal/3party.html
+#
https://www.apache.org/legal/3party.html
# Here's the breakdown:
-# thrift-0.9.1/lib/py/compat/win32/stdint.h is 2-clause BSD
-# thrift-0.9.1/compiler/cpp/src/md5.[ch] are zlib
-License: ASL 2.0 and BSD and zlib
-URL:
http://thrift.apache.org/
+# ./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/
-%if "%{version}" != "0.9.1"
-Source0:
http://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
-%else
-# Unfortunately, the distribution tarball for thrift-0.9.1 is broken, so we're
-# using an exported tarball from git. This will change in the future.
+Source0:
https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
-Source0:
https://github.com/apache/thrift/archive/0.9.1.tar.gz
-%endif
-
-Source1:
http://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/lib...
-Source2:
https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh
+Source1:
https://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/li...
+Source2:
https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh
-Source3:
https://gitorious.org/pkg-scribe/thrift-deb-pkg/raw/master:debian/manpage...
-Source4:
http://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libfb...
+Source3:
https://gitorious.org/pkg-scribe/thrift-deb-pkg/raw/master:debian/manpage...
+Source4:
https://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libf...
# this patch is adapted from Gil Cattaneo's thrift-0.7.0 package
-Patch0: thrift-0.9.1-buildxml.patch
-# don't use bundled rebar executable
-Patch1: thrift-0.9.1-rebar.patch
+Patch0: %{name}-%{version}-buildxml.patch
# for fb303, excise maven ant tasks; build against system libraries; etc.
-Patch2: fb303-0.9.1-buildxml.patch
-# required to get it build on aarch64
-Patch3: thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
-# Adapt to GCC 6, bug #1306671, in 0.9.3
-Patch4: thrift-0.9.1-Adapt-to-GCC-6.patch
+Patch1: fb303-%{version}-buildxml.patch
+# fix configure.ac insistence on using /usr/local/lib for JAVA_PREFIX
+Patch2: configure-java-prefix.patch
-Group: Development/Libraries
+Group: Development/Libraries
# BuildRequires for language-specific bindings are listed under these
# subpackages, to facilitate enabling or disabling individual language
# bindings in the future
-BuildRequires: libstdc++-devel
-BuildRequires: boost-devel
-BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: openssl-devel
-BuildRequires: zlib-devel
-BuildRequires: bison-devel
-BuildRequires: flex-devel
-BuildRequires: glib2-devel
-BuildRequires: texlive
-BuildRequires: qt-devel
-
-BuildRequires: libtool
-BuildRequires: autoconf
-BuildRequires: automake
-
-BuildRequires: bison
-BuildRequires: flex
-BuildRequires: bison-devel
-BuildRequires: flex-devel
-
-BuildRequires: ant
-
+BuildRequires: ant >= 1.7
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: boost-devel
+BuildRequires: flex
+BuildRequires: flex-devel
+BuildRequires: glib2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libtool
+BuildRequires: openssl-devel
+BuildRequires: qt-devel
+BuildRequires: texlive
+BuildRequires: zlib-devel
%if 0%{?want_golang} > 0
-BuildRequires: golang
-Requires: golang
+BuildRequires: golang
+Requires: golang
%endif
%description
@@ -141,13 +111,13 @@ development combines a software stack with a code generation engine
to
build services that work efficiently and seamlessly between C++, Java,
Python, %{?php_langname}and other languages.
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig
-Requires: boost-devel
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+Requires: boost-devel
-%description devel
+%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
@@ -165,127 +135,128 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description glib
The %{name}-qt package contains GLib bindings for %{name}.
-%package -n python-%{name}
-Summary: Python support for %{name}
-BuildRequires: python2-devel
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python2
-
-%description -n python-%{name}
-The python-%{name} package contains Python bindings for %{name}.
-
-%package -n perl-%{name}
-Summary: Perl support for %{name}
-Provides: perl(Thrift) = %{version}-%{release}
-BuildRequires: perl-generators
-BuildRequires: perl(Bit::Vector)
-BuildRequires: perl(ExtUtils::MakeMaker)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: perl(Bit::Vector)
-Requires: perl(Encode)
-Requires: perl(HTTP::Request)
-Requires: perl(IO::Select)
-Requires: perl(IO::Socket::INET)
-Requires: perl(IO::String)
-Requires: perl(LWP::UserAgent)
-Requires: perl(POSIX)
-Requires: perl(base)
-Requires: perl(constant)
-Requires: perl(strict)
-Requires: perl(utf8)
-Requires: perl(warnings)
-BuildArch: noarch
+%package -n python2-%{name}
+Summary: Python 2 support for %{name}
+BuildRequires: python2-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python2
+Obsoletes: python-%{name} < 0.10.0-1%{?dist}
+
+%description -n python2-%{name}
+The python2-%{name} package contains Python bindings for %{name}.
+
+%package -n perl-%{name}
+Summary: Perl support for %{name}
+Provides: perl(Thrift) = %{version}-%{release}
+BuildRequires: perl(Bit::Vector)
+BuildRequires: perl(Class::Accessor)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl-generators
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(Bit::Vector)
+Requires: perl(Encode)
+Requires: perl(HTTP::Request)
+Requires: perl(IO::Select)
+Requires: perl(IO::Socket::INET)
+Requires: perl(IO::String)
+Requires: perl(LWP::UserAgent)
+Requires: perl(POSIX)
+Requires: perl(base)
+Requires: perl(constant)
+Requires: perl(strict)
+Requires: perl(utf8)
+Requires: perl(warnings)
+BuildArch: noarch
%description -n perl-%{name}
The perl-%{name} package contains Perl bindings for %{name}.
%if %{?want_d}
-%package -n d-%{name}
-Summary: D support for %{name}
-BuildRequires: ldc
+%package -n d-%{name}
+Summary: D support for %{name}
+BuildRequires: ldc
%description -n d-%{name}
The d-%{name} package contains D bindings for %{name}.
%endif
%if 0%{?want_php} != 0
-%package -n php-%{name}
-Summary: PHP support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: php(zend-abi) = %{php_zend_api}
-Requires: php(api) = %{php_core_api}
-Requires: php(language) >= 5.3.0
-Requires: php-date
-Requires: php-json
-BuildRequires: php-devel
+%package -n php-%{name}
+Summary: PHP support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
+Requires: php(language) >= 5.3.0
+Requires: php-date
+Requires: php-json
+BuildRequires: php-devel
%description -n php-%{name}
The php-%{name} package contains PHP bindings for %{name}.
%endif
-%package -n lib%{name}-javadoc
-Summary: API documentation for java-%{name}
-Requires: lib%{name}-java = %{version}-%{release}
-BuildArch: noarch
+%package -n lib%{name}-javadoc
+Summary: API documentation for java-%{name}
+Requires: lib%{name}-java = %{version}-%{release}
+BuildArch: noarch
%description -n lib%{name}-javadoc
The lib%{name}-javadoc package contains API documentation for the
Java bindings for %{name}.
-%package -n lib%{name}-java
-Summary: Java support for %{name}
-
-BuildRequires: java-devel
-BuildRequires: javapackages-tools
-BuildRequires: apache-commons-codec
-BuildRequires: apache-commons-lang
-BuildRequires: apache-commons-logging
-BuildRequires: httpcomponents-client
-BuildRequires: httpcomponents-core
-BuildRequires: junit
-BuildRequires: log4j
-BuildRequires: slf4j
-BuildRequires: tomcat-servlet-3.1-api
-
-Requires: java-headless >= 1:1.6.0
-Requires: javapackages-tools
-Requires: mvn(org.slf4j:slf4j-api)
-Requires: mvn(commons-lang:commons-lang)
-Requires: mvn(org.apache.httpcomponents:httpclient)
-Requires: mvn(org.apache.httpcomponents:httpcore)
-BuildArch: noarch
-
+%package -n lib%{name}-java
+Summary: Java support for %{name}
+
+BuildRequires: apache-commons-codec
+BuildRequires: apache-commons-lang
+BuildRequires: apache-commons-logging
+BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core
+BuildRequires: java-devel
+BuildRequires: javapackages-tools
+BuildRequires: junit
+BuildRequires: log4j
+BuildRequires: slf4j
+BuildRequires: tomcat-servlet-3.1-api
+
+Requires: java-headless >= 1:1.6.0
+Requires: javapackages-tools
+Requires: mvn(org.slf4j:slf4j-api)
+Requires: mvn(commons-lang:commons-lang)
+Requires: mvn(org.apache.httpcomponents:httpclient)
+Requires: mvn(org.apache.httpcomponents:httpcore)
+BuildArch: noarch
%description -n lib%{name}-java
The lib%{name}-java package contains Java bindings for %{name}.
%if 0%{?want_ruby} > 0
-%package -n ruby-%{name}
-Summary: Ruby support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: ruby(release)
-BuildRequires: ruby-devel
+%package -n ruby-%{name}
+Summary: Ruby support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: ruby(release)
+BuildRequires: ruby-devel
%description -n ruby-%{name}
The ruby-%{name} package contains Ruby bindings for %{name}.
%endif
%if 0%{?want_erlang} > 0
-%package -n erlang-%{name}
-Summary: Erlang support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: erlang
-Requires: erlang-jsx
-BuildRequires: erlang
-BuildRequires: erlang-rebar
+%package -n erlang-%{name}
+Summary: Erlang support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: erlang
+Requires: erlang-jsx
+BuildRequires: erlang
+BuildRequires: erlang-rebar
%description -n erlang-%{name}
The erlang-%{name} package contains Erlang bindings for %{name}.
%endif
%package -n fb303
-Summary: Basic interface for Thrift services
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: Basic interface for Thrift services
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n fb303
fb303 is the shared root of all Thrift services; it provides a
@@ -293,41 +264,37 @@ standard interface to monitoring, dynamic options and
configuration,
uptime reports, activity, etc.
%package -n fb303-devel
-Summary: Development files for fb303
-Requires: fb303%{?_isa} = %{version}-%{release}
+Summary: Development files for fb303
+Requires: fb303%{?_isa} = %{version}-%{release}
%description -n fb303-devel
The fb303-devel package contains header files for fb303
-%package -n python-fb303
-Summary: Python bindings for fb303
-Requires: fb303%{?_isa} = %{version}-%{release}
-BuildRequires: python2-devel
+%package -n python2-fb303
+Summary: Python 2 bindings for fb303
+Requires: fb303%{?_isa} = %{version}-%{release}
+BuildRequires: python2-devel
+Obsoletes: python-fb303 < 0.10.0-1%{?dist}
-%description -n python-fb303
-The python-fb303 package contains Python bindings for fb303.
+%description -n python2-fb303
+The python2-fb303 package contains Python bindings for fb303.
%package -n fb303-java
-Summary: Java bindings for fb303
-Requires: java >= 1:1.6.0
-Requires: javapackages-tools
-Requires: mvn(org.slf4j:slf4j-api)
-Requires: mvn(commons-lang:commons-lang)
-Requires: mvn(org.apache.httpcomponents:httpclient)
-Requires: mvn(org.apache.httpcomponents:httpcore)
-BuildArch: noarch
+Summary: Java bindings for fb303
+Requires: java >= 1:1.6.0
+Requires: javapackages-tools
+Requires: mvn(org.slf4j:slf4j-api)
+Requires: mvn(commons-lang:commons-lang)
+Requires: mvn(org.apache.httpcomponents:httpclient)
+Requires: mvn(org.apache.httpcomponents:httpcore)
+BuildArch: noarch
%description -n fb303-java
The fb303-java package contains Java bindings for fb303.
%global _default_patch_fuzz 2
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%autosetup -p1
%{?!el5:sed -i -e 's/^AC_PROG_LIBTOOL/LT_INIT/g' configure.ac}
@@ -347,6 +314,10 @@ echo 'EXTRA_libthriftz_la_DEPENDENCIES = libthrift.la'
>> lib/cpp/Makefile.am
sed -i 's|libfb303_so_LDFLAGS = $(SHARED_LDFLAGS)|libfb303_so_LDFLAGS =
$(SHARED_LDFLAGS) -lthrift -L../../../lib/cpp/.libs -Wl,--as-needed|g'
contrib/fb303/cpp/Makefile.am
+# fix broken upstream check for ant version; we enforce this with BuildRequires, so no
need to check here
+sed -i 's|ANT_VALID=.*|ANT_VALID=1|' aclocal/ax_javac_and_java.m4
+sed -i 's|ANT_VALID=.*|ANT_VALID=1|' contrib/fb303/aclocal/ax_javac_and_java.m4
+
%build
export PY_PREFIX=%{_prefix}
export PERL_PREFIX=%{_prefix}
@@ -401,7 +372,7 @@ make %{?_smp_mflags}
# build fb303
(
cd contrib/fb303
- chmod 755 bootstrap.sh
+ sed -i '/^[.][/]configure.*/d' bootstrap.sh
sh bootstrap.sh
%configure --disable-static --with-java --without-php --libdir=%{_libdir}
make %{?_smp_mflags}
@@ -469,12 +440,10 @@ install -pm 644 %{SOURCE4}
%{buildroot}%{_mavenpomdir}/JPP-libfb303.pom
# Ensure all python scripts are executable
find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod
755
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
%files
%doc LICENSE NOTICE
%{_bindir}/thrift
@@ -494,6 +463,8 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%{_includedir}/thrift
%exclude %{_includedir}/thrift/fb303
%{_libdir}/*.so
+%{_libdir}/*.so.0
+%{_libdir}/*.so.0.0.0
%exclude %{_libdir}/lib*-%{version}.so
%exclude %{_libdir}/libfb303.so
%{_libdir}/pkgconfig/thrift-z.pc
@@ -521,9 +492,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%endif
-%files -n python-%{name}
-%{python_sitearch}/%{name}
-%{python_sitearch}/%{name}-%{version}-py%{py_version}.egg-info
+%files -n python2-%{name}
+%{python2_sitearch}/%{name}
+%{python2_sitearch}/%{name}-%{version}-py%{python2_version}.egg-info
%doc LICENSE NOTICE
%files -n lib%{name}-javadoc
@@ -542,16 +513,19 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \;
-print | xargs -r
%{_includedir}/thrift/fb303
%doc LICENSE NOTICE
-%files -n python-fb303
-%{python_sitelib}/fb303
-%{python_sitelib}/fb303_scripts
-%{python_sitelib}/%{name}_fb303-%{fb303_version}-py%{py_version}.egg-info
+%files -n python2-fb303
+%{python2_sitelib}/fb303
+%{python2_sitelib}/fb303_scripts
+%{python2_sitelib}/%{name}_fb303-%{version}-py%{python2_version}.egg-info
%doc LICENSE NOTICE
%files -n fb303-java -f .mfiles-fb303
%doc LICENSE NOTICE
%changelog
+* Tue Mar 07 2017 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 0.10.0-1
+- Update to thrift 0.10.0
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.9.1-17.6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
@@ -603,7 +577,6 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
* Mon Jan 26 2015 Petr Machata <pmachata(a)redhat.com> - 0.9.1-13.3
- Rebuild for boost 1.57.0
-
* Thu Aug 28 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-13.2
- Perl 5.20 rebuild
commit 3a041d9d4de34443f84c55b4321a4ab58f86b5a5
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 15:54:29 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/thrift.spec b/thrift.spec
index 8dd7160..173aaa1 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.5
+Release: %{pkg_rel}%{?dist}.6
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -552,6 +552,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.9.1-17.6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-17.5
-
https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
commit 914411b1b14c99d2626cbb45494ee9bca721764b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 19 12:51:12 2016 +0000
-
https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
diff --git a/thrift.spec b/thrift.spec
index 911cce9..8dd7160 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.4
+Release: %{pkg_rel}%{?dist}.5
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -552,6 +552,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-17.5
+-
https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
+
* Tue May 17 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-17.4
- Perl 5.24 rebuild
commit dac3d535388942eae9bc79b9829c1d7e47c55b12
Author: Petr Psa <ppisar(a)redhat.com>
Date: Fri Jun 24 09:41:17 2016 +0200
Mandatory Perl build-requires added
<
https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl>
diff --git a/thrift.spec b/thrift.spec
index e9e7962..911cce9 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -177,6 +177,7 @@ The python-%{name} package contains Python bindings for %{name}.
%package -n perl-%{name}
Summary: Perl support for %{name}
Provides: perl(Thrift) = %{version}-%{release}
+BuildRequires: perl-generators
BuildRequires: perl(Bit::Vector)
BuildRequires: perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
commit d7f0c11da16af494d1b1dd0068fe6c084b7ea6e5
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Tue May 17 04:49:36 2016 +0200
Perl 5.24 rebuild
diff --git a/thrift.spec b/thrift.spec
index eb0966d..e9e7962 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.3
+Release: %{pkg_rel}%{?dist}.4
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -551,6 +551,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Tue May 17 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-17.4
+- Perl 5.24 rebuild
+
* Wed Mar 30 2016 Petr Pisar <ppisar(a)redhat.com> - 0.9.1-17.3
- Adapt to GCC 6 (bug #1306671)
commit 1a66707c3953d9877bdfcc057323e3137015ab19
Author: Petr Psa <ppisar(a)redhat.com>
Date: Wed Mar 30 14:53:32 2016 +0200
Adapt to GCC 6 (bug #1306671)
diff --git a/thrift-0.9.1-Adapt-to-GCC-6.patch b/thrift-0.9.1-Adapt-to-GCC-6.patch
new file mode 100644
index 0000000..1ee09b9
--- /dev/null
+++ b/thrift-0.9.1-Adapt-to-GCC-6.patch
@@ -0,0 +1,147 @@
+From 049d078b605900efec98c6a9caceb17cdc10c5e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Wed, 30 Mar 2016 14:47:26 +0200
+Subject: [PATCH] Adapt to GCC 6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 6 produces this error:
+
+src/generate/t_java_generator.cc: In member function 'void
t_java_generator::generate_process_async_function(t_service*, t_function*)':
+src/generate/t_java_generator.cc:2830:14: error: operands to ?: have different types
'bool' and 'std::basic_ostream<char>'
+ first ? first = false : indent(f_service_) << "else ";
+ ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This patch ports relevant part of upstream commit:
+
+t 16a23a6618754a5a87aeb8df99a72516b0272fb3
+Author: Konrad Grochowski <hcorg(a)apache.org>
+Date: Thu Nov 13 15:33:38 2014 +0100
+
+ THRIFT-2729: C++ - .clang-format created and applied
+
+ Client: C++
+ Patch: Konrad Grochowski
+
+ make style command added
+
+and:
+
+commit 5f2d34e5ab33651059a085525b3adbab6a877e6f
+Author: Roger Meier <roger(a)apache.org>
+Date: Sat Nov 16 16:43:41 2013 +0100
+
+ THRIFT-2229 thrift failed to build on OSX 10.9 GM
+
+that are part of 0.9.3 release.
+
+<https://bugzilla.redhat.com/show_bug.cgi?id=1306671>
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ compiler/cpp/src/generate/t_java_generator.cc | 3 ++-
+ compiler/cpp/src/generate/t_rb_generator.cc | 8 ++++----
+ tutorial/cpp/CppClient.cpp | 6 +++---
+ tutorial/cpp/CppServer.cpp | 16 ++++++++--------
+ 4 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/compiler/cpp/src/generate/t_java_generator.cc
b/compiler/cpp/src/generate/t_java_generator.cc
+index e443dc0..0f8740e 100644
+--- a/compiler/cpp/src/generate/t_java_generator.cc
++++ b/compiler/cpp/src/generate/t_java_generator.cc
+@@ -2827,7 +2827,8 @@ void t_java_generator::generate_process_async_function(t_service*
tservice,
+ bool first = true;
+ if (xceptions.size() > 0) {
+ for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
+- first ? first = false : indent(f_service_) << "else ";
++ if (x_iter != xceptions.begin())
++ indent(f_service_) << "else ";
+ indent(f_service_) << "if (e instanceof " <<
type_name((*x_iter)->get_type(), false, false)<<") {" << endl;
+ indent(f_service_) << indent() << "result." <<
(*x_iter)->get_name() << " = (" <<
type_name((*x_iter)->get_type(), false, false) << ") e;" <<
endl;
+ indent(f_service_) << indent() << "result.set" <<
get_cap_name((*x_iter)->get_name()) << get_cap_name("isSet") <<
"(true);" << endl;
+diff --git a/compiler/cpp/src/generate/t_rb_generator.cc
b/compiler/cpp/src/generate/t_rb_generator.cc
+index 082f316..fc679a1 100644
+--- a/compiler/cpp/src/generate/t_rb_generator.cc
++++ b/compiler/cpp/src/generate/t_rb_generator.cc
+@@ -359,21 +359,21 @@ void t_rb_generator::generate_enum(t_enum* tenum) {
+
+ // Create a hash mapping values back to their names (as strings) since ruby has no
native enum type
+ f_types_.indent() << "VALUE_MAP = {";
+- bool first = true;
+ for(c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
+ // Populate the hash
+ int value = (*c_iter)->get_value();
+- first ? first = false : f_types_ << ", ";
++ if (c_iter != constants.begin())
++ f_types_ << ", ";
+ f_types_ << value << " => \"" <<
capitalize((*c_iter)->get_name()) << "\"";
+ }
+ f_types_ << "}" << endl;
+
+ // Create a set with valid values for this enum
+ f_types_.indent() << "VALID_VALUES = Set.new([";
+- first = true;
+ for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
+ // Populate the set
+- first ? first = false : f_types_ << ", ";
++ if (c_iter != constants.begin())
++ f_types_ << ", ";
+ f_types_ << capitalize((*c_iter)->get_name());
+ }
+ f_types_ << "]).freeze" << endl;
+diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/CppClient.cpp
+index ba71caa..b91df2e 100644
+--- a/tutorial/cpp/CppClient.cpp
++++ b/tutorial/cpp/CppClient.cpp
+@@ -38,9 +38,9 @@ using namespace shared;
+ using namespace boost;
+
+ int main(int argc, char** argv) {
+- shared_ptr<TTransport> socket(new TSocket("localhost", 9090));
+- shared_ptr<TTransport> transport(new TBufferedTransport(socket));
+- shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
++ boost::shared_ptr<TTransport> socket(new TSocket("localhost", 9090));
++ boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));
++ boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
+ CalculatorClient client(protocol);
+
+ try {
+diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp
+index d0dbad9..f19258c 100644
+--- a/tutorial/cpp/CppServer.cpp
++++ b/tutorial/cpp/CppServer.cpp
+@@ -113,11 +113,11 @@ protected:
+
+ int main(int argc, char **argv) {
+
+- shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
+- shared_ptr<CalculatorHandler> handler(new CalculatorHandler());
+- shared_ptr<TProcessor> processor(new CalculatorProcessor(handler));
+- shared_ptr<TServerTransport> serverTransport(new TServerSocket(9090));
+- shared_ptr<TTransportFactory> transportFactory(new
TBufferedTransportFactory());
++ boost::shared_ptr<TProtocolFactory> protocolFactory(new
TBinaryProtocolFactory());
++ boost::shared_ptr<CalculatorHandler> handler(new CalculatorHandler());
++ boost::shared_ptr<TProcessor> processor(new CalculatorProcessor(handler));
++ boost::shared_ptr<TServerTransport> serverTransport(new TServerSocket(9090));
++ boost::shared_ptr<TTransportFactory> transportFactory(new
TBufferedTransportFactory());
+
+ TSimpleServer server(processor,
+ serverTransport,
+@@ -128,10 +128,10 @@ int main(int argc, char **argv) {
+ /**
+ * Or you could do one of these
+
+- shared_ptr<ThreadManager> threadManager =
++ boost::shared_ptr<ThreadManager> threadManager =
+ ThreadManager::newSimpleThreadManager(workerCount);
+- shared_ptr<PosixThreadFactory> threadFactory =
+- shared_ptr<PosixThreadFactory>(new PosixThreadFactory());
++ boost::shared_ptr<PosixThreadFactory> threadFactory =
++ boost::shared_ptr<PosixThreadFactory>(new PosixThreadFactory());
+ threadManager->threadFactory(threadFactory);
+ threadManager->start();
+ TThreadPoolServer server(processor,
+--
+2.5.5
+
diff --git a/thrift.spec b/thrift.spec
index 5c057d4..eb0966d 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.2
+Release: %{pkg_rel}%{?dist}.3
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -96,6 +96,8 @@ Patch1: thrift-0.9.1-rebar.patch
Patch2: fb303-0.9.1-buildxml.patch
# required to get it build on aarch64
Patch3: thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
+# Adapt to GCC 6, bug #1306671, in 0.9.3
+Patch4: thrift-0.9.1-Adapt-to-GCC-6.patch
Group: Development/Libraries
@@ -324,6 +326,7 @@ The fb303-java package contains Java bindings for fb303.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%{?!el5:sed -i -e 's/^AC_PROG_LIBTOOL/LT_INIT/g' configure.ac}
@@ -548,6 +551,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Wed Mar 30 2016 Petr Pisar <ppisar(a)redhat.com> - 0.9.1-17.3
+- Adapt to GCC 6 (bug #1306671)
+
* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.9.1-17.2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
commit f8fd41eccb9f4ca1129e3b8834ac0cd668226873
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 5 01:34:38 2016 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/thrift.spec b/thrift.spec
index 1c74440..5c057d4 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.1
+Release: %{pkg_rel}%{?dist}.2
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -548,6 +548,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.9.1-17.2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Sat Jan 16 2016 Jonathan Wakely <jwakely(a)redhat.com> - 0.9.1-17.1
- Rebuilt for Boost 1.60
commit 23bd68014b5858de8f4aca57fb30911866b75e3d
Author: Jonathan Wakely <jwakely(a)redhat.com>
Date: Sat Jan 16 00:37:14 2016 +0000
Rebuilt for Boost 1.60
diff --git a/thrift.spec b/thrift.spec
index 39c8b93..1c74440 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}
+Release: %{pkg_rel}%{?dist}.1
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -548,6 +548,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Sat Jan 16 2016 Jonathan Wakely <jwakely(a)redhat.com> - 0.9.1-17.1
+- Rebuilt for Boost 1.60
+
* Mon Nov 23 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.9.1-17
- Fix release
commit 137c8a440a367f7558685c20bd11588eee9feca3
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Mon Nov 23 13:08:21 2015 +0000
fix release
diff --git a/thrift.spec b/thrift.spec
index bb0c276..39c8b93 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0.dev0
-%global pkg_rel 16
+%global pkg_rel 17
%global py_version 2.7
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.6
+Release: %{pkg_rel}%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -548,6 +548,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Mon Nov 23 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.9.1-17
+- Fix release
+
* Wed Oct 21 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.9.1-16.6
- Backport THRIFT-2214 fix to get package built on aarch64.
commit 781b311da51f4398a4cb270c7f063fecd03e3c18
Author: Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
Date: Wed Oct 21 12:41:16 2015 +0200
Backport THRIFT-2214 fix to get package built on aarch64.
Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
diff --git a/thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
b/thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
new file mode 100644
index 0000000..4a7671f
--- /dev/null
+++ b/thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
@@ -0,0 +1,39 @@
+From f4e6e62ea091b94322ecc99756269dbee1c06380 Mon Sep 17 00:00:00 2001
+From: Ben Craig <bencraig(a)apache.org>
+Date: Tue, 5 Nov 2013 19:49:12 -0600
+Subject: [PATCH 081/223] THRIFT-2214: System header sys/param.h is included
+ inside the Thrift namespace Client: cpp Patch: Vladimir Strisovsky
+
+---
+ lib/cpp/src/thrift/protocol/TProtocol.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/cpp/src/thrift/protocol/TProtocol.h
b/lib/cpp/src/thrift/protocol/TProtocol.h
+index d6ecc0f..e72033a 100644
+--- a/lib/cpp/src/thrift/protocol/TProtocol.h
++++ b/lib/cpp/src/thrift/protocol/TProtocol.h
+@@ -75,10 +75,6 @@ static inline To bitwise_cast(From from) {
+ }
+
+
+-namespace apache { namespace thrift { namespace protocol {
+-
+-using apache::thrift::transport::TTransport;
+-
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+@@ -140,6 +136,10 @@ using apache::thrift::transport::TTransport;
+ # error "Can't define htonll or ntohll!"
+ #endif
+
++namespace apache { namespace thrift { namespace protocol {
++
++using apache::thrift::transport::TTransport;
++
+ /**
+ * Enumerated definition of the types that the Thrift protocol supports.
+ * Take special note of the T_END type which is used specifically to mark
+--
+2.6.1
+
diff --git a/thrift.spec b/thrift.spec
index 3ad30d2..bb0c276 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.5
+Release: %{pkg_rel}%{?dist}.6
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -94,6 +94,8 @@ Patch0: thrift-0.9.1-buildxml.patch
Patch1: thrift-0.9.1-rebar.patch
# for fb303, excise maven ant tasks; build against system libraries; etc.
Patch2: fb303-0.9.1-buildxml.patch
+# required to get it build on aarch64
+Patch3: thrift-0.9.1-THRIFT-2214-System-header-sys-param.h-is-included-in.patch
Group: Development/Libraries
@@ -321,6 +323,7 @@ The fb303-java package contains Java bindings for fb303.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%{?!el5:sed -i -e 's/^AC_PROG_LIBTOOL/LT_INIT/g' configure.ac}
@@ -545,6 +548,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Wed Oct 21 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.9.1-16.6
+- Backport THRIFT-2214 fix to get package built on aarch64.
+
* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 0.9.1-16.5
- Rebuilt for Boost 1.59
commit 36c8431993350216298e3667a58655e89b0f0e20
Author: Jonathan Wakely <jwakely(a)redhat.com>
Date: Thu Aug 27 19:39:54 2015 +0100
Rebuilt for Boost 1.59
diff --git a/thrift.spec b/thrift.spec
index 99ac630..3ad30d2 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.4
+Release: %{pkg_rel}%{?dist}.5
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -545,6 +545,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 0.9.1-16.5
+- Rebuilt for Boost 1.59
+
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-16.4
- Rebuilt for
https://fedoraproject.org/wiki/Changes/F23Boost159
commit cad633395bcde3b1fdd0e37c063511f20eb51378
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Jul 29 13:26:45 2015 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Changes/F23Boost159
diff --git a/thrift.spec b/thrift.spec
index e40745b..99ac630 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.3
+Release: %{pkg_rel}%{?dist}.4
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -545,6 +545,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-16.4
+- Rebuilt for
https://fedoraproject.org/wiki/Changes/F23Boost159
+
* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 0.9.1-16.3
- rebuild for Boost 1.58
commit cf6430a84b29a2c066d7e6be23fe46c738a38292
Author: David Tardon <dtardon(a)redhat.com>
Date: Wed Jul 22 19:40:08 2015 +0200
rebuild for Boost 1.58
diff --git a/thrift.spec b/thrift.spec
index 4df9162..e40745b 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.2
+Release: %{pkg_rel}%{?dist}.3
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -545,6 +545,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 0.9.1-16.3
+- rebuild for Boost 1.58
+
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-16.2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 55e32b4311b66ed79e1b0d319c020b722205ae3d
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jun 19 02:51:39 2015 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/thrift.spec b/thrift.spec
index 2032a6f..4df9162 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.1
+Release: %{pkg_rel}%{?dist}.2
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -545,6 +545,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-16.2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Sat Jun 06 2015 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-16.1
- Perl 5.22 rebuild
commit bd7af67741b581d22e9e306406dd0de6e410102a
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Sat Jun 6 18:11:50 2015 +0200
Perl 5.22 rebuild
diff --git a/thrift.spec b/thrift.spec
index 754c8be..2032a6f 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -60,7 +60,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}
+Release: %{pkg_rel}%{?dist}.1
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -545,6 +545,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Sat Jun 06 2015 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-16.1
+- Perl 5.22 rebuild
+
* Fri Apr 24 2015 Michal Srb <msrb(a)redhat.com> - 0.9.1-16
- Fix FTBFS (Resolves: rhbz#1195364)
commit 676ea30560dd6d8039f70d3466212eac85f1acfc
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 24 17:11:20 2015 +0200
Fix FTBFS (Resolves: rhbz#1195364)
diff --git a/thrift-0.9.1-buildxml.patch b/thrift-0.9.1-buildxml.patch
index 444c6ec..d0f8f58 100644
--- a/thrift-0.9.1-buildxml.patch
+++ b/thrift-0.9.1-buildxml.patch
@@ -26,7 +26,7 @@ index c2bfd9c..69525e7 100755
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.0-api.jar"/>
++ <include name="tomcat-servlet-3.1-api.jar"/>
</fileset>
</path>
@@ -187,7 +187,7 @@ index eceeca7..bc6a837 100644
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.0-api.jar"/>
++ <include name="tomcat-servlet-3.1-api.jar"/>
</fileset>
</path>
<path id="build.classpath">
@@ -205,7 +205,7 @@ index eceeca7..bc6a837 100644
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.0-api.jar"/>
++ <include name="tomcat-servlet-3.1-api.jar"/>
+ </fileset>
</path>
<path id="tutorial.classpath">
@@ -240,7 +240,7 @@ index 73d535d..e3ee1e2 100644
+ <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/>
-+ <include name="tomcat-servlet-3.0-api.jar"/>
++ <include name="tomcat-servlet-3.1-api.jar"/>
</fileset>
</path>
<path id="build.classpath">
diff --git a/thrift.spec b/thrift.spec
index 5736078..754c8be 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
-%global fb303_version 1.0.0_dev
-%global pkg_rel 15
+%global fb303_version 1.0.0.dev0
+%global pkg_rel 16
%global py_version 2.7
@@ -240,7 +240,7 @@ BuildRequires: httpcomponents-core
BuildRequires: junit
BuildRequires: log4j
BuildRequires: slf4j
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat-servlet-3.1-api
Requires: java-headless >= 1:1.6.0
Requires: javapackages-tools
@@ -545,6 +545,8 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+* Fri Apr 24 2015 Michal Srb <msrb(a)redhat.com> - 0.9.1-16
+- Fix FTBFS (Resolves: rhbz#1195364)
* Mon Apr 20 2015 Will Benton <willb(a)redhat.com> - 0.9.1-15
- Dropped Erlang support for F22 and above, since erlang-jsx is orphaned
commit fb9fad9c30cbec0d83db781b9d79f75f40264314
Author: William Benton <willb(a)redhat.com>
Date: Mon Apr 20 20:49:30 2015 -0500
removed erlang-jsx dep on F22
diff --git a/thrift.spec b/thrift.spec
index ea3665a..5736078 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0_dev
-%global pkg_rel 14
+%global pkg_rel 15
%global py_version 2.7
@@ -11,8 +11,8 @@
%global have_mongrel 0
-%if 0%{?fedora} >= 19
-# erlang-jsx is available in F19
+%if 0%{?fedora} >= 19 && 0%{?fedora} < 21
+# erlang-jsx is available in F19 but orphaned in F22
%global have_jsx 1
%else
%global have_jsx 0
@@ -545,6 +545,10 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%doc LICENSE NOTICE
%changelog
+
+* Mon Apr 20 2015 Will Benton <willb(a)redhat.com> - 0.9.1-15
+- Dropped Erlang support for F22 and above, since erlang-jsx is orphaned
+
* Wed Apr 8 2015 Hakel Gumar <hguemar(a)fedoraproject.org> - 0.9.1-14
- Split Qt4/GLib runtimes into separate subpackages
- Drop mono support, it's broken and not even shipped (and it pulls mono-core)
commit 339818f39ff999cb61e961075c1e5bfd45735ac1
Author: Haikel Guemar <hguemar(a)fedoraproject.org>
Date: Wed Apr 8 16:37:46 2015 +0200
Split Qt4/GLib runtimes into separate subpackages
- Drop mono support, it's broken and not even shipped (and it pulls mono-core)
diff --git a/thrift.spec b/thrift.spec
index 9a3aeed..ea3665a 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0_dev
-%global pkg_rel 13
+%global pkg_rel 14
%global py_version 2.7
@@ -54,23 +54,13 @@
%global php_configure --with-php
%endif
-%if 0%{?rhel}
-%global want_mono 0
-%else
-%ifarch %{mono_arches}
-%global want_mono 1
-%else
-%global want_mono 0
-%endif
-%endif
-
# Thrift's GO support doesn't build under Fedora
%global want_golang 0
%global golang_configure --without-go
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.3
+Release: %{pkg_rel}%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -119,9 +109,6 @@ BuildRequires: openssl-devel
BuildRequires: zlib-devel
BuildRequires: bison-devel
BuildRequires: flex-devel
-%if %{want_mono}
-BuildRequires: mono-devel
-%endif
BuildRequires: glib2-devel
BuildRequires: texlive
BuildRequires: qt-devel
@@ -137,9 +124,6 @@ BuildRequires: flex-devel
BuildRequires: ant
-%if %{want_mono}
-Requires: mono-core
-%endif
%if 0%{?want_golang} > 0
BuildRequires: golang
@@ -153,7 +137,7 @@ development combines a software stack with a code generation engine
to
build services that work efficiently and seamlessly between C++, Java,
Python, %{?php_langname}and other languages.
-%package devel
+%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
@@ -163,6 +147,20 @@ Requires: boost-devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
+%package qt
+Summary: Qt support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description qt
+The %{name}-qt package contains Qt bindings for %{name}.
+
+%package glib
+Summary: GLib support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description glib
+The %{name}-qt package contains GLib bindings for %{name}.
+
%package -n python-%{name}
Summary: Python support for %{name}
BuildRequires: python2-devel
@@ -473,10 +471,18 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \;
-print | xargs -r
%files
%doc LICENSE NOTICE
%{_bindir}/thrift
-%{_libdir}/*.so.*
-%{_libdir}/lib*-%{version}.so
+%{_libdir}/libthrift-%{version}.so
+%{_libdir}/libthriftz-%{version}.so
%{_mandir}/man1/thrift.1.gz
+%files glib
+%{_libdir}/libthrift_c_glib.so
+%{_libdir}/libthrift_c_glib.so.*
+
+%files qt
+%{_libdir}/libthriftqt.so
+%{_libdir}/libthriftqt-%{version}.so
+
%files devel
%{_includedir}/thrift
%exclude %{_includedir}/thrift/fb303
@@ -538,9 +544,11 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%files -n fb303-java -f .mfiles-fb303
%doc LICENSE NOTICE
-
-
%changelog
+* Wed Apr 8 2015 Hakel Gumar <hguemar(a)fedoraproject.org> - 0.9.1-14
+- Split Qt4/GLib runtimes into separate subpackages
+- Drop mono support, it's broken and not even shipped (and it pulls mono-core)
+
* Mon Jan 26 2015 Petr Machata <pmachata(a)redhat.com> - 0.9.1-13.3
- Rebuild for boost 1.57.0
commit f965f68070084578abad66d7272ac6e54d849d44
Author: Petr Machata <pmachata(a)redhat.com>
Date: Mon Jan 26 22:02:12 2015 +0100
Rebuild for boost 1.57.0
diff --git a/thrift.spec b/thrift.spec
index 822efd1..9a3aeed 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -70,7 +70,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.2
+Release: %{pkg_rel}%{?dist}.3
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -541,6 +541,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Mon Jan 26 2015 Petr Machata <pmachata(a)redhat.com> - 0.9.1-13.3
+- Rebuild for boost 1.57.0
+
* Thu Aug 28 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-13.2
- Perl 5.20 rebuild
commit c1872678fc94a7933b77a812f01f3f71ecb54d47
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Thu Aug 28 21:24:22 2014 +0200
Perl 5.20 rebuild
diff --git a/thrift.spec b/thrift.spec
index 2bcd414..822efd1 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -70,7 +70,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.1
+Release: %{pkg_rel}%{?dist}.2
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -541,6 +541,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Thu Aug 28 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.9.1-13.2
+- Perl 5.20 rebuild
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-13.1
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit 4151a5dbc6afc8bc9c30dd9dd3e2c0a75a0f8c35
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Mon Aug 18 05:39:14 2014 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/thrift.spec b/thrift.spec
index 28a2ad7..2bcd414 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -70,7 +70,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}
+Release: %{pkg_rel}%{?dist}.1
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -541,6 +541,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-13.1
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Fri Jun 27 2014 Petr Pisar <ppisar(a)redhat.com> - 0.9.1-13
- Use add_maven_depmap-generated file lists (bug #1107448)
commit 1514020567e1ec415c682ce41ddf241341128047
Author: Petr Psa <ppisar(a)redhat.com>
Date: Fri Jun 27 15:18:25 2014 +0200
Use add_maven_depmap-generated file lists
diff --git a/thrift.spec b/thrift.spec
index 64fc83f..28a2ad7 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0_dev
-%global pkg_rel 12
+%global pkg_rel 13
%global py_version 2.7
@@ -70,7 +70,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.2
+Release: %{pkg_rel}%{?dist}
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -517,10 +517,7 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%{_javadocdir}/%{name}
%doc LICENSE NOTICE
-%files -n lib%{name}-java
-%{_javadir}/lib%{name}.jar
-%{_mavenpomdir}/JPP-lib%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -n lib%{name}-java -f .mfiles
%doc LICENSE NOTICE
%files -n fb303
@@ -538,15 +535,15 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \;
-print | xargs -r
%{python_sitelib}/%{name}_fb303-%{fb303_version}-py%{py_version}.egg-info
%doc LICENSE NOTICE
-%files -n fb303-java
-%{_javadir}/libfb303.jar
-%{_mavenpomdir}/JPP-libfb303.pom
-%{_mavendepmapfragdir}/thrift-fb303
+%files -n fb303-java -f .mfiles-fb303
%doc LICENSE NOTICE
%changelog
+* Fri Jun 27 2014 Petr Pisar <ppisar(a)redhat.com> - 0.9.1-13
+- Use add_maven_depmap-generated file lists (bug #1107448)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-12.2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit 7004fa594ac857d03d24757beb2e1997b3f2067d
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sun Jun 8 03:29:36 2014 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/thrift.spec b/thrift.spec
index 0f4909c..64fc83f 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -70,7 +70,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}.1
+Release: %{pkg_rel}%{?dist}.2
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -547,6 +547,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.9.1-12.2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Fri May 23 2014 Petr Machata <pmachata(a)redhat.com> - 0.9.1-12.1
- Rebuild for boost 1.55.0
commit a2e6a685cce44b47fac1ebad4747e3b78fc888b0
Author: Petr Machata <pmachata(a)redhat.com>
Date: Fri May 23 04:42:07 2014 +0200
Rebuild for boost 1.55.0
diff --git a/thrift.spec b/thrift.spec
index a1dbc0a..0f4909c 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -70,7 +70,7 @@
Name: thrift
Version: %{pkg_version}
-Release: %{pkg_rel}%{?dist}
+Release: %{pkg_rel}%{?dist}.1
Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but
@@ -547,6 +547,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Fri May 23 2014 Petr Machata <pmachata(a)redhat.com> - 0.9.1-12.1
+- Rebuild for boost 1.55.0
+
* Mon May 05 2014 Lubomir Rintel <lkundrak(a)v3.sk> - 0.9.1-12
- Fix EPEL build
commit c4ec814e7156c433fb988ff1714754588f1be9c2
Author: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon May 5 11:39:14 2014 +0200
Fix EPEL build
diff --git a/thrift.spec b/thrift.spec
index bb82fd5..a1dbc0a 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0_dev
-%global pkg_rel 11
+%global pkg_rel 12
%global py_version 2.7
@@ -54,6 +54,16 @@
%global php_configure --with-php
%endif
+%if 0%{?rhel}
+%global want_mono 0
+%else
+%ifarch %{mono_arches}
+%global want_mono 1
+%else
+%global want_mono 0
+%endif
+%endif
+
# Thrift's GO support doesn't build under Fedora
%global want_golang 0
%global golang_configure --without-go
@@ -109,7 +119,7 @@ BuildRequires: openssl-devel
BuildRequires: zlib-devel
BuildRequires: bison-devel
BuildRequires: flex-devel
-%ifarch %{mono_arches}
+%if %{want_mono}
BuildRequires: mono-devel
%endif
BuildRequires: glib2-devel
@@ -127,7 +137,7 @@ BuildRequires: flex-devel
BuildRequires: ant
-%ifarch %{mono_arches}
+%if %{want_mono}
Requires: mono-core
%endif
@@ -537,6 +547,8 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Mon May 05 2014 Lubomir Rintel <lkundrak(a)v3.sk> - 0.9.1-12
+- Fix EPEL build
* Fri Feb 21 2014 willb <willb@redhat> - 0.9.1-11
- fix BZ 1068561
commit dc1dbff43e70f293ddd7bc26eef30911a9bf5d1a
Author: William Benton <willb(a)redhat.com>
Date: Fri Feb 21 08:53:32 2014 -0600
fix bz 1068561
diff --git a/thrift.spec b/thrift.spec
index ff191e9..bb82fd5 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0_dev
-%global pkg_rel 10
+%global pkg_rel 11
%global py_version 2.7
@@ -234,7 +234,7 @@ BuildRequires: log4j
BuildRequires: slf4j
BuildRequires: tomcat-servlet-3.0-api
-Requires: java >= 1:1.6.0
+Requires: java-headless >= 1:1.6.0
Requires: javapackages-tools
Requires: mvn(org.slf4j:slf4j-api)
Requires: mvn(commons-lang:commons-lang)
@@ -538,6 +538,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Fri Feb 21 2014 willb <willb@redhat> - 0.9.1-11
+- fix BZ 1068561
+
* Fri Dec 20 2013 willb <willb@redhat> - 0.9.1-10
- fix BZ 1045544
commit 2f2f8ddbf177135cc43d1994ba42968d4995ced1
Author: William Benton <willb(a)redhat.com>
Date: Fri Dec 20 12:07:32 2013 -0600
fixes BZ 1045544
diff --git a/thrift.spec b/thrift.spec
index 5ebea3a..ff191e9 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0_dev
-%global pkg_rel 9
+%global pkg_rel 10
%global py_version 2.7
@@ -147,6 +147,7 @@ Python, %{?php_langname}and other languages.
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
+Requires: boost-devel
%description devel
The %{name}-devel package contains libraries and header files for
@@ -536,6 +537,10 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+
+* Fri Dec 20 2013 willb <willb@redhat> - 0.9.1-10
+- fix BZ 1045544
+
* Wed Oct 16 2013 willb <willb@redhat> - 0.9.1-9
- Remove spurious dependencies
- Move some versioned shared libraries from -devel
commit 80f1fe9443f59c60da731c308ca496cc642094a9
Author: William Benton <willb(a)redhat.com>
Date: Wed Oct 16 14:16:08 2013 -0500
fixed spurious deps and misfiled versioned shlibs
diff --git a/thrift.spec b/thrift.spec
index c6c147f..5ebea3a 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0_dev
-%global pkg_rel 8
+%global pkg_rel 9
%global py_version 2.7
@@ -127,16 +127,10 @@ BuildRequires: flex-devel
BuildRequires: ant
-Requires: openssl
-Requires: boost
-Requires: bison
-Requires: flex
%ifarch %{mono_arches}
Requires: mono-core
%endif
-Requires: qt4
-
%if 0%{?want_golang} > 0
BuildRequires: golang
Requires: golang
@@ -469,12 +463,14 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \;
-print | xargs -r
%doc LICENSE NOTICE
%{_bindir}/thrift
%{_libdir}/*.so.*
+%{_libdir}/lib*-%{version}.so
%{_mandir}/man1/thrift.1.gz
%files devel
%{_includedir}/thrift
%exclude %{_includedir}/thrift/fb303
%{_libdir}/*.so
+%exclude %{_libdir}/lib*-%{version}.so
%exclude %{_libdir}/libfb303.so
%{_libdir}/pkgconfig/thrift-z.pc
%{_libdir}/pkgconfig/thrift-qt.pc
@@ -540,6 +536,10 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Wed Oct 16 2013 willb <willb@redhat> - 0.9.1-9
+- Remove spurious dependencies
+- Move some versioned shared libraries from -devel
+
* Wed Oct 16 2013 Dan Hork <dan[at]danny.cz> - 0.9.1-8
- Mono available only on selected arches
commit a429a0696aa087c7cd0fd365fd363bbd847734fc
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Oct 16 12:07:17 2013 +0200
- Mono available only on selected arches
diff --git a/thrift.spec b/thrift.spec
index b3da7cb..c6c147f 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
%global pkg_version 0.9.1
%global fb303_version 1.0.0_dev
-%global pkg_rel 7
+%global pkg_rel 8
%global py_version 2.7
@@ -109,7 +109,9 @@ BuildRequires: openssl-devel
BuildRequires: zlib-devel
BuildRequires: bison-devel
BuildRequires: flex-devel
+%ifarch %{mono_arches}
BuildRequires: mono-devel
+%endif
BuildRequires: glib2-devel
BuildRequires: texlive
BuildRequires: qt-devel
@@ -129,7 +131,9 @@ Requires: openssl
Requires: boost
Requires: bison
Requires: flex
+%ifarch %{mono_arches}
Requires: mono-core
+%endif
Requires: qt4
@@ -536,6 +540,8 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print
| xargs -r
%changelog
+* Wed Oct 16 2013 Dan Hork <dan[at]danny.cz> - 0.9.1-8
+- Mono available only on selected arches
* Sun Oct 13 2013 willb <willb@redhat> - 0.9.1-7
- minor specfile cleanups
commit 6f3133f4c7aa5488376113780be11cbe46c6e560
Author: William Benton <willb(a)redhat.com>
Date: Mon Oct 14 12:02:09 2013 -0500
initial import of 0.9.1-7
diff --git a/.gitignore b/.gitignore
index e69de29..8f68e6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/0.9.1.tar.gz
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100644
index 0000000..0c2b886
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#
http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+./cleanup.sh
+if test -d lib/php/src/ext/thrift_protocol ; then
+ if phpize -v >/dev/null 2>/dev/null ; then
+ (cd lib/php/src/ext/thrift_protocol && phpize)
+ fi
+fi
+
+set -e
+
+# libtoolize is called "glibtoolize" on OSX.
+if libtoolize --version 1 >/dev/null 2>/dev/null; then
+ LIBTOOLIZE=libtoolize
+elif glibtoolize --version 1 >/dev/null 2>/dev/null; then
+ LIBTOOLIZE=glibtoolize
+else
+ echo >&2 "Couldn't find libtoolize!"
+ exit 1
+fi
+
+autoscan
+$LIBTOOLIZE --copy --automake
+aclocal -I ./aclocal
+autoheader
+autoconf
+automake --copy --add-missing --foreign
diff --git a/fb303-0.9.1-buildxml.patch b/fb303-0.9.1-buildxml.patch
new file mode 100644
index 0000000..ec51503
--- /dev/null
+++ b/fb303-0.9.1-buildxml.patch
@@ -0,0 +1,167 @@
+diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml
+index 8f2fa51..d89f05e 100755
+--- a/contrib/fb303/java/build.xml
++++ b/contrib/fb303/java/build.xml
+@@ -17,8 +17,7 @@
+ specific language governing permissions and limitations
+ under the License.
+ -->
+-<project name="libfb303" default="dist" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="libfb303" default="dist"
basedir=".">
+
+ <!-- project wide settings. All directories relative to basedir -->
+ <property name="thrift.root"
location="${basedir}/../../../"/>
+@@ -26,7 +25,7 @@
+ <property name="interface.dir" value="${basedir}/../if"/>
+ <property name="thrift.java.dir"
location="${thrift.root}/lib/java"/>
+ <property name="build.tools.dir"
location="${thrift.java.dir}/build/tools/"/>
+- <property name="thrift_compiler"
value="${thrift.root}/compiler/cpp/thrift"/>
++ <property name="thrift_compiler"
value="${thrift.root}/compiler/cpp/thrift"/>
+
+ <!-- inherit from the java build file for version and other properties -->
+ <property file="${thrift.java.dir}/build.properties" />
+@@ -38,8 +37,8 @@
+ </condition>
+ <property name="version"
value="${thrift.version}-snapshot"/>
+
+- <property name="fb303.final.name"
value="${fb303.artifactid}-${version}"/>
+- <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift-${version}.jar"/>
++ <property name="fb303.final.name"
value="${fb303.artifactid}"/>
++ <property name="thrift.java.libthrift"
value="${thrift.java.dir}/build/libthrift.jar"/>
+
+ <property name="src" value="${basedir}/src"/>
+ <property name="gen" value="${basedir}/gen-java"/>
+@@ -50,7 +49,7 @@
+ <property name="fb303.jar.file"
location="${build.dir}/${fb303.final.name}.jar"/>
+ <property name="fb303.pom.xml"
location="${build.dir}/${fb303.final.name}.pom"/>
+
+- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
++ <target name="init" depends="setup.init"
unless="init.finished">
+ <property name="init.finished" value="true"/>
+ </target>
+
+@@ -72,13 +71,21 @@
+ <!-- compile the base and thrift generated code and jar them -->
+ <target name="dist" depends="init,generate">
+ <echo message="Building ${fb303.final.name}.jar"/>
+- <javac destdir="${build.classes.dir}" debug="on">
++ <javac destdir="${build.classes.dir}" debug="on"
includeantruntime="false" >
+ <classpath>
+ <pathelement location="${thrift.java.libthrift}"/>
+- <fileset dir="${thrift.root}/lib/java/build/lib">
+- <include name="*.jar"/>
+- </fileset>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.0-api.jar"/>
++ </fileset>
+ </classpath>
++
+ <src path="${src}"/>
+ <src path="${gen}"/>
+ <include name="**/*.java"/>
+@@ -99,97 +106,4 @@
+ <delete dir="${build.dir}"/>
+ <delete dir="${gen}"/>
+ </target>
+-
+- <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check"
unless="mvn.ant.tasks.found">
+- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
+- </target>
+-
+- <target name="mvn.ant.tasks.check">
+- <condition property="mvn.ant.tasks.found">
+- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
+- </condition>
+- </target>
+-
+- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
+- <echo message="${mvn.ant.task.jar}"/>
+- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
+- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
+-
+- <!-- remote repositories used to download dependencies from -->
+- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
+- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
+-
+- <!-- Pom file information -->
+- <artifact:pom id="pom"
+- groupId="${thrift.groupid}"
+- artifactId="${fb303.artifactid}"
+- version="${version}"
+- url="http://thrift.apache.org"
+- name="Apache Thrift"
+- description="Thrift is a software framework for scalable cross-language
services development."
+- packaging="pom"
+- >
+- <remoteRepository refid="central"/>
+- <remoteRepository refid="apache"/>
+- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
+- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
+-
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
+-
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
+- />
+- <!-- Thrift Developers -->
+- <developer id="mcslee" name="Mark Slee"/>
+- <developer id="dreiss" name="David Reiss"/>
+- <developer id="aditya" name="Aditya Agarwal"/>
+- <developer id="marck" name="Marc Kwiatkowski"/>
+- <developer id="jwang" name="James Wang"/>
+- <developer id="cpiro" name="Chris Piro"/>
+- <developer id="bmaurer" name="Ben Maurer"/>
+- <developer id="kclark" name="Kevin Clark"/>
+- <developer id="jake" name="Jake Luciani"/>
+- <developer id="bryanduxbury" name="Bryan Duxbury"/>
+- <developer id="esteve" name="Esteve Fernandez"/>
+- <developer id="todd" name="Todd Lipcon"/>
+- <developer id="geechorama" name="Andrew McGeachie"/>
+- <developer id="molinaro" name="Anthony Molinaro"/>
+- <developer id="roger" name="Roger Meier"/>
+- <developer id="jfarrell" name="Jake Farrell"/>
+- <developer id="jensg" name="Jens Geyer"/>
+- <developer id="carl" name="Carl Yeksigian"/>
+-
+- <!-- Thrift dependencies list -->
+- <dependency groupId="org.apache.thrift"
artifactId="libthrift" version="${version}"/>
+- </artifact:pom>
+-
+- <!-- Generate the pom file -->
+- <artifact:writepom pomRefId="pom"
file="${fb303.pom.xml}"/>
+-
+- <property name="mvn.finished" value="true"/>
+- </target>
+-
+- <macrodef name="signAndDeploy">
+- <!-- Sign and deploy jars to apache repo -->
+- <attribute name="file"/>
+- <attribute name="classifier" default=""/>
+- <attribute name="packaging" default="jar"/>
+- <attribute name="pom" default=""/>
+- <sequential>
+- <artifact:mvn fork="true">
+- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
+- <arg value="-DrepositoryId=${maven-repository-id}"/>
+- <arg value="-Durl=${maven-repository-url}"/>
+- <arg value="-DpomFile=@{pom}"/>
+- <arg value="-Dfile=@{file}"/>
+- <arg value="-Dclassifier=@{classifier}"/>
+- <arg value="-Dpackaging=@{packaging}"/>
+- <arg value="-Pgpg"/>
+- </artifact:mvn>
+- </sequential>
+- </macrodef>
+-
+- <target name="publish" depends="clean,dist">
+- <!-- Compile, packages and then send release to apache maven repo -->
+- <!-- run with: ant -Drelease=true publish-->
+- <signAndDeploy file="${fb303.pom.xml}" packaging="pom"
classifier="" pom="${fb303.pom.xml}"/>
+- <signAndDeploy file="${fb303.jar.file}" packaging="jar"
classifier="" pom="${fb303.pom.xml}"/>
+- </target>
+ </project>
diff --git a/libfb303-0.9.1.pom b/libfb303-0.9.1.pom
new file mode 100644
index 0000000..29d0dff
--- /dev/null
+++ b/libfb303-0.9.1.pom
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ <version>0.9.1</version>
+ <packaging>pom</packaging>
+ <name>Apache Thrift</name>
+ <description>Thrift is a software framework for scalable cross-language services
development.</description>
+ <url>http://thrift.apache.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>mcslee</id>
+ <name>Mark Slee</name>
+ </developer>
+ <developer>
+ <id>dreiss</id>
+ <name>David Reiss</name>
+ </developer>
+ <developer>
+ <id>aditya</id>
+ <name>Aditya Agarwal</name>
+ </developer>
+ <developer>
+ <id>marck</id>
+ <name>Marc Kwiatkowski</name>
+ </developer>
+ <developer>
+ <id>jwang</id>
+ <name>James Wang</name>
+ </developer>
+ <developer>
+ <id>cpiro</id>
+ <name>Chris Piro</name>
+ </developer>
+ <developer>
+ <id>bmaurer</id>
+ <name>Ben Maurer</name>
+ </developer>
+ <developer>
+ <id>kclark</id>
+ <name>Kevin Clark</name>
+ </developer>
+ <developer>
+ <id>jake</id>
+ <name>Jake Luciani</name>
+ </developer>
+ <developer>
+ <id>bryanduxbury</id>
+ <name>Bryan Duxbury</name>
+ </developer>
+ <developer>
+ <id>esteve</id>
+ <name>Esteve Fernandez</name>
+ </developer>
+ <developer>
+ <id>todd</id>
+ <name>Todd Lipcon</name>
+ </developer>
+ <developer>
+ <id>geechorama</id>
+ <name>Andrew McGeachie</name>
+ </developer>
+ <developer>
+ <id>molinaro</id>
+ <name>Anthony Molinaro</name>
+ </developer>
+ <developer>
+ <id>roger</id>
+ <name>Roger Meier</name>
+ </developer>
+ <developer>
+ <id>jfarrell</id>
+ <name>Jake Farrell</name>
+ </developer>
+ <developer>
+ <id>jensg</id>
+ <name>Jens Geyer</name>
+ </developer>
+ <developer>
+ <id>carl</id>
+ <name>Carl Yeksigian</name>
+ </developer>
+ </developers>
+ <scm>
+
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
+
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
+ <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/libthrift-0.9.1.pom b/libthrift-0.9.1.pom
new file mode 100644
index 0000000..9a146f0
--- /dev/null
+++ b/libthrift-0.9.1.pom
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.1</version>
+ <packaging>pom</packaging>
+ <name>Apache Thrift</name>
+ <description>Thrift is a software framework for scalable cross-language services
development.</description>
+ <url>http://thrift.apache.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>mcslee</id>
+ <name>Mark Slee</name>
+ </developer>
+ <developer>
+ <id>dreiss</id>
+ <name>David Reiss</name>
+ </developer>
+ <developer>
+ <id>aditya</id>
+ <name>Aditya Agarwal</name>
+ </developer>
+ <developer>
+ <id>marck</id>
+ <name>Marc Kwiatkowski</name>
+ </developer>
+ <developer>
+ <id>jwang</id>
+ <name>James Wang</name>
+ </developer>
+ <developer>
+ <id>cpiro</id>
+ <name>Chris Piro</name>
+ </developer>
+ <developer>
+ <id>bmaurer</id>
+ <name>Ben Maurer</name>
+ </developer>
+ <developer>
+ <id>kclark</id>
+ <name>Kevin Clark</name>
+ </developer>
+ <developer>
+ <id>jake</id>
+ <name>Jake Luciani</name>
+ </developer>
+ <developer>
+ <id>bryanduxbury</id>
+ <name>Bryan Duxbury</name>
+ </developer>
+ <developer>
+ <id>esteve</id>
+ <name>Esteve Fernandez</name>
+ </developer>
+ <developer>
+ <id>todd</id>
+ <name>Todd Lipcon</name>
+ </developer>
+ <developer>
+ <id>geechorama</id>
+ <name>Andrew McGeachie</name>
+ </developer>
+ <developer>
+ <id>molinaro</id>
+ <name>Anthony Molinaro</name>
+ </developer>
+ <developer>
+ <id>roger</id>
+ <name>Roger Meier</name>
+ </developer>
+ <developer>
+ <id>jfarrell</id>
+ <name>Jake Farrell</name>
+ </developer>
+ <developer>
+ <id>jensg</id>
+ <name>Jens Geyer</name>
+ </developer>
+ <developer>
+ <id>carl</id>
+ <name>Carl Yeksigian</name>
+ </developer>
+ </developers>
+ <scm>
+
<
connection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git&...
+
<
developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/th...
+ <
url>https://git-wip-us.apache.org/repos/asf?p=thrift.git</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.2.4</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/manpage.1.ex b/manpage.1.ex
new file mode 100644
index 0000000..160f57b
--- /dev/null
+++ b/manpage.1.ex
@@ -0,0 +1,60 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH THRIFT SECTION "June 27, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+thrift \- program to do something
+.SH SYNOPSIS
+.B thrift
+.RI [ options ] " files" ...
+.br
+.B bar
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B thrift
+and
+.B bar
+commands.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBthrift\fP is a program that...
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH SEE ALSO
+.BR bar (1),
+.BR baz (1).
+.br
+The programs are documented fully by
+.IR "The Rise and Fall of a Fooish Bar" ,
+available via the Info system.
+.SH AUTHOR
+thrift was written by <upstream author>.
+.PP
+This manual page was written by Krzysztof Krzyaniak (eloy) <eloy(a)debian.org>,
+for the Debian project (and may be used by others).
+
diff --git a/sources b/sources
index e69de29..d078a98 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+147e8f2d3e48a272559aea554afdaf81 0.9.1.tar.gz
diff --git a/thrift-0.9.1-buildxml.patch b/thrift-0.9.1-buildxml.patch
new file mode 100644
index 0000000..444c6ec
--- /dev/null
+++ b/thrift-0.9.1-buildxml.patch
@@ -0,0 +1,246 @@
+diff --git a/lib/java/build.xml b/lib/java/build.xml
+index c2bfd9c..69525e7 100755
+--- a/lib/java/build.xml
++++ b/lib/java/build.xml
+@@ -17,8 +17,7 @@
+ specific language governing permissions and limitations
+ under the License.
+ -->
+-<project name="libthrift" default="dist" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="libthrift" default="dist"
basedir=".">
+
+ <description>Thrift Build File</description>
+ <property name="thrift.root" location="../../"/>
+@@ -64,8 +63,15 @@
+ <property name="pom.xml"
location="${build.dir}/${final.name}.pom"/>
+
+ <path id="compile.classpath">
+- <fileset dir="${build.lib.dir}">
+- <include name="**/*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.0-api.jar"/>
+ </fileset>
+ </path>
+
+@@ -75,10 +81,14 @@
+ <pathelement location="${build.test.dir}"/>
+ <pathelement location="${jar.file}"/>
+ <pathelement location="${test.jar.file}"/>
++ <fileset dir="/usr/share/java">
++ <include name="junit.jar"/>
++ <include name="slf4j/log4j12.jar"/>
++ </fileset>
+ </path>
+
+ <!-- Tasks -->
+- <target name="init" depends="setup.init,mvn.init"
unless="init.finished">
++ <target name="init" depends="setup.init"
unless="init.finished">
+ <property name="init.finished" value="true"/>
+ </target>
+
+@@ -262,121 +272,12 @@
+ </target>
+
+ <target name="mvn.ant.tasks.download"
depends="setup.init,mvn.ant.tasks.check,proxy"
unless="mvn.ant.tasks.found">
+- <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}"
dest="${build.tools.dir}/${mvn.ant.task.jar}"
usetimestamp="true"/>
+ </target>
+
+ <target name="mvn.ant.tasks.check">
+- <condition property="mvn.ant.tasks.found">
+- <typefound uri="antlib:org.apache.maven.artifact.ant"
name="artifact"/>
+- </condition>
+ </target>
+
+- <target name="mvn.init" depends="mvn.ant.tasks.download"
unless="mvn.finished">
+- <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
+- <typedef uri="antlib:org.apache.maven.artifact.ant"
classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
+-
+- <!-- remote repositories used to download dependencies from -->
+- <artifact:remoteRepository id="central"
url="${mvn.repo}"/>
+- <artifact:remoteRepository id="apache"
url="${apache.repo}"/>
+-
+- <!-- Pom file information -->
+- <artifact:pom id="pom"
+- groupId="${thrift.groupid}"
+- artifactId="${thrift.artifactid}"
+- version="${version}"
+- url="http://thrift.apache.org"
+- name="Apache Thrift"
+- description="Thrift is a software framework for scalable cross-language
services development."
+- packaging="pom"
+- >
+- <remoteRepository refid="central"/>
+- <remoteRepository refid="apache"/>
+- <license name="The Apache Software License, Version 2.0"
url="${license}"/>
+- <scm
connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.g...
+-
developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf...
+-
url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
+- />
+- <!-- Thrift Developers -->
+- <developer id="mcslee" name="Mark Slee"/>
+- <developer id="dreiss" name="David Reiss"/>
+- <developer id="aditya" name="Aditya Agarwal"/>
+- <developer id="marck" name="Marc Kwiatkowski"/>
+- <developer id="jwang" name="James Wang"/>
+- <developer id="cpiro" name="Chris Piro"/>
+- <developer id="bmaurer" name="Ben Maurer"/>
+- <developer id="kclark" name="Kevin Clark"/>
+- <developer id="jake" name="Jake Luciani"/>
+- <developer id="bryanduxbury" name="Bryan Duxbury"/>
+- <developer id="esteve" name="Esteve Fernandez"/>
+- <developer id="todd" name="Todd Lipcon"/>
+- <developer id="geechorama" name="Andrew McGeachie"/>
+- <developer id="molinaro" name="Anthony Molinaro"/>
+- <developer id="roger" name="Roger Meier"/>
+- <developer id="jfarrell" name="Jake Farrell"/>
+- <developer id="jensg" name="Jens Geyer"/>
+- <developer id="carl" name="Carl Yeksigian"/>
+-
+- <!-- Thrift dependencies list -->
+- <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="${slf4j.version}"/>
+- <dependency groupId="org.apache.commons"
artifactId="commons-lang3" version="${commons-lang3.version}"/>
+- <dependency groupId="javax.servlet"
artifactId="servlet-api" version="${servlet.version}"
scope="provided"/>
+- <dependency groupId="org.apache.httpcomponents"
artifactId="httpclient" version="${httpclient.version}"/>
+- <dependency groupId="org.apache.httpcomponents"
artifactId="httpcore" version="${httpcore.version}"/>
+- </artifact:pom>
+-
+- <!-- Generate the pom file -->
+- <artifact:writepom pomRefId="pom" file="${pom.xml}"/>
+-
+- <!-- Download the dependencies -->
+- <artifact:dependencies filesetId="build-dependency-jars"
pomRefId="pom"/>
+-
+- <!-- Copy the dependencies to the build/lib dir -->
+- <copy todir="${build.dir}/lib">
+- <fileset refid="build-dependency-jars"/>
+- <mapper type="flatten"/>
+- </copy>
+-
+- <!-- Dependencies needed for testing -->
+- <artifact:dependencies filesetId="test-dependency-jars"
useScope="runtime">
+- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12"
version="1.5.8"/>
+- <dependency groupId="junit" artifactId="junit"
version="4.4"/>
+- </artifact:dependencies>
+-
+- <!-- Copy the test dependencies to the build/lib dir -->
+- <copy todir="${build.dir}/lib">
+- <fileset refid="test-dependency-jars"/>
+- <mapper type="flatten"/>
+- </copy>
+-
+- <property name="mvn.finished" value="true"/>
++ <target name="mvn.init" unless="mvn.finished">
+ </target>
+
+- <macrodef name="signAndDeploy">
+- <!-- Sign and deploy jars to apache repo -->
+- <attribute name="file"/>
+- <attribute name="classifier" default=""/>
+- <attribute name="packaging" default="jar"/>
+- <attribute name="pom" default=""/>
+- <sequential>
+- <artifact:mvn fork="true">
+- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
+- <arg value="-DrepositoryId=${maven-repository-id}"/>
+- <arg value="-Durl=${maven-repository-url}"/>
+- <arg value="-DpomFile=@{pom}"/>
+- <arg value="-Dfile=@{file}"/>
+- <arg value="-Dclassifier=@{classifier}"/>
+- <arg value="-Dpackaging=@{packaging}"/>
+- <arg value="-Pgpg"/>
+- </artifact:mvn>
+- </sequential>
+- </macrodef>
+-
+- <target name="publish"
depends="clean,init,test,dist,javadoc,pack.src">
+- <!-- Compile, package, test and then send release to apache maven repo -->
+- <!-- run with: ant -Drelease=true publish-->
+- <signAndDeploy file="${pom.xml}" packaging="pom"
classifier="" pom="${pom.xml}"/>
+- <signAndDeploy file="${jar.file}" packaging="jar"
classifier="" pom="${pom.xml}"/>
+- <signAndDeploy file="${javadoc.jar.file}" packaging="jar"
classifier="javadoc" pom="${pom.xml}"/>
+- <signAndDeploy file="${source.tar.gz}" packaging="src"
classifier="tar.gz" pom="${pom.xml}"/>
+- </target>
+ </project>
+diff --git a/tutorial/java/build.xml b/tutorial/java/build.xml
+index eceeca7..bc6a837 100644
+--- a/tutorial/java/build.xml
++++ b/tutorial/java/build.xml
+@@ -29,13 +29,33 @@
+ <include name="*.jar" />
+ <exclude name="-test.jar" />
+ </fileset>
+- <fileset dir="../../lib/java/build/lib">
+- <include name="*.jar" />
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.0-api.jar"/>
+ </fileset>
+ </path>
+ <path id="build.classpath">
+- <path refid="libs.classpath" />
+ <pathelement path="${gen}" />
++ <fileset dir="../../lib/java/build">
++ <include name="*.jar" />
++ <exclude name="-test.jar" />
++ </fileset>
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.0-api.jar"/>
++ </fileset>
+ </path>
+ <path id="tutorial.classpath">
+ <path refid="build.classpath" />
+@@ -50,8 +70,8 @@
+ </target>
+
+ <target name="compile" depends="init, generate">
+- <javac srcdir="${gen}" destdir="${build}"
classpathref="libs.classpath" />
+- <javac srcdir="${src}" destdir="${build}"
classpathref="build.classpath" />
++ <javac srcdir="${gen}" destdir="${build}"
classpathref="libs.classpath" includeantruntime="false" />
++ <javac srcdir="${src}" destdir="${build}"
classpathref="build.classpath" includeantruntime="false" />
+ </target>
+
+ <target name="test" depends="tutorial" />
+diff --git a/tutorial/js/build.xml b/tutorial/js/build.xml
+index 73d535d..e3ee1e2 100644
+--- a/tutorial/js/build.xml
++++ b/tutorial/js/build.xml
+@@ -35,8 +35,16 @@
+ <include name="*.jar" />
+ <exclude name="-test.jar" />
+ </fileset>
+- <fileset dir="../../lib/java/build/lib">
+- <include name="*.jar" />
++
++ <fileset dir="/usr/share/java">
++ <include name="commons-codec.jar"/>
++ <include name="commons-lang.jar"/>
++ <include name="commons-logging.jar"/>
++ <include name="httpcomponents/httpcore.jar"/>
++ <include name="httpcomponents/httpclient.jar"/>
++ <include name="log4j.jar"/>
++ <include name="slf4j/api.jar"/>
++ <include name="tomcat-servlet-3.0-api.jar"/>
+ </fileset>
+ </path>
+ <path id="build.classpath">
diff --git a/thrift-0.9.1-rebar.patch b/thrift-0.9.1-rebar.patch
new file mode 100644
index 0000000..6207c13
--- /dev/null
+++ b/thrift-0.9.1-rebar.patch
@@ -0,0 +1,9 @@
+--- a/lib/erl/rebar.config 2013-08-21 15:39:39.121081905 -0500
++++ b/lib/erl/rebar.config 2013-08-21 15:43:19.351633734 -0500
+@@ -1,5 +1,4 @@
+ {erl_opts, [debug_info]}.
+ {lib_dirs, ["deps"]}.
+ {deps, [
+- { jsx, "1.2.1", {git,
"git://github.com/talentdeficit/jsx.git", {tag, "v1.2.1"}}}
+- ]}.
++]}.
diff --git a/thrift.spec b/thrift.spec
new file mode 100644
index 0000000..b3da7cb
--- /dev/null
+++ b/thrift.spec
@@ -0,0 +1,588 @@
+%global pkg_version 0.9.1
+%global fb303_version 1.0.0_dev
+%global pkg_rel 7
+
+%global py_version 2.7
+
+%global php_extdir %(php-config --extension-dir 2>/dev/null || echo
"undefined")
+
+%{?perl_default_filter}
+%global __provides_exclude_from ^(%{python_sitearch}/.*\\.so|%{php_extdir}/.*\\.so)$
+
+%global have_mongrel 0
+
+%if 0%{?fedora} >= 19
+# erlang-jsx is available in F19
+%global have_jsx 1
+%else
+%global have_jsx 0
+%endif
+
+# We should be able to enable this in the future
+%global want_d 0
+
+# Thrift's Ruby support depends on Mongrel. Since Mongrel is
+# deprecated in Fedora, we can't support Ruby bindings for Thrift
+# unless and until Thrift is patched to use a different HTTP server.
+%if 0%{?have_mongrel} == 0
+%global ruby_configure --without-ruby
+%global with_ruby 0
+%else
+%global ruby_configure --with-ruby
+%global want_ruby 1
+%endif
+
+# Thrift's Erlang support depends on the JSX library, which is not
+# currently available in Fedora.
+
+%if 0%{?have_jsx} == 0
+%global erlang_configure --without-erlang
+%global want_erlang 0
+%else
+%global erlang_configure --with-erlang
+%global want_erlang 1
+%endif
+
+# PHP appears broken in Thrift 0.9.1
+%global want_php 0
+
+%if 0%{?want_php} == 0
+%global php_langname %{nil}
+%global php_configure --without-php
+%else
+%global php_langname PHP,\
+%global php_configure --with-php
+%endif
+
+# Thrift's GO support doesn't build under Fedora
+%global want_golang 0
+%global golang_configure --without-go
+
+Name: thrift
+Version: %{pkg_version}
+Release: %{pkg_rel}%{?dist}
+Summary: Software framework for cross-language services development
+
+# Parts of the source are used under the BSD and zlib licenses, but
+# these are OK for inclusion in an Apache 2.0-licensed whole:
+#
http://www.apache.org/legal/3party.html
+
+# Here's the breakdown:
+# thrift-0.9.1/lib/py/compat/win32/stdint.h is 2-clause BSD
+# thrift-0.9.1/compiler/cpp/src/md5.[ch] are zlib
+License: ASL 2.0 and BSD and zlib
+URL:
http://thrift.apache.org/
+
+%if "%{version}" != "0.9.1"
+Source0:
http://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
+%else
+# Unfortunately, the distribution tarball for thrift-0.9.1 is broken, so we're
+# using an exported tarball from git. This will change in the future.
+
+Source0:
https://github.com/apache/thrift/archive/0.9.1.tar.gz
+%endif
+
+Source1:
http://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/lib...
+Source2:
https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh
+
+Source3:
https://gitorious.org/pkg-scribe/thrift-deb-pkg/raw/master:debian/manpage...
+Source4:
http://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libfb...
+
+# this patch is adapted from Gil Cattaneo's thrift-0.7.0 package
+Patch0: thrift-0.9.1-buildxml.patch
+# don't use bundled rebar executable
+Patch1: thrift-0.9.1-rebar.patch
+# for fb303, excise maven ant tasks; build against system libraries; etc.
+Patch2: fb303-0.9.1-buildxml.patch
+
+Group: Development/Libraries
+
+# BuildRequires for language-specific bindings are listed under these
+# subpackages, to facilitate enabling or disabling individual language
+# bindings in the future
+
+BuildRequires: libstdc++-devel
+BuildRequires: boost-devel
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: openssl-devel
+BuildRequires: zlib-devel
+BuildRequires: bison-devel
+BuildRequires: flex-devel
+BuildRequires: mono-devel
+BuildRequires: glib2-devel
+BuildRequires: texlive
+BuildRequires: qt-devel
+
+BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: automake
+
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: bison-devel
+BuildRequires: flex-devel
+
+BuildRequires: ant
+
+Requires: openssl
+Requires: boost
+Requires: bison
+Requires: flex
+Requires: mono-core
+
+Requires: qt4
+
+%if 0%{?want_golang} > 0
+BuildRequires: golang
+Requires: golang
+%endif
+
+%description
+
+The Apache Thrift software framework for cross-language services
+development combines a software stack with a code generation engine to
+build services that work efficiently and seamlessly between C++, Java,
+Python, %{?php_langname}and other languages.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package -n python-%{name}
+Summary: Python support for %{name}
+BuildRequires: python2-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python2
+
+%description -n python-%{name}
+The python-%{name} package contains Python bindings for %{name}.
+
+%package -n perl-%{name}
+Summary: Perl support for %{name}
+Provides: perl(Thrift) = %{version}-%{release}
+BuildRequires: perl(Bit::Vector)
+BuildRequires: perl(ExtUtils::MakeMaker)
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(Bit::Vector)
+Requires: perl(Encode)
+Requires: perl(HTTP::Request)
+Requires: perl(IO::Select)
+Requires: perl(IO::Socket::INET)
+Requires: perl(IO::String)
+Requires: perl(LWP::UserAgent)
+Requires: perl(POSIX)
+Requires: perl(base)
+Requires: perl(constant)
+Requires: perl(strict)
+Requires: perl(utf8)
+Requires: perl(warnings)
+BuildArch: noarch
+
+%description -n perl-%{name}
+The perl-%{name} package contains Perl bindings for %{name}.
+
+%if %{?want_d}
+%package -n d-%{name}
+Summary: D support for %{name}
+BuildRequires: ldc
+
+%description -n d-%{name}
+The d-%{name} package contains D bindings for %{name}.
+%endif
+
+%if 0%{?want_php} != 0
+%package -n php-%{name}
+Summary: PHP support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
+Requires: php(language) >= 5.3.0
+Requires: php-date
+Requires: php-json
+BuildRequires: php-devel
+
+%description -n php-%{name}
+The php-%{name} package contains PHP bindings for %{name}.
+%endif
+
+%package -n lib%{name}-javadoc
+Summary: API documentation for java-%{name}
+Requires: lib%{name}-java = %{version}-%{release}
+BuildArch: noarch
+
+%description -n lib%{name}-javadoc
+The lib%{name}-javadoc package contains API documentation for the
+Java bindings for %{name}.
+
+%package -n lib%{name}-java
+Summary: Java support for %{name}
+
+BuildRequires: java-devel
+BuildRequires: javapackages-tools
+BuildRequires: apache-commons-codec
+BuildRequires: apache-commons-lang
+BuildRequires: apache-commons-logging
+BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core
+BuildRequires: junit
+BuildRequires: log4j
+BuildRequires: slf4j
+BuildRequires: tomcat-servlet-3.0-api
+
+Requires: java >= 1:1.6.0
+Requires: javapackages-tools
+Requires: mvn(org.slf4j:slf4j-api)
+Requires: mvn(commons-lang:commons-lang)
+Requires: mvn(org.apache.httpcomponents:httpclient)
+Requires: mvn(org.apache.httpcomponents:httpcore)
+BuildArch: noarch
+
+
+%description -n lib%{name}-java
+The lib%{name}-java package contains Java bindings for %{name}.
+
+%if 0%{?want_ruby} > 0
+%package -n ruby-%{name}
+Summary: Ruby support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: ruby(release)
+BuildRequires: ruby-devel
+
+%description -n ruby-%{name}
+The ruby-%{name} package contains Ruby bindings for %{name}.
+%endif
+
+%if 0%{?want_erlang} > 0
+%package -n erlang-%{name}
+Summary: Erlang support for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: erlang
+Requires: erlang-jsx
+BuildRequires: erlang
+BuildRequires: erlang-rebar
+
+%description -n erlang-%{name}
+The erlang-%{name} package contains Erlang bindings for %{name}.
+%endif
+
+%package -n fb303
+Summary: Basic interface for Thrift services
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description -n fb303
+fb303 is the shared root of all Thrift services; it provides a
+standard interface to monitoring, dynamic options and configuration,
+uptime reports, activity, etc.
+
+%package -n fb303-devel
+Summary: Development files for fb303
+Requires: fb303%{?_isa} = %{version}-%{release}
+
+%description -n fb303-devel
+The fb303-devel package contains header files for fb303
+
+%package -n python-fb303
+Summary: Python bindings for fb303
+Requires: fb303%{?_isa} = %{version}-%{release}
+BuildRequires: python2-devel
+
+%description -n python-fb303
+The python-fb303 package contains Python bindings for fb303.
+
+%package -n fb303-java
+Summary: Java bindings for fb303
+Requires: java >= 1:1.6.0
+Requires: javapackages-tools
+Requires: mvn(org.slf4j:slf4j-api)
+Requires: mvn(commons-lang:commons-lang)
+Requires: mvn(org.apache.httpcomponents:httpclient)
+Requires: mvn(org.apache.httpcomponents:httpcore)
+BuildArch: noarch
+
+%description -n fb303-java
+The fb303-java package contains Java bindings for fb303.
+
+%global _default_patch_fuzz 2
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%{?!el5:sed -i -e 's/^AC_PROG_LIBTOOL/LT_INIT/g' configure.ac}
+
+# avoid spurious executable permissions in debuginfo package
+find . -name \*.cpp -or -name \*.cc -or -name \*.h | xargs -r chmod 644
+
+cp -p %{SOURCE2} bootstrap.sh
+
+# work around linking issues
+echo 'libthrift_c_glib_la_LIBADD = $(GLIB_LIBS) $(GOBJECT_LIBS) -L../cpp/.libs '
>> lib/c_glib/Makefile.am
+echo 'libthriftqt_la_LIBADD = $(QT_LIBS) -lthrift -L.libs' >>
lib/cpp/Makefile.am
+echo 'libthriftz_la_LIBADD = $(ZLIB_LIBS) -lthrift -L.libs' >>
lib/cpp/Makefile.am
+echo 'EXTRA_libthriftqt_la_DEPENDENCIES = libthrift.la' >>
lib/cpp/Makefile.am
+echo 'EXTRA_libthriftz_la_DEPENDENCIES = libthrift.la' >>
lib/cpp/Makefile.am
+
+# echo 'libfb303_so_LIBADD = -lthrift -L../../../lib/cpp/.libs' >>
contrib/fb303/cpp/Makefile.am
+
+sed -i 's|libfb303_so_LDFLAGS = $(SHARED_LDFLAGS)|libfb303_so_LDFLAGS =
$(SHARED_LDFLAGS) -lthrift -L../../../lib/cpp/.libs -Wl,--as-needed|g'
contrib/fb303/cpp/Makefile.am
+
+%build
+export PY_PREFIX=%{_prefix}
+export PERL_PREFIX=%{_prefix}
+export PHP_PREFIX=%{php_extdir}
+export JAVA_PREFIX=%{_javadir}
+export RUBY_PREFIX=%{_prefix}
+export GLIB_LIBS=$(pkg-config --libs glib-2.0)
+export GLIB_CFLAGS=$(pkg-config --cflags glib-2.0)
+export GOBJECT_LIBS=$(pkg-config --libs gobject-2.0)
+export GOBJECT_CFLAGS=$(pkg-config --cflags gobject-2.0)
+
+find %{_builddir} -name rebar -exec rm -f '{}' \;
+find . -name Makefile\* -exec sed -i -e 's/[.][/]rebar/rebar/g' {} \;
+
+# install javadocs in proper places
+sed -i
's|-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java|-Dinstall.javadoc.path=$(DESTDIR)%{_javadocdir}/%{name}|'
lib/java/Makefile.*
+
+# build a jar without a version number
+sed -i 's|${thrift.artifactid}-${version}|${thrift.artifactid}|'
lib/java/build.xml
+
+# Proper permissions for Erlang files
+sed -i 's|$(INSTALL) $$p|$(INSTALL) --mode 644 $$p|g' lib/erl/Makefile.am
+
+# Build fb303 jars against the in-situ copy of thrift
+sed -i 's|$(thrift_home)/bin/thrift|../../../compiler/cpp/thrift|g' \
+ contrib/fb303/cpp/Makefile.am \
+ contrib/fb303/py/Makefile.am
+
+sed -i 's|$(prefix)/lib$|%{_libdir}|g' contrib/fb303/cpp/Makefile.am
+
+sed -i 's|$(thrift_home)/include/thrift|../../../lib/cpp/src|g' \
+ contrib/fb303/cpp/Makefile.am
+
+# Create a straightforward makefile for Java fb303
+echo "all:
+ ant
+install: build/libfb303.jar
+ mkdir -p %{buildroot}%{_javadir}
+ /usr/bin/install -c -m 644 build/libfb303.jar %{buildroot}%{_javadir}
+" > contrib/fb303/java/Makefile
+
+sh ./bootstrap.sh
+
+# use unversioned doc dirs where appropriate (via _pkgdocdir macro)
+%configure --disable-dependency-tracking --disable-static --without-libevent
--with-boost=/usr %{ruby_configure} %{erlang_configure} %{golang_configure}
%{php_configure} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+
+# eliminate unused direct shlib dependencies
+sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool
+
+make %{?_smp_mflags}
+
+# build fb303
+(
+ cd contrib/fb303
+ chmod 755 bootstrap.sh
+ sh bootstrap.sh
+ %configure --disable-static --with-java --without-php --libdir=%{_libdir}
+ make %{?_smp_mflags}
+ (
+ cd java
+ ant dist
+ )
+)
+
+%install
+%make_install
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name fastbinary.so | xargs -r chmod 755
+find %{buildroot} -name \*.erl -or -name \*.hrl -or -name \*.app | xargs -r chmod 644
+
+# install man page
+mkdir -p %{buildroot}%{_mandir}/man1
+cp %{SOURCE3} %{buildroot}%{_mandir}/man1/thrift.1
+gzip -9v %{buildroot}%{_mandir}/man1/thrift.1
+
+# Remove javadocs jar
+find %{buildroot}/%{_javadir} -name lib%{name}-javadoc.jar -exec rm -f '{}' \;
+
+# Add POM file and depmap
+mkdir -p %{buildroot}%{_mavenpomdir}
+
+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-libthrift.pom
+
+%add_maven_depmap JPP-libthrift.pom libthrift.jar
+
+# Remove bundled jar files
+find %{buildroot} -name \*.jar -a \! -name \*thrift\* -exec rm -f '{}' \;
+
+# Move perl files into appropriate places
+find %{buildroot} -name \*.pod -exec rm -f '{}' \;
+find %{buildroot} -name .packlist -exec rm -f '{}' \;
+find %{buildroot}/usr/lib/perl5 -type d -empty -delete
+mkdir -p %{buildroot}/%{perl_vendorlib}/
+mv %{buildroot}/usr/lib/perl5/* %{buildroot}/%{perl_vendorlib}
+
+%if 0%{?want_php} != 0
+
+# Move arch-independent php files into the appropriate place
+mkdir -p %{buildroot}/%{_datadir}/php/
+mv %{buildroot}/%{php_extdir}/Thrift %{buildroot}/%{_datadir}/php/
+%endif # want_php
+
+# Fix permissions on Thread.h
+find %{buildroot} -name Thread.h -exec chmod a-x '{}' \;
+
+# install fb303
+(
+ cd contrib/fb303
+ make DESTDIR=%{buildroot} install
+ (
+ cd java
+ ant -Dinstall.path=%{buildroot}%{_javadir}
-Dinstall.javadoc.path=%{buildroot}%{_javadocdir}/fb303 install
+ )
+)
+
+# install maven pom and depmaps for fb303
+install -pm 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP-libfb303.pom
+%add_maven_depmap JPP-libfb303.pom libfb303.jar -f "fb303"
+
+# Ensure all python scripts are executable
+find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod
755
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc LICENSE NOTICE
+%{_bindir}/thrift
+%{_libdir}/*.so.*
+%{_mandir}/man1/thrift.1.gz
+
+%files devel
+%{_includedir}/thrift
+%exclude %{_includedir}/thrift/fb303
+%{_libdir}/*.so
+%exclude %{_libdir}/libfb303.so
+%{_libdir}/pkgconfig/thrift-z.pc
+%{_libdir}/pkgconfig/thrift-qt.pc
+%{_libdir}/pkgconfig/thrift.pc
+%{_libdir}/pkgconfig/thrift_c_glib.pc
+%doc LICENSE NOTICE
+
+%files -n perl-%{name}
+%{perl_vendorlib}/Thrift
+%{perl_vendorlib}/Thrift.pm
+%doc LICENSE NOTICE
+
+%if 0%{?want_php} != 0
+%files -n php-%{name}
+%config(noreplace) /etc/php.d/thrift_protocol.ini
+%{_datadir}/php/Thrift/
+%{php_extdir}/thrift_protocol.so
+%doc LICENSE NOTICE
+%endif
+
+%if %{?want_erlang} > 0
+%files -n erlang-%{name}
+%{_libdir}/erlang/lib/%{name}-%{version}/
+%doc LICENSE NOTICE
+%endif
+
+%files -n python-%{name}
+%{python_sitearch}/%{name}
+%{python_sitearch}/%{name}-%{version}-py%{py_version}.egg-info
+%doc LICENSE NOTICE
+
+%files -n lib%{name}-javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
+
+%files -n lib%{name}-java
+%{_javadir}/lib%{name}.jar
+%{_mavenpomdir}/JPP-lib%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc LICENSE NOTICE
+
+%files -n fb303
+%{_datarootdir}/fb303
+%doc LICENSE NOTICE
+
+%files -n fb303-devel
+%{_libdir}/libfb303.so
+%{_includedir}/thrift/fb303
+%doc LICENSE NOTICE
+
+%files -n python-fb303
+%{python_sitelib}/fb303
+%{python_sitelib}/fb303_scripts
+%{python_sitelib}/%{name}_fb303-%{fb303_version}-py%{py_version}.egg-info
+%doc LICENSE NOTICE
+
+%files -n fb303-java
+%{_javadir}/libfb303.jar
+%{_mavenpomdir}/JPP-libfb303.pom
+%{_mavendepmapfragdir}/thrift-fb303
+%doc LICENSE NOTICE
+
+
+
+%changelog
+
+* Sun Oct 13 2013 willb <willb@redhat> - 0.9.1-7
+- minor specfile cleanups
+
+* Fri Oct 11 2013 willb <willb@redhat> - 0.9.1-6
+- added thrift man page
+- integrated fb303
+- fixed many fb303 library dependency problems
+
+* Tue Oct 1 2013 willb <willb@redhat> - 0.9.1-5
+- fixed extension library linking when an older thrift package is not
+ already installed
+- fixed extension library dependencies in Makefile
+
+* Tue Oct 1 2013 willb <willb@redhat> - 0.9.1-4
+- addresses rpmlint warnings and errors
+- properly links glib, qt, and z extension libraries
+
+* Mon Sep 30 2013 willb <willb@redhat> - 0.9.1-3
+- adds QT support
+- clarified multiple licensing
+- uses parallel make
+- removes obsolete M4 macros
+- specifies canonical location for source archive
+
+* Tue Sep 24 2013 willb <willb@redhat> - 0.9.1-2
+- fixes for i686
+- fixes bogus requires for Java package
+
+* Fri Sep 20 2013 willb <willb@redhat> - 0.9.1-1
+- updated to upstream version 0.9.1
+- disables PHP support, which FTBFS in this version
+
+* Fri Sep 20 2013 willb <willb@redhat> - 0.9.0-5
+- patch build xml to generate unversioned jars instead of moving after the fact
+- unversioned doc dirs on Fedora versions where this is appropriate
+- replaced some stray hardcoded paths with macros
+- thanks to Gil for the above observations and suggestions for fixes
+
+* Thu Aug 22 2013 willb <willb@redhat> - 0.9.0-4
+- removed version number from jar name (obs pmackinn)
+
+* Thu Aug 22 2013 willb <willb@redhat> - 0.9.0-3
+- Fixes for F19 and Erlang support
+
+* Thu Aug 15 2013 willb <willb@redhat> - 0.9.0-2
+- Incorporates feedback from comments on review request
+
+* Mon Jul 1 2013 willb <willb@redhat> - 0.9.0-1
+- Initial package