Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2014-02-12 21:53:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes
2014-02-11 10:27:58.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2014-02-12 21:53:23.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 12 10:26:09 UTC 2014 - [email protected]
+
+- add ruby-ua.patch to fix build with ruby 2.1
+
+-------------------------------------------------------------------
+Tue Feb 11 15:39:00 CET 2014 - [email protected]
+
+- fix wrong ifarch s390x
+- set SLES boot theme temporarily to openSUSE as SLES branding is still missing
+- don't produce nonsense if the grub2 theme package is missing
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.38.tar.bz2
New:
----
installation-images-14.39.tar.bz2
ruby-ua.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.jnSIz9/_old 2014-02-12 21:53:24.000000000 +0100
+++ /var/tmp/diff_new_pack.jnSIz9/_new 2014-02-12 21:53:24.000000000 +0100
@@ -340,9 +340,10 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.38
+Version: 14.39
Release: 0
-Source: installation-images-14.38.tar.bz2
+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 @@
%prep
%setup -n installation-images-%{version}
+%patch0 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build
++++++ installation-images-14.38.tar.bz2 -> installation-images-14.39.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.38/VERSION
new/installation-images-14.39/VERSION
--- old/installation-images-14.38/VERSION 2014-02-10 16:59:25.000000000
+0100
+++ new/installation-images-14.39/VERSION 2014-02-11 15:38:55.000000000
+0100
@@ -1 +1 @@
-14.38
+14.39
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.38/changelog
new/installation-images-14.39/changelog
--- old/installation-images-14.38/changelog 2014-02-10 16:59:29.000000000
+0100
+++ new/installation-images-14.39/changelog 2014-02-11 15:38:59.000000000
+0100
@@ -1,4 +1,9 @@
-2014-02-10: HEAD
+2014-02-11: HEAD
+ - fix wrong ifarch s390x
+ - set SLES boot theme temporarily to openSUSE as SLES branding is still
missing
+ - don't produce nonsense if the grub2 theme package is missing
+
+2014-02-10: 14.38
- start sshd without using sysvinit script (bnc #863029)
- support setting OBS server via environment
- switch to grub for ppc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.38/data/boot/SLES-efi.diff
new/installation-images-14.39/data/boot/SLES-efi.diff
--- old/installation-images-14.38/data/boot/SLES-efi.diff 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.39/data/boot/SLES-efi.diff 2014-02-11
12:04:26.000000000 +0100
@@ -0,0 +1,13 @@
+--- grub2-efi/themes/SLES/theme.txt
++++ grub2-efi/themes/SLES/theme.txt
+@@ -2,7 +2,9 @@
+
+ desktop-image: "background.png"
+
+-title-text: ""
++title-text: "PRODUCT"
++title-color: "#fff"
++title-font: "DejaVu Sans Bold 14"
+
+ terminal-box: "terminal_*.png"
+ terminal-font: "Gnu Unifont Mono Regular 16"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.38/data/boot/openSUSE-efi.diff
new/installation-images-14.39/data/boot/openSUSE-efi.diff
--- old/installation-images-14.38/data/boot/openSUSE-efi.diff 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.39/data/boot/openSUSE-efi.diff 2014-02-11
11:59:37.000000000 +0100
@@ -5,7 +5,7 @@
desktop-image: "background.png"
-title-text: ""
-+title-text: "openSUSE 13.1"
++title-text: "PRODUCT"
+title-color: "#fff"
+title-font: "DejaVu Sans Bold 14"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.38/data/boot/theme.file_list
new/installation-images-14.39/data/boot/theme.file_list
--- old/installation-images-14.38/data/boot/theme.file_list 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.39/data/boot/theme.file_list 2014-02-11
12:04:08.000000000 +0100
@@ -26,13 +26,14 @@
# grub2-efi with graphics
# grub.cfg is patched in grub2-ef.file_list
if 1
+ d grub2-efi
?grub2-branding-<splash_theme>:
- d grub2-efi
m /usr/share/grub2/themes grub2-efi
- m /usr/share/grub2/backgrounds/<splash_theme>/default-43.png
grub2-efi/themes/openSUSE/background.png
+ m /usr/share/grub2/backgrounds/<splash_theme>/default-43.png
grub2-efi/themes/<splash_theme>/background.png
r
grub2-efi/themes/<splash_theme>/{activate-theme,COPYING.CC-BY-SA-3.0,README}
- R s/\r// grub2-efi/themes/openSUSE/theme.txt
- p openSUSE-efi.diff
+ R s/\r// grub2-efi/themes/<splash_theme>/theme.txt
+ p <splash_theme>-efi.diff
+ R s/PRODUCT/<product_name>/ grub2-efi/themes/<splash_theme>/theme.txt
grub2:
m /usr/share/grub2/unicode.pf2 grub2-efi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.38/data/root/root.file_list
new/installation-images-14.39/data/root/root.file_list
--- old/installation-images-14.38/data/root/root.file_list 2014-02-05
09:33:50.000000000 +0100
+++ new/installation-images-14.39/data/root/root.file_list 2014-02-11
15:34:47.000000000 +0100
@@ -421,89 +421,89 @@
/etc
/usr/<lib>/xorg/modules
- mkfontscale:
- mkfontdir:
- setxkbmap:
- xdpyinfo:
- xhost:
- xkbcomp:
- xmodmap:
- xrefresh:
- xset:
- xauth:
-
- xterm:
- /usr/share/X11/app-defaults/XTerm
- R s/nil2/fixed/ /usr/share/X11/app-defaults/XTerm
- /usr/bin/xterm
-
- gpm:
- /usr/sbin/gpm
-
- fontconfig:
- /
- r /etc/fonts/local.conf
- m /etc/fonts/local.conf.instsys /etc/fonts/local.conf
-
- xdm:
- /etc/X11/xdm/Keyboard.map
-
- rgb:
- /usr/share/X11/rgb.txt
-
- xorg-x11-fonts-core:
- # 'fixed' font
- /usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz
- /usr/share/fonts/misc/fonts.alias
- /usr/share/fonts/misc/cursor.pcf.gz
- /usr/share/fonts/misc/6x13.pcf.gz
- /usr/share/fonts/misc/olcursor.pcf.gz
-
- xorg-x11-fonts:
- m /usr/share/fonts/75dpi/helvB14-ISO8859-1.pcf.gz /usr/share/fonts/misc
-
- d /etc/X11
- x /etc/xorg.conf.template /etc/X11
- R s#usr/lib/xorg/modules#usr/<lib>/xorg/modules#
/etc/X11/xorg.conf.template
-
- xkeyboard-config:
- /usr/share
- /var/lib
-
- if arch eq 's390x'
- # these libs are needed for 32-Bit vnc
-
- glibc-32bit:
- /lib/ld*.so
- /lib/libc.so.6
- /lib/libdl.so.2
- /lib/libm.so.6
- endif
-
- if exists(xorg-x11-Xvnc)
- xorg-x11-Xvnc:
- /usr/bin/Xvnc
- endif
-
- Mesa-libEGL*:
-
- libgbm*:
- /usr/lib*/libgbm.so.*
-
- openslp-server:
- /etc/slp.reg
- /etc/slp.reg.d
- /usr/sbin/slpd
-
- fribidi:
- /usr/lib*/libfribidi.so*
-
- icewm-lite:
- /usr/bin/icewm-lite
- s /usr/bin/icewm-lite /usr/bin/icewm
+endif
+
+mkfontscale:
+mkfontdir:
+setxkbmap:
+xdpyinfo:
+xhost:
+xkbcomp:
+xmodmap:
+xrefresh:
+xset:
+xauth:
+
+xterm:
+ /usr/share/X11/app-defaults/XTerm
+ R s/nil2/fixed/ /usr/share/X11/app-defaults/XTerm
+ /usr/bin/xterm
+
+gpm:
+ /usr/sbin/gpm
+
+fontconfig:
+ /
+ r /etc/fonts/local.conf
+ m /etc/fonts/local.conf.instsys /etc/fonts/local.conf
+
+xdm:
+ /etc/X11/xdm/Keyboard.map
+
+rgb:
+ /usr/share/X11/rgb.txt
+
+xorg-x11-fonts-core:
+ # 'fixed' font
+ /usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz
+ /usr/share/fonts/misc/fonts.alias
+ /usr/share/fonts/misc/cursor.pcf.gz
+ /usr/share/fonts/misc/6x13.pcf.gz
+ /usr/share/fonts/misc/olcursor.pcf.gz
+
+xorg-x11-fonts:
+ m /usr/share/fonts/75dpi/helvB14-ISO8859-1.pcf.gz /usr/share/fonts/misc
+
+ d /etc/X11
+ x /etc/xorg.conf.template /etc/X11
+ R s#usr/lib/xorg/modules#usr/<lib>/xorg/modules# /etc/X11/xorg.conf.template
+
+xkeyboard-config:
+ /usr/share
+ /var/lib
+
+if arch eq 's390x'
+ # these libs are needed for 32-Bit vnc
+
+ glibc-32bit:
+ /lib/ld*.so
+ /lib/libc.so.6
+ /lib/libdl.so.2
+ /lib/libm.so.6
+endif
+if exists(xorg-x11-Xvnc)
+ xorg-x11-Xvnc:
+ /usr/bin/Xvnc
endif
+Mesa-libEGL*:
+
+libgbm*:
+ /usr/lib*/libgbm.so.*
+
+openslp-server:
+ /etc/slp.reg
+ /etc/slp.reg.d
+ /usr/sbin/slpd
+
+fribidi:
+ /usr/lib*/libfribidi.so*
+
+icewm-lite:
+ /usr/bin/icewm-lite
+ s /usr/bin/icewm-lite /usr/bin/icewm
+
# once qt5 port of libyui is in, remove
?libqt4:
/usr/lib*/libQtCore.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.38/etc/config
new/installation-images-14.39/etc/config
--- old/installation-images-14.38/etc/config 2014-02-05 09:33:50.000000000
+0100
+++ new/installation-images-14.39/etc/config 2014-02-11 12:08:17.000000000
+0100
@@ -77,7 +77,7 @@
[Theme SLES]
-splash = SLES
+splash = openSUSE
yast = SLE
product = SUSE Linux Enterprise Server 12
version = 13.2
++++++ ruby-ua.patch ++++++
commit 76e3127975534b5cf842ab36161e8658b5d8a869
Author: Stephan Kulow <[email protected]>
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
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
