[rubygem-qpid_messaging/f17] Rebased on qpid_messaging 0.20.2.

Darryl L. Pierce mcpierce at fedoraproject.org
Fri Mar 8 14:20:05 UTC 2013


commit 6e9b31c23fb7962925c856318d5d17e51995e643
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Mon Jan 28 21:27:57 2013 -0500

    Rebased on qpid_messaging 0.20.2.
    
    - Updated to use the newer rubygems-devel macros.

 .gitignore                  |    1 +
 rubygem-qpid_messaging.spec |   30 +++++++++++++++++++-----------
 sources                     |    2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9cdff98..fbe656d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /qpid_messaging-0.16.0.gem
 /qpid_messaging-0.18.1.gem
 /qpid_messaging-0.20.0.gem
+/qpid_messaging-0.20.2.gem
diff --git a/rubygem-qpid_messaging.spec b/rubygem-qpid_messaging.spec
index 507c705..f942a75 100644
--- a/rubygem-qpid_messaging.spec
+++ b/rubygem-qpid_messaging.spec
@@ -4,8 +4,8 @@
 
 Summary:       Ruby bindings for the Qpid messaging framework
 Name:          rubygem-%{gem_name}
-Version:       0.20.0
-Release:       2%{?dist}
+Version:       0.20.2
+Release:       1%{?dist}
 License:       ASL 2.0
 
 URL:           http://qpid.apache.org
@@ -13,7 +13,12 @@ Source0:       http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
 Provides:      rubygem(%{gem_name}) = %{version}
 
+%if 0%{?fedora} >= 19
+BuildRequires: ruby(release)
+%else
 BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby
+%endif
 BuildRequires: ruby-devel
 BuildRequires: rubygems-devel
 BuildRequires: qpid-cpp-client-devel = %{qpid_version}
@@ -24,7 +29,11 @@ Provides:      ruby-qpid = %{version}
 Obsoletes:     ruby-qpid < 0.8-2
 Obsoletes:     rubygem(qpid) <= 0.16
 
+%if 0%{?fedora} >= 19
+Requires:      ruby(release)
+%else
 Requires:      ruby(abi) = %{rubyabi}
+%endif
 Requires:      rubygems
 
 
@@ -56,21 +65,16 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 gem build %{gem_name}.gemspec
 
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-gem install --local \
-            --install-dir .%{gem_dir} \
-            -V \
-            --force \
-            --rdoc \
-            %{gem_name}-%{version}.gem
+%gem_install
 
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
 cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 
-mkdir -p %{buildroot}%{gem_extdir}/
+mkdir -p %{buildroot}%{gem_extdir_mri}/
 mv %{buildroot}%{gem_instdir}/lib/cqpid.so \
-   %{buildroot}%{gem_extdir}/lib
+   %{buildroot}%{gem_extdir_mri}/lib
 
 rm -rf %{buildroot}%{gem_instdir}/ext
 
@@ -80,7 +84,7 @@ rm -rf %{buildroot}%{gem_instdir}/ext
 %files
 %dir %{gem_instdir}
 %{gem_libdir}
-%{gem_extdir}
+%{gem_extdir_mri}
 %exclude %{gem_cache}
 %{gem_spec}
 %doc %{gem_instdir}/LICENSE
@@ -97,6 +101,10 @@ rm -rf %{buildroot}%{gem_instdir}/ext
 
 
 %changelog
+* Fri Mar  8 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.20.2-1
+- Rebased on qpid_messaging 0.20.2.
+- Updated to use the newer rubygems-devel macros.
+
 * Thu Feb  7 2013 Peter Robinson <pbrobinson at fedoraproject.org> 0.20.0-2
 - bump qpid_version to 0.20 to match release
 
diff --git a/sources b/sources
index 041dcbd..55adb50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee12445b9bac9f660ed2b7769c431e05  qpid_messaging-0.20.0.gem
+2a05466c5efd0f1ef2f84c05e19848ec  qpid_messaging-0.20.2.gem


More information about the scm-commits mailing list