[packages/ruby] mkmf moved to devel

glen glen at pld-linux.org
Fri Apr 26 10:49:03 CEST 2013


commit b5465d0cf6a338dd70bc03f544eb1e444a72321c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Apr 26 11:11:57 2013 +0300

    mkmf moved to devel
    
    - move /mkmf.rb to -devel, as it needs .h files mostly
    - -devel depend on pkg-config, as ext library checks are performed with
      pkgconfig and not very clear when things fail
    - note ruby-modules(ver) deprecation over ruby(abi)

 mkmf-verbose.patch | 11 +++++++++++
 ruby.spec          |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/ruby.spec b/ruby.spec
index 2bce2dc..ba09962 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -30,7 +30,7 @@ Name:		ruby
 Version:	%{basever}.%{patchlevel}
 # NOTE: do not decrease Release, when updating Version,
 # unless rdoc_ver, rubygems_ver *both* are increased as well
-Release:	6
+Release:	7
 Epoch:		1
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License:	(Ruby or BSD) and Public Domain
@@ -56,6 +56,8 @@ Patch3:		disable-versioned-paths.patch
 Patch4:		arch-specific-dir.patch
 # http://redmine.ruby-lang.org/issues/5281
 Patch5:		site-and-vendor-arch-flags.patch
+# Make mkmf verbose by default
+Patch6:		mkmf-verbose.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -176,6 +178,7 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 Suggests:	ruby-rubygems
 # workaround for autodep generator not getting version properly
 Provides:	ruby(abi) = %{ruby_version}
+# ruby-modules deprecated, rpm5 generates ruby(abi) itself
 Provides:	ruby-modules(ver) = %{ruby_version}
 Obsoletes:	ruby-minitest
 
@@ -208,6 +211,7 @@ Summary:	Ruby development libraries
 Summary(pl.UTF-8):	Biblioteki programistyczne interpretera języka Ruby
 Group:		Development/Languages
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	pkgconfig
 
 %description devel
 Ruby development libraries.
@@ -447,6 +451,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libruby.so
 %{_includedir}/%{name}-%{ruby_version}
 %{_pkgconfigdir}/ruby-%{ruby_version}.pc
+%{ruby_libdir}/mkmf.rb
 
 %files static
 %defattr(644,root,root,755)
@@ -543,6 +548,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/[u-z]*.rb
 %exclude %{ruby_libdir}/rubygems.rb
 %exclude %{ruby_libdir}/ubygems.rb
+%exclude %{ruby_libdir}/mkmf.rb
 %attr(755,root,root) %{ruby_archdir}/[a-s]*.so
 %attr(755,root,root) %{ruby_archdir}/[u-z]*.so
 %dir %{ruby_archdir}/digest
diff --git a/mkmf-verbose.patch b/mkmf-verbose.patch
new file mode 100644
index 0000000..7da66c8
--- /dev/null
+++ b/mkmf-verbose.patch
@@ -0,0 +1,11 @@
+--- ruby-1.9.3-p0/lib/mkmf.rb.debug	2011-08-11 15:07:37.000000000 +0900
++++ ruby-1.9.3-p0/lib/mkmf.rb	2012-01-29 21:34:17.000000000 +0900
+@@ -1638,7 +1638,7 @@
+ SHELL = /bin/sh
+ 
+ # V=0 quiet, V=1 verbose.  other values don't work.
+-V = 0
++V = 1
+ Q1 = $(V:1=)
+ Q = $(Q1:0=@)
+ n=$(NULLCMD)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/b5465d0cf6a338dd70bc03f544eb1e444a72321c



More information about the pld-cvs-commit mailing list