update to 0.3.0, create sub-package for tools

.gitignore

@@ -3,3 +3,4 @@
 /fb6fca832fd2.tar.bz2
 /alanxz-rabbitmq-c-0.2-69-g2059570.tar.gz
 /db13342f2443.tar.bz2
+/rabbitmq-c-v0.3.0.tar.gz

librabbitmq.spec

@@ -1,20 +1,12 @@
-%global   client_tag  2059570
-%global   codegen_tag db13342f2443
-
 Name:      librabbitmq
-Summary:   Client library and command line tools for AMPQ
+Summary:   Client library and command line tools for AMQP
-Version:   0.2
+Version:   0.3.0
-Release:   0.2.git%{client_tag}%{?dist}
+Release:   1%{?dist}
-# client and amqp-rabbitmq-0.9.1.json are MIT
-# codegen MPLv1.1 (but only used during build)
 License:   MIT
 Group:     System Environment/Libraries
 URL:       https://github.com/alanxz/rabbitmq-c
 
-# https://nodeload.github.com/alanxz/rabbitmq-c/tarball/master
+Source0:   https://github.com/alanxz/rabbitmq-c/archive/rabbitmq-c-v%{version}.tar.gz
-Source0:   alanxz-rabbitmq-c-%{version}-69-g%{client_tag}.tar.gz
-Source1:   http://hg.rabbitmq.com/rabbitmq-codegen/archive/%{codegen_tag}.tar.bz2
-
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool
@@ -33,13 +25,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}
@@ -51,18 +36,30 @@ This package contains the header files and development libraries
 for %{name}.
 
 
-%prep
+%package tools
-%setup -qc -a 1
+Summary:    Example tools built using the librabbitmq package
+Group:      Development/Libraries
+Requires:   %{name}%{?_isa} = %{version}
 
-mv alanxz-rabbitmq-c-%{client_tag}   rabbitmq-c
+%description tools
-mv rabbitmq-codegen-%{codegen_tag}/* rabbitmq-c/codegen
+This package contains example tools built using %{name}.
+
+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 --enable-tools --enable-docs
 make %{_smp_mflags}
@@ -70,14 +67,12 @@ make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-cd rabbitmq-c
 make install  DESTDIR="%{buildroot}"
 
 rm %{buildroot}%{_libdir}/%{name}.la
 
 
 %check
-cd rabbitmq-c
 make check
 
 
@@ -93,8 +88,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr (-,root,root,-) 
-%doc rabbitmq-c/{AUTHORS,README.md,THANKS,TODO,LICENSE*}
+%doc AUTHORS README.md THANKS TODO LICENSE-MIT
-%{_libdir}/%{name}.so.*
+%{_libdir}/%{name}.so.1*
 %{_bindir}/amqp*
 %{_mandir}/man1/amqp*
 %{_mandir}/man7/%{name}*
@@ -102,13 +97,23 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr (-,root,root,-) 
-%doc examples
+%doc Examples
 %{_libdir}/%{name}.so
 %{_includedir}/amqp*
 %{_libdir}/pkgconfig/librabbitmq.pc
 
+%files tools
+%defattr(-,root,root)
+%{_bindir}/amqp-*
+%doc %{_mandir}/man1/amqp-*.1*
+%doc %{_mandir}/man7/librabbitmq-tools.7.gz
+
 
 %changelog
+* Wed Mar 13 2013 Remi Collet <remi@fedoraproject.org> - 0.3.0-1
+- update to 0.3.0
+- create sub-package for tools
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-0.2.git2059570
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

sources

@@ -1,2 +1 @@
-b3649eaa2d69cc37cf408a78d9f3f0fc  alanxz-rabbitmq-c-0.2-69-g2059570.tar.gz
+a7f0fbf59bf29843ad4125b1a784a520  rabbitmq-c-v0.3.0.tar.gz
-4a5963a1f2cc3ebcae603c2e90be2bce  db13342f2443.tar.bz2