[rubygem-gem2rpm/f18] Update to gem2rpm 0.9.2.

Vít Ondruch vondruch at fedoraproject.org
Tue Apr 23 08:34:31 UTC 2013


commit d435c9fb5231a0c0796a8d4d76136ad62ed81a87
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 23 10:03:02 2013 +0200

    Update to gem2rpm 0.9.2.

 .gitignore           |    7 +++++++
 rubygem-gem2rpm.spec |   29 +++++++++++++----------------
 sources              |    4 ++--
 3 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea6d621..e7edfa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,10 @@ gem2rpm-0.6.0.gem
 /gem2rpm-0.8.0-tests.tgz
 /gem2rpm-0.8.1-tests.tgz
 /gem2rpm-0.8.1.gem
+<<<<<<< HEAD
+=======
+/gem2rpm-0.9.1-tests.tgz
+/gem2rpm-0.9.1.gem
+/gem2rpm-0.9.2-tests.tgz
+/gem2rpm-0.9.2.gem
+>>>>>>> 1c876f7... Update to gem2rpm 0.9.2.
diff --git a/rubygem-gem2rpm.spec b/rubygem-gem2rpm.spec
index 30ef720..ef20324 100644
--- a/rubygem-gem2rpm.spec
+++ b/rubygem-gem2rpm.spec
@@ -1,25 +1,18 @@
 # Generated from gem2rpm-0.5.2.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name gem2rpm
 
-%if 0%{fedora} >= 17
 %global rubyabi 1.9.1
-%else
-%global rubyabi 1.8
-%endif
 
 Summary: Generate rpm specfiles from gems
 Name: rubygem-%{gem_name}
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+
-%if 0%{?rhel} <= 5
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%endif
 URL: https://github.com/lutter/gem2rpm/
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-# git clone https://github.com/lutter/gem2rpm.git && cd gem2rpm && git checkout v0.8.1
-# tar czvf gem2rpm-0.8.1-tests.tgz test/
+# git clone https://github.com/lutter/gem2rpm.git && cd gem2rpm && git checkout v0.9.2
+# tar czvf gem2rpm-0.9.2-tests.tgz test/
 Source1: %{gem_name}-%{version}-tests.tgz
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
@@ -50,10 +43,7 @@ Documentation for %{name}.
 
 %prep
 %setup -q -c -T
-mkdir -p .%{gem_dir}
-gem install --local --install-dir .%{gem_dir} \
-            --bindir .%{_bindir} \
-            --force %{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 %build
 
@@ -70,8 +60,12 @@ cp -a .%{_bindir}/* \
 find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
 %check
-tar xzvf %{SOURCE1} -C .%{gem_instdir}
 pushd .%{gem_instdir}
+tar xzvf %{SOURCE1}
+
+# Disable this test, since it needs online access (see the comment on line 22).
+sed -i "23,25 d" test/test_gem2rpm.rb
+
 testrb -Itest test/
 popd
 
@@ -91,6 +85,9 @@ popd
 %doc %{gem_instdir}/AUTHORS
 
 %changelog
+* Tue Apr 23 2013 Vít Ondruch <vondruch at redhat.com> - 0.9.2-1
+- Update to gem2rpm 0.9.2.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 7eb510e..2059003 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d7d8bc231dc405bbce00f570c89f530e  gem2rpm-0.8.1-tests.tgz
-d3c9416f225ae944fd195e69e122d46e  gem2rpm-0.8.1.gem
+e5a178f7cf4aff215cfe232d8808d2e4  gem2rpm-0.9.2-tests.tgz
+6988e28332369a79067d45b8c61f2851  gem2rpm-0.9.2.gem


More information about the scm-commits mailing list