Hi Release Masters, could we have an unfreeze for librspec-ruby and librspec-ruby1.8 1.1.3-3 ? It fixes #500625, which is tagged 'grave' as it indeed prevents users from doing much at all with "spec"...
The debdiff between -2 and -3 is attached to this email, and consist
in the following 2 changes:
- move ruby files from /usr/share/librspec-ruby1.8/ to
/usr/lib/ruby/1.8/spec/
- change plugins/mock_frameworks/rspec.rb to load modules from the
aforementioned path, instead of mucking around with a bunch of
'..'
Cheers,
--Seb
diff -u librspec-ruby-1.1.3/debian/rules librspec-ruby-1.1.3/debian/rules
--- librspec-ruby-1.1.3/debian/rules
+++ librspec-ruby-1.1.3/debian/rules
@@ -24,7 +24,7 @@
mkdir -p $(DESTDIR)
dh_installdirs
cp -r lib/* $(DESTDIR)/usr/lib/ruby/1.8/
- cp -r plugins spec stories $(DESTDIR)/usr/share/librspec-ruby1.8/
+ cp -r plugins spec stories $(DESTDIR)/usr/lib/ruby/1.8/spec/
cp -r bin/* $(DESTDIR)/usr/bin/
# Build architecture-independent files here.
@@ -57,7 +57,6 @@
# dh_strip
dh_compress
dh_fixperms
- chmod 755
$(DESTDIR)/usr/share/librspec-ruby1.8/plugins/mock_frameworks/flexmock.rb
# dh_makeshlibs
dh_installdeb
# dh_perl
diff -u librspec-ruby-1.1.3/debian/changelog
librspec-ruby-1.1.3/debian/changelog
--- librspec-ruby-1.1.3/debian/changelog
+++ librspec-ruby-1.1.3/debian/changelog
@@ -1,3 +1,10 @@
+librspec-ruby (1.1.3-3) unstable; urgency=low
+
+ * Put plugins, specs and stories in /usr/lib/ruby/1.8/spec/
+ (Closes: #500625).
+
+ -- Sebastien Delafond <[EMAIL PROTECTED]> Mon, 29 Sep 2008 14:03:10 -0700
+
librspec-ruby (1.1.3-2) unstable; urgency=low
* Force spec script path to /usr/bin/spec (Closes: #490729).
diff -u librspec-ruby-1.1.3/debian/librspec-ruby1.8.dirs
librspec-ruby-1.1.3/debian/librspec-ruby1.8.dirs
--- librspec-ruby-1.1.3/debian/librspec-ruby1.8.dirs
+++ librspec-ruby-1.1.3/debian/librspec-ruby1.8.dirs
@@ -3 +2,0 @@
-usr/share/librspec-ruby1.8
\ No newline at end of file
diff -u librspec-ruby-1.1.3/debian/patches/00list
librspec-ruby-1.1.3/debian/patches/00list
--- librspec-ruby-1.1.3/debian/patches/00list
+++ librspec-ruby-1.1.3/debian/patches/00list
@@ -1,0 +2 @@
+20_fix-for-500625.dpatch
only in patch2:
unchanged:
--- librspec-ruby-1.1.3.orig/debian/patches/20_fix-for-500625.dpatch
+++ librspec-ruby-1.1.3/debian/patches/20_fix-for-500625.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fix-for-500625.dpatch by Sebastien Delafond <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Search for plugins in /usr/lib/ruby/1.8/...
+
[EMAIL PROTECTED]@
+diff -urNad rspec-1.1.3~/lib/spec/example/configuration.rb
rspec-1.1.3/lib/spec/example/configuration.rb
+--- rspec-1.1.3~/lib/spec/example/configuration.rb 2008-09-29
14:26:14.000000000 -0700
++++ rspec-1.1.3/lib/spec/example/configuration.rb 2008-09-29
14:26:21.000000000 -0700
+@@ -137,7 +137,7 @@
+ end
+
+ def mock_framework_path(framework_name)
+- File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..",
"plugins", "mock_frameworks", framework_name))
++ "/usr/lib/ruby/1.8/spec/plugins/mock_frameworks/" + framework_name
+ end
+ end
+ end
+diff -urNad rspec-1.1.3~/plugins/mock_frameworks/rspec.rb
rspec-1.1.3/plugins/mock_frameworks/rspec.rb
+--- rspec-1.1.3~/plugins/mock_frameworks/rspec.rb 2008-09-29
14:26:14.000000000 -0700
++++ rspec-1.1.3/plugins/mock_frameworks/rspec.rb 2008-09-29
14:26:35.000000000 -0700
+@@ -1,4 +1,5 @@
+-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib",
"spec", "mocks"))
++#require File.expand_path(File.join(File.dirname(__FILE__), "..", "..",
"lib", "spec", "mocks"))
++require 'spec/mocks'
+
+ module Spec
+ module Plugins
signature.asc
Description: Digital signature
