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

Revert --ignore-dependencies patch for rubygems

Browse source
This commit is contained in:
Denis Silakov 2014-07-02 11:20:21 +04:00
parent 78a814d1c6
commit 2c039b3f1c
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rpm-5.4.10-ruby2.1-fixes.patch
View file

@ -1,12 +0,0 @@
diff -urN rpm-5.4.10/macros/ruby.in rpm-5.4.10-patched/macros/ruby.in
--- rpm-5.4.10/macros/ruby.in 2014-06-27 21:56:06.777854502 +1100
+++ rpm-5.4.10-patched/macros/ruby.in 2014-06-27 21:57:30.851220895 +1100
@@ -36,7 +36,7 @@
export LC_CTYPE=UTF-8 \
DESTDIR=${DESTDIR:-%{buildroot}} \\\
%__gem_helper install \\\
- --env-shebang --rdoc --ri --force --ignore-dependencies \\\
+ --env-shebang --rdoc --ri --force \\\
%{!-i:--install-dir %{buildroot}%{ruby_gemdir}}%{-i:--install-dir %{-i*}} \\\
%{!-n:--bindir %{buildroot}%{_bindir}}%{-n:--bindir%{-n*}} \\\
%{!-C:--fix-permissions}

9
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}.}40
Release: %{?prereldate:0.%{prereldate}.}41
License: LGPLv2.1+
Group: System/Configuration/Packaging
URL: http://rpm5.org/
@ -471,9 +471,7 @@ 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
# Needed to make docs generation work for gems
Patch220: rpm-5.4.10-ruby2.1-fixes.patch
Patch221: rpm-5.4.14-fix-dependency-generation-when-ruby_version-is-empty.patch
Patch220: rpm-5.4.14-fix-dependency-generation-when-ruby_version-is-empty.patch
# ROSA stuff
Patch501: rpm-5.3.12.vendor.ROSA.patch
@ -907,8 +905,7 @@ 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 .ruby2.1~
%patch221 -p1 -b .no_ruby_version~
%patch220 -p1 -b .no_ruby_version~
%patch501 -p1 -b .rosa_vendor~
%patch502 -p1 -b .package_name~