PR#1: WIP: Update to 0.13.0 (bz#1778343) - rpms/thrift

rpms / thrift

#1 WIP: Update to 0.13.0 (bz#1778343)

Merged 3 years ago by ctubbsii. Opened 3 years ago by orion.

rpms/ orion/thrift 0.13 into master

Orion Poplawski • 3 years ago

4242baf

.gitignore

file modified

		`@@ -1,2 +1,3 @@`
		`/0.9.1.tar.gz`
		`/thrift-0.10.0.tar.gz`
		`+ /thrift-0.13.0.tar.gz`

THRIFT-4177.patch

file removed

-27

		`@@ -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; }`

bootstrap.sh

file modified

+12 -2

		`@@ -19,7 +19,10 @@`
		`# under the License.`
		`#`

		`- ./cleanup.sh`
		`+ echo -n "make distclean... "`
		`+ make -k distclean >/dev/null 2>&1`
		`+ echo "ok"`
		`+`
		`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)`
		`@@ -38,17 +41,24 @@`
		`exit 1`
		`fi`

		`+ format_version () {`
		`+ printf "%03d%03d%03d%03d" $(echo $1 \| tr '.' ' ');`
		`+ }`
		`+`
		`# 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`
		`+ if [ $(format_version $AUTOMAKE_VERSION) -lt $(format_version 1.13) ]; then`
		`echo >&2 "automake version $AUTOMAKE_VERSION is too old (need 1.13 or later)"`
		`exit 1`
		`fi`

		`+ set -e`
		`autoscan`
		`$LIBTOOLIZE --copy --automake`
		`aclocal -I ./aclocal`
		`autoheader`
		`+ sed '/undef VERSION/d' config.hin > config.hin2`
		`+ mv config.hin2 config.hin`
		`autoconf`
		`automake --copy --add-missing --foreign`

fb303-0.10.0-buildxml.patch

file removed

-158

		`@@ -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.git"`
		`- - developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git"`
		`- - 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>`

fix-ppc64le-builds.patch

file removed

-13

		`@@ -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`

libfb303-0.10.0.pom

file removed

-104

		`@@ -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</connection>`
		`- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git</developerConnection>`
		`- <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>`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (thrift-0.10.0.tar.gz) = 3695cf0fb0e4080b02446ab694fb61476997d8b181942dd6fe1e3e7cf0dcf990b4184ea33f9d0bc290b96200f702cf1ac1579e36b6b5bfe9ba8914b2d2938ddc`
		`+ SHA512 (thrift-0.13.0.tar.gz) = 5f7426d1e429ead20dd366f63a6d619071eccc17dc0395738307eef507b703733d029147fb596c4d392d31dc822777ea2a0be709f1f677b1221c9335cfcb09b7`

thrift.spec

file modified

+15 -138

		`@@ -58,8 +58,8 @@`
		`%global golang_configure --without-go`

		`Name: thrift`
		`- Version: 0.10.0`
		`- Release: 20%{?dist}`
		`+ Version: 0.13.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`
		`@@ -77,21 +77,10 @@`
		`Source1: https://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/lib%{name}-%{version}.pom`
		`Source2: https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh`

		`- Source3: https://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libfb303-%{version}.pom`
		`-`
		`# 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`
		`+ #Patch0: %{name}-%{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`
		`@@ -114,7 +103,7 @@`
		`BuildRequires: libstdc++-devel`
		`BuildRequires: libtool`
		`BuildRequires: openssl-devel`
		`- BuildRequires: qt-devel`
		`+ BuildRequires: qt5-qtbase-devel`
		`BuildRequires: texlive`
		`BuildRequires: zlib-devel`

		`@@ -278,46 +267,6 @@`
		`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.`
		`-`
		`- %if 0%{?want_java} > 0`
		`- %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.`
		`- %endif`

		`%prep`
		`%autosetup -p1`
		`@@ -331,18 +280,13 @@`

		`# 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 'libthriftqt5_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`

		`# explicitly set python3`
		`shopt -s globstar`
		`@@ -366,56 +310,22 @@`
		`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`
		`+ #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 %{java_configure} %{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} --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 %{java_configure} --without-php --with-py3 --libdir=%{_libdir}`
		`- make %{?_smp_mflags}`
		`- )`
		`-`
		`- # build fb303 java`
		`- %if 0%{?want_java} > 0`
		`- (`
		`- cd contrib/fb303/java`
		`- ant dist`
		`- )`
		`- %endif`

		`%install`
		`%make_install`
		`@@ -452,23 +362,6 @@`
		`# Fix permissions on Thread.h`
		`find %{buildroot} -name Thread.h -exec chmod a-x '{}' \;`

		`- # install fb303`
		`- (`
		`- cd contrib/fb303`
		`- make DESTDIR=%{buildroot} 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`

		`@@ -486,19 +379,17 @@`
		`%{_libdir}/libthrift_c_glib.so.*`

		`%files qt`
		`- %{_libdir}/libthriftqt.so`
		`- %{_libdir}/libthriftqt-%{version}.so`
		`+ %{_libdir}/libthriftqt5.so`
		`+ %{_libdir}/libthriftqt5-%{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-qt5.pc`
		`%{_libdir}/pkgconfig/thrift-nb.pc`
		`%{_libdir}/pkgconfig/thrift.pc`
		`%{_libdir}/pkgconfig/thrift_c_glib.pc`
		`@@ -537,27 +428,13 @@`
		`%doc LICENSE NOTICE`
		`%endif`

		`- %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`
		`-`
		`- %if 0%{?want_java} > 0`
		`- %files -n fb303-java -f .mfiles-fb303`
		`- %doc LICENSE NOTICE`
		`- %endif`

		`%changelog`
		`+ * Sun Dec 1 Orion Poplawski <orion@nwra.com> - 0.13.0-1`
		`+ - Update to 0.13.0 (bz#1778343)`
		`+ - Drops fb303 package`
		`+ - Switch to Qt5`
		`+`
		`* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-20`
		`- Rebuilt for Python 3.8.0rc1 (#1748018)`