From c3bdffba7aed153639f389645096570d4e126a34 Mon Sep 17 00:00:00 2001 From: remi Date: Wed, 1 Aug 2012 15:10:50 +0200 Subject: [PATCH] update to 0.2 from git 2059570 --- .gitignore | 3 +++ librabbitmq.spec | 34 ++++++++++++++++++++-------------- sources | 4 ++-- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 3250452..8c834e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +*spec~ /6fb87d6eb01b.tar.bz2 /fb6fca832fd2.tar.bz2 +/alanxz-rabbitmq-c-0.2-69-g2059570.tar.gz +/db13342f2443.tar.bz2 diff --git a/librabbitmq.spec b/librabbitmq.spec index 30be20d..f771754 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -1,15 +1,18 @@ -%global client_tag fb6fca832fd2 -%global codegen_tag 6fb87d6eb01b +%global client_tag 2059570 +%global codegen_tag db13342f2443 Name: librabbitmq Summary: Client library and command line tools for AMPQ -Version: 0.1 -Release: 0.3.hg%{client_tag}%{?dist} -License: MPLv1.1 or GPLv2+ +Version: 0.2 +Release: 0.1.git%{client_tag}%{?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: http://www.rabbitmq.com/ +URL: https://github.com/alanxz/rabbitmq-c -Source0: http://hg.rabbitmq.com/rabbitmq-c/archive/%{client_tag}.tar.bz2 +# https://nodeload.github.com/alanxz/rabbitmq-c/tarball/master +Source0: alanxz-rabbitmq-c-%{version}-69-g%{client_tag}.tar.gz Source1: http://hg.rabbitmq.com/rabbitmq-codegen/archive/%{codegen_tag}.tar.bz2 @@ -51,10 +54,8 @@ for %{name}. %prep %setup -qc -a 1 -mv rabbitmq-c-%{client_tag} rabbitmq-c - -mv rabbitmq-codegen-%{codegen_tag} rabbitmq-codegen -ln rabbitmq-codegen/amqp-rabbitmq-0.9.1.json rabbitmq-codegen/amqp-0.9.1.json +mv alanxz-rabbitmq-c-%{client_tag} rabbitmq-c +mv rabbitmq-codegen-%{codegen_tag}/* rabbitmq-c/codegen # Copy sources to be included in -devel docs. cp -pr rabbitmq-c/examples examples @@ -63,7 +64,7 @@ cp -pr rabbitmq-c/examples examples %build cd rabbitmq-c autoreconf -i -%configure +%configure --enable-tools --enable-docs make %{_smp_mflags} @@ -72,7 +73,7 @@ rm -rf %{buildroot} cd rabbitmq-c make install DESTDIR="%{buildroot}" -rm %{buildroot}%{_libdir}/%{name}.{a,la} +rm %{buildroot}%{_libdir}/%{name}.la %check @@ -92,7 +93,7 @@ rm -rf %{buildroot} %files %defattr (-,root,root,-) -%doc rabbitmq-c/{AUTHORS,COPYING,README,THANKS,TODO,LICENSE*} +%doc rabbitmq-c/{AUTHORS,README.md,THANKS,TODO,LICENSE*} %{_libdir}/%{name}.so.* %{_bindir}/amqp* %{_mandir}/man1/amqp* @@ -104,9 +105,14 @@ rm -rf %{buildroot} %doc examples %{_libdir}/%{name}.so %{_includedir}/amqp* +%{_libdir}/pkgconfig/librabbitmq.pc %changelog +* Wed Aug 01 2012 Remi Collet - 0.2-0.1.git2059570 +- update to latest snapshot (version 0.2, moved to github) +- License is now MIT + * Thu Jul 19 2012 Fedora Release Engineering - 0.1-0.3.hgfb6fca832fd2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 865bb43..83f30bc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c96d5397911fa4029a03d8d40d90158a 6fb87d6eb01b.tar.bz2 -45c682111c87e70c3f9f5f000760ac60 fb6fca832fd2.tar.bz2 +b3649eaa2d69cc37cf408a78d9f3f0fc alanxz-rabbitmq-c-0.2-69-g2059570.tar.gz +4a5963a1f2cc3ebcae603c2e90be2bce db13342f2443.tar.bz2