diff options
| -rw-r--r-- | librabbitmq-pc.patch | 39 | ||||
| -rw-r--r-- | librabbitmq-ver.patch | 27 | ||||
| -rw-r--r-- | librabbitmq.spec | 19 |
3 files changed, 39 insertions, 46 deletions
diff --git a/librabbitmq-pc.patch b/librabbitmq-pc.patch deleted file mode 100644 index 59642eb..0000000 --- a/librabbitmq-pc.patch +++ /dev/null @@ -1,39 +0,0 @@ -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-ver.patch b/librabbitmq-ver.patch new file mode 100644 index 0000000..45a5039 --- /dev/null +++ b/librabbitmq-ver.patch @@ -0,0 +1,27 @@ +From b7c3f97acf25cd0e8644be46f0a9a5f7ece2e33d Mon Sep 17 00:00:00 2001 +From: Alan Antonuk <alan.antonuk@gmail.com> +Date: Wed, 29 Jan 2014 22:21:31 -0800 +Subject: [PATCH] Bumping version for development + +--- + librabbitmq/amqp.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/librabbitmq/amqp.h b/librabbitmq/amqp.h +index 7f4226c..fd13087 100644 +--- a/librabbitmq/amqp.h ++++ b/librabbitmq/amqp.h +@@ -223,8 +223,8 @@ + + #define AMQP_VERSION_MAJOR 0 + #define AMQP_VERSION_MINOR 5 +-#define AMQP_VERSION_PATCH 0 +-#define AMQP_VERSION_IS_RELEASE 1 ++#define AMQP_VERSION_PATCH 1 ++#define AMQP_VERSION_IS_RELEASE 0 + + + /** +-- +1.8.5.1 + diff --git a/librabbitmq.spec b/librabbitmq.spec index 26829b0..06a5727 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -9,18 +9,19 @@ Name: librabbitmq Summary: Client library for AMQP -Version: 0.4.1 -Release: 3%{?dist} +Version: 0.5.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: https://github.com/alanxz/rabbitmq-c Source0: https://github.com/alanxz/rabbitmq-c/releases/download/v%{version}/rabbitmq-c-%{version}.tar.gz -Patch0: %{name}-pc.patch + +# for revert, switch from 0.5.0 to 0.5.1-pre +Patch0: %{name}-ver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool -BuildRequires: python-simplejson BuildRequires: openssl-devel # For tools %if 0%{?rhel} == 5 @@ -66,9 +67,7 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n rabbitmq-c-%{version} -%if 0%{?rhel} != 5 -%patch0 -p1 -%endif +%patch0 -p1 -R # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -138,6 +137,12 @@ rm -rf %{buildroot} %changelog +* Mon Feb 17 2014 Remi Collet <remi@fedoraproject.org> - 0.5.0-1 +- update to 0.5.0 + +* Mon Jan 13 2014 Remi Collet <remi@fedoraproject.org> - 0.4.1-4 +- drop BR python-simplejson + * Tue Jan 7 2014 Remi Collet <remi@fedoraproject.org> - 0.4.1-3 - fix broken librabbitmq.pc, #1039555 - add check for usable librabbitmq.pc |