On 02/20/2012 04:33 AM, Vít Ondruch wrote:
Dne 13.2.2012 20:40, Mo Morsi napsal(a):
On 01/25/2012 04:46 AM, Vít Ondruch wrote:
Hi guys,
It seems that we have almost eliminated usage of RSpec 1.x:
$ repoquery --repoid=rawhide-source --arch=src --whatrequires
'rubygem(rspec)'
rubygem-ffi-0:1.0.9-2.fc16.src
rubygem-linode-0:0.6.2-1.fc15.src
$ repoquery --repoid=rawhide --whatrequires 'rubygem(rspec)'
aeolus-conductor-devel-0:0.4.0-2.fc17.noarch
$ repoquery --repoid=rawhide-source --arch=src --whatrequires
rubygem-rspec
rubygem-daemon_controller-0:0.2.6-2.fc17.src
$ repoquery --repoid=rawhide --arch=src --whatrequires rubygem-rspec
The only remaining packages are:
rubygem-ffi (bkearney) - seems to be just packaging bug:
https://bugzilla.redhat.com/show_bug.cgi?id=760009
rubygem-linode (stahnma) - upstream is already RSpec 2.x compatible,
it is FTBFS currently and it would deserve update anyway
aeolus-conductor-devel (mmorsi, clalance, sseago) - Hm, are
rubygem(rspec-rails) 2.6 compatible with RSpec 1.x? I doubt it ...
rubygem-daemon_controller (pwu) - It seems there should not be issue
running with RSpec 2.x, although I did not tested it.
Could we move forward and let the rubygem-rspec to follow the
upstream RSpec version and Require: rubygem(rspec-core)?
+1, lets move forward with this. I'm in the process of updating the
aeolus-conductor codebase to work against ruby 1.9.3 and will look
into incorporating an update to rspec 2 into this.
Since linode, ffi, and daemon_controller have been taken care of and
we've long announced the update to rspec2 in F17, lets perform the
final cutover. If there are issues going forward, we can easily
introduce a rspec1 compat package.
-Mo
Mo,
You mentioned in the packaging discussion that you have prepared
patches for rubygem-rspec to migrate them to RSpec 2.x, is that right?
Could you share them with us?
Vit
_______________________________________________
ruby-sig mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/ruby-sig
Attached. All the packages which depend on rspec 1 have been taken care
of except for rubygem-linode and aeolus-conductor (still in progress but
should be finished soon).
Patch updates the package to ruby 1.9 and removes the majority of the
contents, adding the dependencies on the rspec-{core|mock|expectations},
bringing it inline w/ the upstream gem.
-Mo
From 9caabf94987b12a11130525706f648117ddf95a3 Mon Sep 17 00:00:00 2001
From: Mo Morsi <[email protected]>
Date: Tue, 14 Feb 2012 12:37:00 -0500
Subject: [PATCH] update to rspec2 (2.8.0), build against ruby 1.9
---
.gitignore | 1 +
rubygem-rspec.spec | 60 ++++++++++++++++++++-------------------------------
sources | 1 +
3 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1cfe10a..bcd3939 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
rspec-1.3.0.gem
/rspec-1.3.1.gem
+/rspec-2.8.0.gem
diff --git a/rubygem-rspec.spec b/rubygem-rspec.spec
index e98bda1..b70575c 100644
--- a/rubygem-rspec.spec
+++ b/rubygem-rspec.spec
@@ -1,22 +1,22 @@
-%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname rspec
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gem_name rspec
+%global rubyabi 1.9.1
Summary: Behaviour driven development (BDD) framework for Ruby
-Name: rubygem-%{gemname}
-Version: 1.3.1
-Release: 2%{?dist}
+Name: rubygem-%{gem_name}
+Version: 2.8.0
+Release: 1%{?dist}
Group: Development/Languages
License: GPLv2+ or Ruby
URL: http://rspec.info
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: rubygem-rspec-1.3.1-RakeFileUtils_renamed_to_FileUtilsExt.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems, ruby(abi) = 1.8
+Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Requires: rubygems, ruby(abi) = %{rubyabi}
+Requires: rubygem(rspec-core)
+Requires: rubygem(rspec-mocks)
+Requires: rubygem(rspec-expectations)
BuildRequires: rubygems, ruby
+BuildRequires: rubygems-devel
BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
%description
RSpec is a behaviour driven development (BDD) framework for Ruby.
@@ -24,43 +24,31 @@ RSpec is a behaviour driven development (BDD) framework for
Ruby.
%prep
%setup -q -c -T
-gem install \
- -V \
- --install-dir $(pwd)%{gemdir} \
- --bindir $(pwd)%{_bindir} \
+gem install --local -V \
+ --install-dir .%{gem_dir} \
--force \
--rdoc \
%{SOURCE0}
-
-pushd .%{geminstdir}
-%patch0 -p1
-popd
-
-find . -type f | xargs chmod ugo+r
-
%build
%install
-mkdir -p %{buildroot}%{gemdir}
-cp -a .%{_prefix}/* %{buildroot}%{_prefix}/
-
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
-
-%clean
-rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
%files
%defattr(-, root, root, -)
-%{_bindir}/*
-%{gemdir}/gems/%{gemname}-%{version}/
-%doc %{gemdir}/doc/%{gemname}-%{version}
-#%doc %{geminstdir}/*.txt
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%doc %{gem_dir}/doc/%{gem_name}-%{version}
+%{gem_instdir}
+%{gem_dir}/cache/%{gem_name}-%{version}.gem
+%{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
%changelog
+* Tue Feb 14 2012 Mo Morsi <[email protected]> - 2.8.0-1
+- update package to rspec2
+- build against ruby 1.9
+
* Sat Jan 14 2012 Fedora Release Engineering <[email protected]>
- 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index e5e88fe..cd1fab9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
e634204e349db42b6efdec1869b1a6ef rspec-1.3.1.gem
+8c6752b4c955e13c506490c7f838c067 rspec-2.8.0.gem
--
1.7.6.5
_______________________________________________
ruby-sig mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/ruby-sig
