hguemar pushed to thrift (master). "Split Qt4/GLib runtimes into separate subpackages (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 10 09:51:02 UTC 2015


>From 339818f39ff999cb61e961075c1e5bfd45735ac1 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Wed, 8 Apr 2015 16:37:46 +0200
Subject: 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 Haïkel Guémar <hguemar at 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 at redhat.com> - 0.9.1-13.3
 - Rebuild for boost 1.57.0
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/thrift.git/commit/?h=master&id=339818f39ff999cb61e961075c1e5bfd45735ac1


More information about the scm-commits mailing list