Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2014-01-15 19:35:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2014-01-13 10:53:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2014-01-15 19:35:44.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Jan 15 10:56:16 CET 2014 - snwint@suse.de + +- better update-alternatives alternative +- added wicked +- removed tightvnc +- fix the previous ruby update fix +- don't list libstroke +- prepare for ruby updates +- adapt to wicked and libqt5 changes +- icewm is using update-alternatives now +- removed icewm.patch + +------------------------------------------------------------------- +Wed Jan 15 05:56:43 UTC 2014 - coolo@suse.com + +- extend icewm.patch with more changes in git + +------------------------------------------------------------------- Old: ---- icewm.patch installation-images-14.25.tar.bz2 New: ---- installation-images-14.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.jUxwAF/_old 2014-01-15 19:35:45.000000000 +0100 +++ /var/tmp/diff_new_pack.jUxwAF/_new 2014-01-15 19:35:45.000000000 +0100 @@ -73,7 +73,6 @@ BuildRequires: fbiterm BuildRequires: finger BuildRequires: fonts-config -BuildRequires: fvwm2 BuildRequires: gdb BuildRequires: gettext-runtime-mini BuildRequires: glibc-i18ndata @@ -215,6 +214,7 @@ BuildRequires: valgrind BuildRequires: vim BuildRequires: wget +BuildRequires: wicked BuildRequires: wireless-tools BuildRequires: wpa_supplicant BuildRequires: xauth @@ -389,10 +389,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 14.25 +Version: 14.26 Release: 0 -Source: installation-images-14.25.tar.bz2 -Patch0: icewm.patch +Source: installation-images-14.26.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -465,7 +464,6 @@ %prep %setup -%patch0 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build ++++++ installation-images-14.25.tar.bz2 -> installation-images-14.26.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.25/VERSION new/installation-images-14.26/VERSION --- old/installation-images-14.25/VERSION 2014-01-08 13:43:11.000000000 +0100 +++ new/installation-images-14.26/VERSION 2014-01-15 10:56:07.000000000 +0100 @@ -1 +1 @@ -14.25 +14.26 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.25/changelog new/installation-images-14.26/changelog --- old/installation-images-14.25/changelog 2014-01-08 13:43:14.000000000 +0100 +++ new/installation-images-14.26/changelog 2014-01-15 10:56:11.000000000 +0100 @@ -1,4 +1,17 @@ -2014-01-08: HEAD +2014-01-15: HEAD + - Merge branch 'master' of github.com:openSUSE/installation-images + - Conflicts: + data/root/root.file_list + - better update-alternatives alternative + - added wicked + - removed tightvnc + - fix the previous ruby update fix + - don't list libstroke + - prepare for ruby updates + - adapt to wicked and libqt5 changes + - icewm is using update-alternatives now + +2014-01-08: 14.25 - add sysconfig to inst-sys - add 'upgrade' boot entry - special motd for s390x (bnc #795003) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.25/data/initrd/initrd.file_list new/installation-images-14.26/data/initrd/initrd.file_list --- old/installation-images-14.25/data/initrd/initrd.file_list 2013-11-28 13:18:31.000000000 +0100 +++ new/installation-images-14.26/data/initrd/initrd.file_list 2014-01-15 10:52:21.000000000 +0100 @@ -111,6 +111,7 @@ nfsidmap: pcmciautils: sed: +?wicked: linuxrc: if linuxrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.25/data/rescue/rescue.file_list new/installation-images-14.26/data/rescue/rescue.file_list --- old/installation-images-14.25/data/rescue/rescue.file_list 2013-12-02 13:41:16.000000000 +0100 +++ new/installation-images-14.26/data/rescue/rescue.file_list 2014-01-15 10:53:34.000000000 +0100 @@ -19,7 +19,7 @@ r /usr/bin/ld s ld.bfd /usr/bin/ld -TEMPLATE lvm2|device-mapper|rpcbind|rsync|syslog-service|syslogd|util-linux|sysconfig-network|dmraid|mdadm|multipath-tools: +TEMPLATE lvm2|device-mapper|rpcbind|rsync|syslog-service|syslogd|util-linux|wicked|dmraid|mdadm|multipath-tools: / E postin @@ -146,6 +146,7 @@ usbutils: vim: wget: +?wicked: xfsdump: xfsprogs: xz: @@ -278,7 +279,7 @@ syslog-service: syslogd: util-linux: -sysconfig-network: +wicked: dmraid: mdadm: multipath-tools: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.25/data/root/root.file_list new/installation-images-14.26/data/root/root.file_list --- old/installation-images-14.25/data/root/root.file_list 2014-01-08 10:21:25.000000000 +0100 +++ new/installation-images-14.26/data/root/root.file_list 2014-01-15 10:54:36.000000000 +0100 @@ -57,7 +57,6 @@ sessreg: ignore shared-mime-info: ignore update-alternatives: ignore -update-alternatives: ignore xinetd: ignore xrdb: ignore yast2-ldap-client: ignore @@ -274,14 +273,7 @@ /etc/gemrc /etc/rpm # update-alternatives - s erb2.0 /usr/bin/erb - s gem2.0 /usr/bin/gem - s irb2.0 /usr/bin/irb - s rake2.0 /usr/bin/rake - s rdoc2.0 /usr/bin/rdoc - s ri2.0 /usr/bin/ri - s ruby2.0 /usr/bin/ruby - s testrb2.0 /usr/bin/testrb + e cd usr/bin ; for i in erb gem irb rake rdoc ri ruby testrb ; do ln -s ${i}2* $i; done yast2-devtools: /usr/share/YaST2/data/devtools/bin/showy2log @@ -464,9 +456,8 @@ ?virtualbox-guest-x11: nodeps /etc - /usr/lib*/xorg/modules + /usr/<lib>/xorg/modules - libstroke: mkfontscale: mkfontdir: setxkbmap: @@ -529,10 +520,6 @@ if exists(xorg-x11-Xvnc) xorg-x11-Xvnc: /usr/bin/Xvnc - - tightvnc: - /usr/bin/vncpasswd.arg - /usr/share/vnc/classes endif Mesa-libEGL*: @@ -549,15 +536,17 @@ /usr/lib*/libfribidi.so* icewm-lite: - /usr/bin/icewm + /usr/bin/icewm-lite + s /usr/bin/icewm-lite /usr/bin/icewm endif -libqt4: +# once qt5 port of libyui is in, remove +?libqt4: /usr/lib*/libQtCore.so.* /usr/share/qt4/translations/qt_*.qm -libqt4-x11: +?libqt4-x11: /usr/lib*/libQtGui.so.* /usr/lib*/qt4/plugins/imageformats/libqjpeg.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org