diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-01-02 08:07:58 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-01-02 08:07:58 +0100 |
| commit | 58ae1942d91c4449a297f8744f484482bd0bc2cc (patch) | |
| tree | 2ead0d86e2bb6177db5cb56254967f505a9b58a4 | |
| parent | eed9188e2a60bed066fa65d991977b4b988b1272 (diff) | |
librabbitmq: fix librabbitmq.pc
| -rw-r--r-- | librabbitmq-pc.patch | 39 | ||||
| -rw-r--r-- | librabbitmq.spec | 12 |
2 files changed, 49 insertions, 2 deletions
diff --git a/librabbitmq-pc.patch b/librabbitmq-pc.patch new file mode 100644 index 0000000..59642eb --- /dev/null +++ b/librabbitmq-pc.patch @@ -0,0 +1,39 @@ +From 02d5c58ae4b9bbaa6201990ff5066f0db561d231 Mon Sep 17 00:00:00 2001 +From: Alan Antonuk <alan.antonuk@gmail.com> +Date: Wed, 1 Jan 2014 17:51:31 -0800 +Subject: [PATCH] Fixes librabbitmq.pc generation under autoconf + +Properly substitute the @requires_private@ and @libs_private@ variables +when configuring under autoconf + +This fixes #154 +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0559f8f..382fafa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -115,7 +115,8 @@ AS_IF([test "x$with_ssl" = "xcyassl"], + [test "x$with_ssl" = "xgnutls"], + [PKG_CHECK_MODULES([SSL], [gnutls],, [with_ssl=no])], + [test "x$with_ssl" = "xopenssl"], +- [PKG_CHECK_MODULES([SSL], [openssl >= 0.9.8],, [with_ssl=no])], ++ [PKG_CHECK_MODULES([SSL], [openssl >= 0.9.8], [ssl_pkg_required=openssl], ++ [with_ssl=no])], + [test "x$with_ssl" = "xpolarssl"], + [AX_LIB_POLARSSL([SSL_CFLAGS=$POLARSSL_CFLAGS + SSL_LIBS=$POLARSSL_LIBS], +@@ -162,6 +163,8 @@ AC_ARG_ENABLE([examples], + [enable_examples=yes]) + AM_CONDITIONAL([EXAMPLES], [test "x$enable_examples" = "xyes"]) + ++AC_SUBST([requires_private], [$ssl_pkg_required]) ++AC_SUBST([libs_private], [$LIBS]) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_FILES([ + librabbitmq.pc +-- +1.8.5.1 + diff --git a/librabbitmq.spec b/librabbitmq.spec index 44f8ac9..68dfe88 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -10,12 +10,13 @@ Name: librabbitmq Summary: Client library for AMQP Version: 0.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: https://github.com/alanxz/rabbitmq-c -Source0: https://github.com/alanxz/rabbitmq-c/archive/rabbitmq-c-%{version}.tar.gz +Source0: https://github.com/alanxz/rabbitmq-c/releases/download/v%{version}/rabbitmq-c-%{version}.tar.gz +Patch0: %{name}-pc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -64,6 +65,9 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n rabbitmq-c-%{version} +%if 0%{?rhel} != 5 +%patch0 -p1 +%endif # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -130,6 +134,10 @@ rm -rf %{buildroot} %changelog +* Thu Jan 2 2014 Remi Collet <remi@fedoraproject.org> - 0.4.1-2 +- fix broken librabbitmq.pc, #1039555 +- fix Source0 URL + * Sat Sep 28 2013 Remi Collet <remi@fedoraproject.org> - 0.4.1-1 - update to 0.4.1 - add ssl support |