[librabbitmq/el6] update to 0.3.0

[Remi Collet]

commit 717595c17c5f7fe6d161d48595760d48a9368b8f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Aug 1 14:52:39 2013 +0200

    update to 0.3.0

 .gitignore       |    4 ++
 librabbitmq.spec |   89 ++++++++++++++++++++++++-----------------------------
 sources          |    3 +-
 3 files changed, 45 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3250452..06bae67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
+*spec~
 /6fb87d6eb01b.tar.bz2
 /fb6fca832fd2.tar.bz2
+/alanxz-rabbitmq-c-0.2-69-g2059570.tar.gz
+/db13342f2443.tar.bz2
+/rabbitmq-c-v0.3.0.tar.gz
diff --git a/librabbitmq.spec b/librabbitmq.spec
index 38bb17d..d33e208 100644
--- a/librabbitmq.spec
+++ b/librabbitmq.spec
@@ -1,27 +1,17 @@
-%global   client_tag  fb6fca832fd2
-%global   codegen_tag 6fb87d6eb01b
-
 Name:      librabbitmq
-Summary:   Client library and command line tools for AMPQ
-Version:   0.1
-Release:   0.2.hg%{client_tag}%{?dist}
-License:   MPLv1.1 or GPLv2+
+Summary:   Client library and command line tools for AMQP
+Version:   0.3.0
+Release:   1%{?dist}
+License:   MIT
 Group:     System Environment/Libraries
-URL:       http://www.rabbitmq.com/
-
-Source0:   http://hg.rabbitmq.com/rabbitmq-c/archive/%{client_tag}.tar.bz2
-Source1:   http://hg.rabbitmq.com/rabbitmq-codegen/archive/%{codegen_tag}.tar.bz2
+URL:       https://github.com/alanxz/rabbitmq-c
 
+Source0:   https://github.com/alanxz/rabbitmq-c/archive/rabbitmq-c-v%{version}.tar.gz
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool
 BuildRequires: python-simplejson
 # For tools
-%if 0%{?rhel} == 5
-BuildRequires: popt
-%else
 BuildRequires: popt-devel
-%endif
 # For man page
 BuildRequires: xmlto
 
@@ -30,13 +20,6 @@ BuildRequires: xmlto
 This is a C-language AMQP client library for use with AMQP servers
 speaking protocol versions 0-9-1.
 
-It also provides several command line tools:
-amqp-consume        Consume messages from a queue on an AMQP server
-amqp-declare-queue  Declare a queue on an AMQP server
-amqp-delete-queue   Delete a queue from an AMQP server
-amqp-get            Get a message from a queue on an AMQP server
-amqp-publish        Publish a message on an AMQP server
-
 
 %package devel
 Summary:    Header files and development libraries for %{name}
@@ -45,68 +28,76 @@ Requires:   %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains the header files and development libraries
-for %{name}. 
+for %{name}.
 
 
-%prep
-%setup -qc -a 1
+%package tools
+Summary:    Example tools built using the librabbitmq package
+Group:      Development/Libraries
+Requires:   %{name}%{?_isa} = %{version}
 
-mv rabbitmq-c-%{client_tag}        rabbitmq-c
+%description tools
+This package contains example tools built using %{name}.
 
-mv rabbitmq-codegen-%{codegen_tag} rabbitmq-codegen
-ln rabbitmq-codegen/amqp-rabbitmq-0.9.1.json rabbitmq-codegen/amqp-0.9.1.json
+It provides:
+amqp-consume        Consume messages from a queue on an AMQP server
+amqp-declare-queue  Declare a queue on an AMQP server
+amqp-delete-queue   Delete a queue from an AMQP server
+amqp-get            Get a message from a queue on an AMQP server
+amqp-publish        Publish a message on an AMQP server
+
+
+%prep
+%setup -q -n rabbitmq-c-rabbitmq-c-v%{version}
 
 # Copy sources to be included in -devel docs.
-cp -pr rabbitmq-c/examples examples
+cp -pr examples Examples
 
 
 %build
-cd rabbitmq-c
 autoreconf -i
-%configure
+%configure --enable-tools --enable-docs
 make %{_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-cd rabbitmq-c
 make install  DESTDIR="%{buildroot}"
 
-rm %{buildroot}%{_libdir}/%{name}.{a,la}
+rm %{buildroot}%{_libdir}/%{name}.la
 
 
 %check
-cd rabbitmq-c
 make check
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
  
 
 %files
-%defattr (-,root,root,-) 
-%doc rabbitmq-c/{AUTHORS,COPYING,README,THANKS,TODO,LICENSE*}
-%{_libdir}/%{name}.so.*
-%{_bindir}/amqp*
-%{_mandir}/man1/amqp*
-%{_mandir}/man7/%{name}*
+%doc AUTHORS README.md THANKS TODO LICENSE-MIT
+%{_libdir}/%{name}.so.1*
 
 
 %files devel
-%defattr (-,root,root,-) 
-%doc examples
+%doc Examples
 %{_libdir}/%{name}.so
 %{_includedir}/amqp*
+%{_libdir}/pkgconfig/librabbitmq.pc
+
+%files tools
+%{_bindir}/amqp-*
+%doc %{_mandir}/man1/amqp-*.1*
+%doc %{_mandir}/man7/librabbitmq-tools.7.gz
 
 
 %changelog
+* Thu Aug  1 2013 Remi Collet <remi at fedoraproject.org> - 0.3.0-1
+- update to 0.3.0
+- create sub-package for tools
+- License is now MIT
+
 * Sun Mar 11 2012 Remi Collet <remi at fedoraproject.org> - 0.1-0.2.hgfb6fca832fd2
 - add %%check (per review comment)
 
diff --git a/sources b/sources
index 865bb43..ea513fb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c96d5397911fa4029a03d8d40d90158a  6fb87d6eb01b.tar.bz2
-45c682111c87e70c3f9f5f000760ac60  fb6fca832fd2.tar.bz2
+a7f0fbf59bf29843ad4125b1a784a520  rabbitmq-c-v0.3.0.tar.gz