diff --git a/installation-images-14.39.tar.bz2 b/installation-images-14.39.tar.bz2 deleted file mode 100644 index 0205516..0000000 --- a/installation-images-14.39.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85216afbb03e06f0c9da17132c1097bc0e5fa2af5ece0574933661b98f107d5e -size 184393 diff --git a/installation-images-14.40.tar.bz2 b/installation-images-14.40.tar.bz2 new file mode 100644 index 0000000..ac208b1 --- /dev/null +++ b/installation-images-14.40.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db00083d6a82328103450bef7b0e8ad0206a2df1078ec18522be0d6e81fa22f8 +size 184652 diff --git a/installation-images-SLES.changes b/installation-images-SLES.changes index 6b2aba2..998c920 100644 --- a/installation-images-SLES.changes +++ b/installation-images-SLES.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Feb 17 14:39:20 CET 2014 - snwint@suse.de + +- avoid using rcnscd (bnc #863430) +- Fix branding image installation for ppc64le +- switch back to yaboot for a while +- fix ssl certificates (bnc #863788) +- ignore rake, rdoc and ri from ruby + +------------------------------------------------------------------- +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 diff --git a/installation-images-SLES.spec b/installation-images-SLES.spec index 548164a..e066391 100644 --- a/installation-images-SLES.spec +++ b/installation-images-SLES.spec @@ -340,10 +340,9 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.39 +Version: 14.40 Release: 0 -Source: installation-images-14.39.tar.bz2 -Patch0: ruby-ua.patch +Source: installation-images-14.40.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -379,7 +378,6 @@ 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 diff --git a/installation-images-openSUSE.changes b/installation-images-openSUSE.changes index ae991fa..998c920 100644 --- a/installation-images-openSUSE.changes +++ b/installation-images-openSUSE.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 17 14:39:20 CET 2014 - snwint@suse.de + +- avoid using rcnscd (bnc #863430) +- Fix branding image installation for ppc64le +- switch back to yaboot for a while +- fix ssl certificates (bnc #863788) +- ignore rake, rdoc and ri from ruby + ------------------------------------------------------------------- Wed Feb 12 10:26:09 UTC 2014 - coolo@suse.com diff --git a/installation-images-openSUSE.spec b/installation-images-openSUSE.spec index d288bdb..3865733 100644 --- a/installation-images-openSUSE.spec +++ b/installation-images-openSUSE.spec @@ -340,10 +340,9 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.39 +Version: 14.40 Release: 0 -Source: installation-images-14.39.tar.bz2 -Patch0: ruby-ua.patch +Source: installation-images-14.40.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -379,7 +378,6 @@ 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 diff --git a/ruby-ua.patch b/ruby-ua.patch deleted file mode 100644 index 9115816..0000000 --- a/ruby-ua.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 76e3127975534b5cf842ab36161e8658b5d8a869 -Author: Stephan Kulow -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