Build TNonblockingServer, remove useless man page, and use java-headless

manpage.1.ex

@@ -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 Krzyżaniak (eloy) <eloy@debian.org>,
-for the Debian project (and may be used by others).
-

thrift.spec

@@ -1,6 +1,4 @@
-%global pkg_version 0.9.1
 %global fb303_version 1.0.0_dev
-%global pkg_rel 14
 
 %global py_version 2.7
 
@@ -56,22 +54,22 @@
 %global golang_configure --without-go
 
 Name:		thrift
-Version:	%{pkg_version}
+Version:	0.9.1
-Release:	%{pkg_rel}%{?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
 # 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/
+URL:		https://thrift.apache.org/
 
 %if "%{version}" != "0.9.1"
-Source0:	http://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0:	https://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.
@@ -79,11 +77,10 @@ Source0:	http://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.ta
 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%{name}-%{version}.pom
+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://gitorious.org/pkg-scribe/thrift-deb-pkg/raw/master:debian/manpage.1.ex
+Source3:	https://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libfb303-%{version}.pom
-Source4:	http://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:		thrift-0.9.1-buildxml.patch
@@ -102,6 +99,8 @@ Group:		Development/Libraries
 
 BuildRequires:	libstdc++-devel
 BuildRequires:	boost-devel
+BuildRequires:	boost-static
+BuildRequires:	libevent-devel
 BuildRequires:	automake
 BuildRequires:	autoconf
 BuildRequires:	openssl-devel
@@ -307,7 +306,7 @@ 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:	java-headless >= 1:1.6.0
 Requires:	javapackages-tools
 Requires:	mvn(org.slf4j:slf4j-api)
 Requires:	mvn(commons-lang:commons-lang)
@@ -388,7 +387,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
@@ -414,11 +413,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 '{}' \;
 
@@ -460,7 +454,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
@@ -477,7 +471,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
@@ -495,6 +489,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
@@ -555,7 +550,10 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r
 %doc LICENSE NOTICE
 
 %changelog
-* Tue Dec 27 2016 William Benton <willb@redhat.com> - 0.9.1-13
+* Tue Mar 14 2017 Christopher Tubbs <ctubbsii@fedoraproject.org> - 0.9.1-15
+- Build TNonblockingServer, remove useless man page, and use java-headless
+
+* Tue Dec 27 2016 William Benton <willb@redhat.com> - 0.9.1-14
 - Backport QT/Glib separation from master
 - fix BZ 1390992