[packages/gem2rpm] use source tarball; run tests
glen
glen at pld-linux.org
Mon Apr 29 23:06:32 CEST 2013
commit 749a162471dbb65ebea5f162374207300fd835c5
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Apr 29 23:55:02 2013 +0300
use source tarball; run tests
gem2rpm.spec | 30 ++++++++++++++----------------
style.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 16 deletions(-)
---
diff --git a/gem2rpm.spec b/gem2rpm.spec
index 104b82f..580df46 100644
--- a/gem2rpm.spec
+++ b/gem2rpm.spec
@@ -1,15 +1,15 @@
+#
+# Conditional build:
+%bcond_without tests # build without tests
+
Summary: Generate rpm specfiles from gems
Name: gem2rpm
Version: 0.9.2
-Release: 0.8
+Release: 0.9
License: GPL v2+
Group: Development/Languages
-Source0: http://rubygems.org/gems/%{name}-%{version}.gem
-# Source0-md5: 6988e28332369a79067d45b8c61f2851
-# git clone https://github.com/lutter/gem2rpm.git && cd gem2rpm && git checkout v0.8.1
-# tar czvf gem2rpm-0.8.1-tests.tgz test/
-Source1: %{name}-0.8.1-tests.tgz
-# Source1-md5: d7d8bc231dc405bbce00f570c89f530e
+Source0: https://github.com/lutter/gem2rpm/archive/v%{version}.tar.gz
+# Source0-md5: 133c4cae2e26c24a5db0453e2cbe2a72
Source2: pld.spec.erb
Patch0: gems.patch
Patch1: pld.patch
@@ -17,7 +17,11 @@ Patch2: style.patch
URL: https://github.com/lutter/gem2rpm/
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.656
-Requires: ruby
+%if %{with tests}
+%if %(locale -a | grep -q '^en_US$'; echo $?)
+BuildRequires: glibc-localedb-all
+%endif
+%endif
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,6 +49,8 @@ cp -p %{SOURCE2} templates
%build
%if %{with tests}
+# tests need UTF-8 locale
+LC_ALL=en_US.UTF-8 \
testrb -Itest test/
%endif
@@ -68,11 +74,3 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_rubylibdir}/gem2rpm.rb
%{ruby_rubylibdir}/gem2rpm
%{_datadir}/ruby/templates
-
-%if 0
-%files doc
-%defattr(644,root,root,755)
-%doc %{gem_docdir}
-%doc %{gem_instdir}/README
-%doc %{gem_instdir}/AUTHORS
-%endif
diff --git a/style.patch b/style.patch
index 17748ac..b30f968 100644
--- a/style.patch
+++ b/style.patch
@@ -9,3 +9,36 @@
end
# Expands the not equal version operator '!=' into equivalent '<' and
+--- gem2rpm-0.9.2/test/test_helpers.rb~ 2013-04-23 10:58:32.000000000 +0300
++++ gem2rpm-0.9.2/test/test_helpers.rb 2013-04-29 23:51:55.467457420 +0300
+@@ -19,12 +19,12 @@
+
+ def test_first_level_pessimistic_version_constraint
+ r = Gem::Requirement.new(["~> 1.2"])
+- assert_equal(["=> 1.2", "< 2"], Gem2Rpm::Helpers.requirement_versions_to_rpm(r))
++ assert_equal([">= 1.2", "< 2"], Gem2Rpm::Helpers.requirement_versions_to_rpm(r))
+ end
+
+ def test_second_level_pessimistic_version_constraint
+ r = Gem::Requirement.new(["~> 1.2.3"])
+- assert_equal(["=> 1.2.3", "< 1.3"], Gem2Rpm::Helpers.requirement_versions_to_rpm(r))
++ assert_equal([">= 1.2.3", "< 1.3"], Gem2Rpm::Helpers.requirement_versions_to_rpm(r))
+ end
+
+ def test_pessimistic_version_constraint_with_trailing_text
+@@ -32,13 +32,13 @@
+ gem_version = Gem::Version.create(Gem::RubyGemsVersion)
+ if gem_version >= Gem::Version.create("1.3.2")
+ r = Gem::Requirement.new(["~> 1.2.3.beta.8"])
+- assert_equal(["=> 1.2.3.beta.8", "< 1.3"], Gem2Rpm::Helpers.requirement_versions_to_rpm(r))
++ assert_equal([">= 1.2.3.beta.8", "< 1.3"], Gem2Rpm::Helpers.requirement_versions_to_rpm(r))
+ end
+ end
+
+ def test_second_level_pessimistic_version_constraint_with_two_digit_version
+ r = Gem::Requirement.new(["~> 1.12.3"])
+- assert_equal(["=> 1.12.3", "< 1.13"], Gem2Rpm::Helpers.requirement_versions_to_rpm(r))
++ assert_equal([">= 1.12.3", "< 1.13"], Gem2Rpm::Helpers.requirement_versions_to_rpm(r))
+ end
+
+ def test_first_level_not_equal_version_constraint
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gem2rpm.git/commitdiff/967420bc95f1faf0b912657099fb3fcceafcd99f
More information about the pld-cvs-commit
mailing list