[packages/ruby-nokogiri] mini_portile is not needed at runtime when extension is compiled
glen
glen at pld-linux.org
Sun Dec 14 19:35:58 CET 2014
commit b5fcf7455bb5762eaae6d0bb5eb6d3b6d2a88ffa
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Dec 14 20:35:48 2014 +0200
mini_portile is not needed at runtime when extension is compiled
deps.patch | 27 +++++++++++++++++++++++++++
ruby-nokogiri.spec | 16 ++++++++++++++--
2 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/ruby-nokogiri.spec b/ruby-nokogiri.spec
index 204bf8f..a3b683c 100644
--- a/ruby-nokogiri.spec
+++ b/ruby-nokogiri.spec
@@ -2,6 +2,9 @@
# Conditional build:
%bcond_without tests # build without tests
+# NOTE
+# - changelog https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.rdoc
+
%define pkgname nokogiri
Summary: An HTML, XML, SAX, and Reader parser
Name: ruby-%{pkgname}
@@ -11,14 +14,17 @@ License: MIT
Group: Development/Languages
Source0: http://gems.rubyforge.org/gems/%{pkgname}-%{version}.gem
# Source0-md5: ac570aa0120b92185606919818d6ff92
+Patch0: deps.patch
URL: http://nokogiri.org/
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.665
BuildRequires: ruby-devel
-BuildRequires: ruby-mini_portile
+BuildRequires: ruby-mini_portile < 0.7
+BuildRequires: ruby-mini_portile >= 0.6.0
BuildRequires: ruby-rdoc
+BuildRequires: sed >= 4.0
BuildRequires: setup.rb >= 3.4.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -59,10 +65,16 @@ Dokumentacji w formacie ri dla %{pkgname}.
%prep
%setup -q -n %{pkgname}-%{version}
-cp %{_datadir}/setup.rb .
+
+cp -p %{_datadir}/setup.rb .
%build
%__gem_helper spec
+
+# yes. this is after writing gemspec.
+# making gemspec from source is hard
+%patch0 -p1
+
%{__ruby} setup.rb config \
--rbdir=%{ruby_vendorlibdir} \
--sodir=%{ruby_vendorarchdir}/%{pkgname}
diff --git a/deps.patch b/deps.patch
new file mode 100644
index 0000000..f56aa18
--- /dev/null
+++ b/deps.patch
@@ -0,0 +1,27 @@
+mini_portile is used at extension build time (ext/nokogiri/extconf.rb), which
+we do when building rpm it is not needed at runtime of rpm package install
+
+while gems do need it runtime as it's when they compile ext.
+
+--- nokogiri-1.6.5/Gemfile~ 2014-12-14 20:18:18.000000000 +0200
++++ nokogiri-1.6.5/Gemfile 2014-12-14 20:19:18.699925589 +0200
+@@ -4,7 +4,7 @@
+
+ source "https://rubygems.org/"
+
+-gem "mini_portile", "~>0.6.0"
++gem "mini_portile", "~>0.6.0", :group => [:development, :test]
+
+ gem "rdoc", "~>4.0", :group => [:development, :test]
+ gem "hoe-bundler", ">=1.1", :group => [:development, :test]
+--- nokogiri-1.6.5/nokogiri-1.6.5.gemspec~ 2014-12-14 19:15:48.000000000 +0200
++++ nokogiri-1.6.5/nokogiri-1.6.5.gemspec 2014-12-14 20:14:15.957664126 +0200
+@@ -25,7 +25,7 @@
+ s.specification_version = 4
+
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+- s.add_runtime_dependency(%q<mini_portile>, ["~> 0.6.0"])
++ s.add_development_dependency(%q<mini_portile>, ["~> 0.6.0"])
+ s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
+ s.add_development_dependency(%q<hoe-bundler>, [">= 1.1"])
+ s.add_development_dependency(%q<hoe-debugging>, [">= 1.0.3"])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-nokogiri.git/commitdiff/b5fcf7455bb5762eaae6d0bb5eb6d3b6d2a88ffa
More information about the pld-cvs-commit
mailing list