pool/installation-images
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add ruby-ua.patch to fix build with ruby 2.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=603
This commit is contained in:
Stephan Kulow 2014-02-12 10:26:33 +00:00 committed by Git OBS Bridge
parent a037625f57
commit 0da8659e0a
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installation-images-SLES.spec
View File

@ -343,6 +343,7 @@ Group: Metapackages
Version: 14.39
Release: 0
Source: installation-images-14.39.tar.bz2
Patch0: ruby-ua.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@ -378,6 +379,7 @@ Package that holds debuginfo dependencies for image files in installation-image.
%prep
%setup -n installation-images-%{version}
%patch0 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build

5
installation-images-openSUSE.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 12 10:26:09 UTC 2014 - coolo@suse.com
- add ruby-ua.patch to fix build with ruby 2.1
-------------------------------------------------------------------
Tue Feb 11 15:39:00 CET 2014 - snwint@suse.de

2
installation-images-openSUSE.spec
View File

@ -343,6 +343,7 @@ Group: Metapackages
Version: 14.39
Release: 0
Source: installation-images-14.39.tar.bz2
Patch0: ruby-ua.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@ -378,6 +379,7 @@ Package that holds debuginfo dependencies for image files in installation-image.
%prep
%setup -n installation-images-%{version}
%patch0 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build

22
ruby-ua.patch Normal file
View File

@ -0,0 +1,22 @@
commit 76e3127975534b5cf842ab36161e8658b5d8a869
Author: Stephan Kulow <coolo@suse.de>
Date: Wed Feb 12 07:09:27 2014 +0100
ignore rake, rdoc and ri from ruby
diff --git a/data/root/root.file_list b/data/root/root.file_list
index d9e0a91..cae947c 100644
--- a/data/root/root.file_list
+++ b/data/root/root.file_list
@@ -236,7 +236,10 @@ ruby:
/
# avoid update-alternatives
r /etc/alternatives
- e cd usr/bin ; for i in erb gem irb rake rdoc ri ruby testrb ; do [ -x $i ] || ln -snf ${i}2* $i ; done
+ r /usr/bin/rake*
+ r /usr/bin/rdoc*
+ r /usr/bin/ri*
+ e cd usr/bin ; for i in erb gem irb ruby testrb ; do [ -x $i ] || ln -snf ${i}2* $i ; done
yast2-devtools:
/usr/share/YaST2/data/devtools/bin/showy2log