diff --git a/.gitignore b/.gitignore index 906f798..065c049 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /rabbitmq-c-v0.3.0.tar.gz /rabbitmq-c-0.4.1.tar.gz /rabbitmq-c-0.5.0.tar.gz +/rabbitmq-c-0.5.1.tar.gz diff --git a/librabbitmq-170.patch b/librabbitmq-170.patch deleted file mode 100644 index c037203..0000000 --- a/librabbitmq-170.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b852f846c46a3bb9451f99844edfbea41f3289f1 Mon Sep 17 00:00:00 2001 -From: Alan Antonuk -Date: Mon, 17 Feb 2014 19:28:56 -0800 -Subject: [PATCH] Add missing amqp_get_server_properties() function. - -Fixes #170 ---- - librabbitmq/amqp_connection.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/librabbitmq/amqp_connection.c b/librabbitmq/amqp_connection.c -index d3491fb..5d70b07 100644 ---- a/librabbitmq/amqp_connection.c -+++ b/librabbitmq/amqp_connection.c -@@ -519,3 +519,8 @@ int amqp_send_frame(amqp_connection_state_t state, - - return res; - } -+amqp_table_t * -+amqp_get_server_properties(amqp_connection_state_t state) -+{ -+ return &state->server_properties; -+} --- -1.9.1 - diff --git a/librabbitmq-ver.patch b/librabbitmq-ver.patch deleted file mode 100644 index 45a5039..0000000 --- a/librabbitmq-ver.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b7c3f97acf25cd0e8644be46f0a9a5f7ece2e33d Mon Sep 17 00:00:00 2001 -From: Alan Antonuk -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 2e0861e..d6bbe76 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -9,19 +9,14 @@ Name: librabbitmq Summary: Client library for AMQP -Version: 0.5.0 -Release: 3%{?dist} +Version: 0.5.1 +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 -# for revert, switch from 0.5.0 to 0.5.1-pre -Patch0: %{name}-ver.patch -# Missing function -Patch1: %{name}-170.patch - BuildRequires: libtool BuildRequires: openssl-devel # For tools @@ -64,9 +59,6 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n rabbitmq-c-%{version} -%patch0 -p1 -R -%patch1 -p1 - # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -106,11 +98,13 @@ make check %files -%doc AUTHORS README.md THANKS TODO LICENSE-MIT +%{!?_licensedir:%global license %%doc} +%license LICENSE-MIT %{_libdir}/%{name}.so.1* %files devel +%doc AUTHORS THANKS TODO *.md %doc Examples %{_libdir}/%{name}.so %{_includedir}/amqp* @@ -119,10 +113,15 @@ make check %files tools %{_bindir}/amqp-* %doc %{_mandir}/man1/amqp-*.1* -%doc %{_mandir}/man7/librabbitmq-tools.7.gz +%doc %{_mandir}/man7/librabbitmq-tools.7* %changelog +* Wed Aug 13 2014 Remi Collet - 0.5.1-1 +- update to 0.5.1 +- fix license handling +- move all documentation in devel subpackage + * Sat Jun 07 2014 Fedora Release Engineering - 0.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index ae1bc18..ce53b35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1f902c658c772cda464754678d8deb6 rabbitmq-c-0.5.0.tar.gz +797e98f81dcd880025bc37c26c93ff8e rabbitmq-c-0.5.1.tar.gz