commit dceec7ec6cc4108c1808683fd70fa510a2a38818
Author: Elan Ruusamäe <[email protected]>
Date: Mon Aug 10 16:48:43 2015 +0300
fix location of data dir
data-location.patch | 11 +++++++++++
ruby-addressable.spec | 12 +++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/ruby-addressable.spec b/ruby-addressable.spec
index 539982e..e2feecb 100644
--- a/ruby-addressable.spec
+++ b/ruby-addressable.spec
@@ -6,11 +6,12 @@
Summary: Improved URI/URL Implementation
Name: ruby-%{pkgname}
Version: 2.3.5
-Release: 2
+Release: 3
License: Apache v2.0
Group: Development/Languages
Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem
# Source0-md5: 6b9a61885c3c95f912eec560f8f2e3eb
+Patch0: data-location.patch
URL: http://addressable.rubyforge.org/
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.656
@@ -29,6 +30,7 @@ RFCs and adds support for IRIs and URI templates.
%prep
%setup -q -n %{pkgname}-%{version}
+%patch0 -p1
%build
%__gem_helper spec
@@ -39,10 +41,10 @@ rspec spec/
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir},%{ruby_vendordir}/data}
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir}}
cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
-cp -a data/* $RPM_BUILD_ROOT%{ruby_vendordir}/data
+cp -a data/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}/%{pkgname}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -52,7 +54,3 @@ rm -rf $RPM_BUILD_ROOT
%doc README.md CHANGELOG.md LICENSE.txt
%{ruby_vendorlibdir}/%{pkgname}
%{ruby_specdir}/%{pkgname}-%{version}.gemspec
-
-# XXX move %{ruby_vendordir}/data to ruby.spec
-%dir %{ruby_vendordir}/data
-%{ruby_vendordir}/data/unicode.data
diff --git a/data-location.patch b/data-location.patch
new file mode 100644
index 0000000..b5c0329
--- /dev/null
+++ b/data-location.patch
@@ -0,0 +1,11 @@
+--- ./lib/addressable/idna/pure.rb~ 2014-07-22 05:31:24.000000000 +0300
++++ ./lib/addressable/idna/pure.rb 2015-08-10 16:46:57.117580861 +0300
+@@ -33,7 +33,7 @@
+
+
+ UNICODE_TABLE = File.expand_path(
+- File.join(File.dirname(__FILE__), '../../..', 'data/unicode.data')
++ File.join(File.dirname(__FILE__), '..', 'data/unicode.data')
+ )
+
+ ACE_PREFIX = "xn--"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-addressable.git/commitdiff/dceec7ec6cc4108c1808683fd70fa510a2a38818
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
