Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 18:33:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop update-ruby_gemdir-and-ruby_ridir-macros patch, looks like it only breaks things for us

Browse source
This commit is contained in:
Andrey Bondrov 2014-06-27 18:59:27 +11:00
parent 853920d09d
commit a4f7aa97bf
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rpm-5.4.14-update-ruby_gemdir-and-ruby_ridir-macros.patch
View file

@ -1,13 +0,0 @@
--- rpm-5.4.14/macros/ruby.in.ruby_macros~ 2014-03-16 11:29:03.201449905 +0100
+++ rpm-5.4.14/macros/ruby.in 2014-03-16 11:29:06.391322789 +0100
@@ -21,8 +21,8 @@
%ruby_vendordir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["vendordir"]')
%ruby_vendorarchdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["vendorarchdir"]')
%ruby_vendorlibdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["vendorlibdir"]')
-%ruby_gemdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["rubylibdir"].sub(RbConfig::CONFIG["ruby_version"], "gems/#{RbConfig::CONFIG["ruby_version"]}")')
-%ruby_ridir %(%{__ruby} -rrbconfig -e 'print File.join(RbConfig::CONFIG["datadir"], "ri", RbConfig::CONFIG["ruby_version"])')
+%ruby_gemdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["rubygemsdir"]')
+%ruby_ridir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["ridir"])')
%__gem_helper %{_usrlibrpm}/gem_helper.rb

4
rpm.spec
View file

@ -60,7 +60,7 @@ Summary: The RPM package management system
Name: rpm
Epoch: 1
Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}38
Release: %{?prereldate:0.%{prereldate}.}39
License: LGPLv2.1+
Group: System/Configuration/Packaging
URL: http://rpm5.org/
@ -471,7 +471,6 @@ Patch216: rpm-5.4.14-ruby-archdirs.patch
Patch217: rpm-5.4.14-ruby-abi-versioned.patch
Patch218: rpm-5.4.14-gem_helper-spec-arg.patch
Patch219: rpm-5.4.14-rubygems2-support.patch
Patch220: rpm-5.4.14-update-ruby_gemdir-and-ruby_ridir-macros.patch
Patch221: rpm-5.4.14-fix-dependency-generation-when-ruby_version-is-empty.patch
# ROSA stuff
@ -906,7 +905,6 @@ This package contains the RPM API documentation generated in HTML format.
%patch217 -p1 -b .rubyabiver~
%patch218 -p1 -b .gem_spec~
%patch219 -p1 -b .rubygems2~
%patch220 -p1 -b .ruby_macros~
%patch221 -p1 -b .no_ruby_version~
%patch501 -p1 -b .rosa_vendor~