Hello community, here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at 2014-09-03 12:50:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-theme (Old) and /work/SRC/openSUSE:Factory/.yast2-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-theme" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-SLE.changes 2014-08-11 10:09:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-SLE.changes 2014-09-03 12:50:36.000000000 +0200 @@ -1,0 +2,19 @@ +Fri Aug 29 13:30:36 UTC 2014 - [email protected] + +- move the icons in git to simplify openSUSE setup, but move them + back while %install for SLE +- 3.1.29 + +------------------------------------------------------------------- +Mon Aug 18 17:20:12 CEST 2014 - [email protected] + +- Added icons for Advanced Systems Management pattern (bnc#888702) +- 3.1.28 + +------------------------------------------------------------------- +Mon Aug 18 17:07:10 CEST 2014 - [email protected] + +- Modified icons for Public Cloud pattern (bnc#890589) +- 3.1.27 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme.changes 2014-07-30 07:34:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme.changes 2014-09-03 12:50:36.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Aug 31 08:19:50 UTC 2014 - [email protected] + +- libyui looks for icons only in theme/current/icons, so we need + to provide a symlink +- 3.1.30 + +------------------------------------------------------------------- +Thu Aug 28 10:45:49 UTC 2014 - [email protected] + +- restore the hicolor icons and install the KDE icons in their correct place +- the KDE menus will pick up oxygen, yast will stick to consistent hicolor + theme (bnc#893426) +- 3.1.29 + +------------------------------------------------------------------- +Thu Aug 7 12:42:03 UTC 2014 - [email protected] + +- no longer package yast2-theme-openSUSE, but fix the whole branding + for openSUSE and let it build yast2-branding-openSUSE replacing the old + one - fixing BNC#876555 +- 3.1.26 + +------------------------------------------------------------------- Old: ---- yast2-theme-3.1.25.tar.bz2 New: ---- yast2-theme-3.1.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme-SLE.spec ++++++ --- /var/tmp/diff_new_pack.IgkRCf/_old 2014-09-03 12:50:38.000000000 +0200 +++ /var/tmp/diff_new_pack.IgkRCf/_new 2014-09-03 12:50:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-theme-SLE -Version: 3.1.25 +Version: 3.1.30 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,7 +60,154 @@ rm -rf $RPM_BUILD_ROOT/%{yast_themedir}/openSUSE* rm -rf "$RPM_BUILD_ROOT/%{yast_docdir}" rm -rf "$RPM_BUILD_ROOT/%{_docdir}/yast2-theme" -# ghost file (not packed in RPM but listed) + +mv $RPM_BUILD_ROOT/usr/share/icons/hicolor $RPM_BUILD_ROOT/usr/share/YaST2/theme/SLE/icons/ + +# remove all icons that were not part of RC2 to avoid information leak +pushd $RPM_BUILD_ROOT/usr/share/YaST2/theme/SLE/icons/ +rm -rf 256x256 +rm 16x16/apps/pattern-e17.png +rm 16x16/apps/pattern-lxde.png +rm 16x16/apps/yast-gray-dot.png +rm 16x16/apps/yast-green-dot.png +rm 16x16/apps/yast-red-dot.png +rm 16x16/apps/yast-yellow-dot.png +rm 22x22/apps/pattern-e17.png +rm 22x22/apps/pattern-lxde.png +rm 22x22/apps/yast-gray-dot.png +rm 22x22/apps/yast-green-dot.png +rm 22x22/apps/yast-red-dot.png +rm 22x22/apps/yast-yellow-dot.png +rm 32x32/apps/pattern-e17.png +rm 32x32/apps/pattern-lxde.png +rm 48x48/apps/pattern-e17.png +rm 48x48/apps/pattern-lxde.png +rm 48x48/apps/yast-gray-dot.png +rm 48x48/apps/yast-green-dot.png +rm 48x48/apps/yast-red-dot.png +rm 48x48/apps/yast-yellow-dot.png +rm 64x64/apps/apparmor_app_armor.png +rm 64x64/apps/bootdisk_create.png +rm 64x64/apps/defaultgroup.png +rm 64x64/apps/gnome.png +rm 64x64/apps/kde.png +rm 64x64/apps/keyboardlayout.png +rm 64x64/apps/ktip.png +rm 64x64/apps/msg_error.png +rm 64x64/apps/msg_info.png +rm 64x64/apps/msg_warning.png +rm 64x64/apps/pattern-e17.png +rm 64x64/apps/pattern-lxde.png +rm 64x64/apps/pixie.png +rm 64x64/apps/printer2.png +rm 64x64/apps/route.png +rm 64x64/apps/samba_setup.png +rm 64x64/apps/SuSEmenu.png +rm 64x64/apps/system.png +rm 64x64/apps/tdsl.png +rm 64x64/apps/user_add.png +rm 64x64/apps/user_system.png +rm 64x64/apps/www.png +rm 64x64/apps/yast-addon.png +rm 64x64/apps/yast-autoyast.png +rm 64x64/apps/yast-backup.png +rm 64x64/apps/yast-bluetooth.png +rm 64x64/apps/yast-bootloader.png +rm 64x64/apps/yast-ca_mgm.png +rm 64x64/apps/yast-cd-creator.png +rm 64x64/apps/yast-cd_update.png +rm 64x64/apps/yast-checkmedia.png +rm 64x64/apps/yast-common_cert.png +rm 64x64/apps/yast-controller.png +rm 64x64/apps/yast-create-new-vm.png +rm 64x64/apps/yast-dasd.png +rm 64x64/apps/yast-dhcp-server.png +rm 64x64/apps/yast-disk.png +rm 64x64/apps/yast-dns.png +rm 64x64/apps/yast-dns-server.png +rm 64x64/apps/yast-dsl.png +rm 64x64/apps/yast-firewall.png +rm 64x64/apps/yast-ftp.png +rm 64x64/apps/yast-hardware.png +rm 64x64/apps/yast-heartbeat.png +rm 64x64/apps/yast-high_availability.png +rm 64x64/apps/yast-host.png +rm 64x64/apps/yast-http-server.png +rm 64x64/apps/yast-hwinfo.png +rm 64x64/apps/yast-inetd.png +rm 64x64/apps/yast-inst-mode.png +rm 64x64/apps/yast-instserver.png +rm 64x64/apps/yast-iscsi-client.png +rm 64x64/apps/yast-iscsi-server.png +rm 64x64/apps/yast-isdn.png +rm 64x64/apps/yast-isns.png +rm 64x64/apps/yast-joystick.png +rm 64x64/apps/yast-kdump.png +rm 64x64/apps/yast-kerberos.png +rm 64x64/apps/yast-keyboard.png +rm 64x64/apps/yast-kiwi.png +rm 64x64/apps/yast-lan.png +rm 64x64/apps/yast-ldap-browser.png +rm 64x64/apps/yast-ldap.png +rm 64x64/apps/yast-ldap-server.png +rm 64x64/apps/yast-license.png +rm 64x64/apps/yast-live-install.png +rm 64x64/apps/yast-lvm_config.png +rm 64x64/apps/yast-mail.png +rm 64x64/apps/yast-mail-server.png +rm 64x64/apps/yast-messages.png +rm 64x64/apps/yast-misc.png +rm 64x64/apps/yast-mouse.png +rm 64x64/apps/yast-network_devices.png +rm 64x64/apps/yast-network.png +rm 64x64/apps/yast-network_services.png +rm 64x64/apps/yast-nfs.png +rm 64x64/apps/yast-nfs_server.png +rm 64x64/apps/yast-nis.png +rm 64x64/apps/yast-nis_server.png +rm 64x64/apps/yast-ntp-client.png +rm 64x64/apps/yast-online_update.png +rm 64x64/apps/yast-powertweak.png +rm 64x64/apps/yast-printer.png +rm 64x64/apps/yast-product-registration.png +rm 64x64/apps/yast-proxy.png +rm 64x64/apps/yast-release-notes.png +rm 64x64/apps/yast-remote.png +rm 64x64/apps/yast-restore.png +rm 64x64/apps/yast-routing.png +rm 64x64/apps/yast-samba-client.png +rm 64x64/apps/yast-samba-server.png +rm 64x64/apps/yast-scanner.png +rm 64x64/apps/yast-security.png +rm 64x64/apps/yast-slp-server.png +rm 64x64/apps/yast-software.png +rm 64x64/apps/yast-sound.png +rm 64x64/apps/yast_source.png +rm 64x64/apps/yast-ssh-server.png +rm 64x64/apps/yast-sudoers.png +rm 64x64/apps/yast-support.png +rm 64x64/apps/yast-sw_single.png +rm 64x64/apps/yast-sw_source.png +rm 64x64/apps/yast-sysconfig.png +rm 64x64/apps/yast-system.png +rm 64x64/apps/yast-tftp-server.png +rm 64x64/apps/yast-timezone.png +rm 64x64/apps/yast-tv.png +rm 64x64/apps/yast-uml.png +rm 64x64/apps/yast-update.png +rm 64x64/apps/yast-vdisk.png +rm 64x64/apps/yast-vendor.png +rm 64x64/apps/yast-virtualisation.png +rm 64x64/apps/yast-vm-domain0-setup.png +rm 64x64/apps/yast-vm-install.png +rm 64x64/apps/yast-vm-management.png +rm 64x64/apps/yast-wol.png +rm 64x64/apps/yast-x11.png +rm 64x64/apps/yast-yast-language.png +rm 64x64/apps/yast-zfcp.png + +popd + # # make icons available to GNOME control center (hicolor theme) # (bug #166008) @@ -78,7 +225,11 @@ done done +# remove KDE icons - they are incomplete and only interesting for openSUSE +rm -rf $RPM_BUILD_ROOT/usr/share/icons/{crystal,oxygen} + %fdupes $RPM_BUILD_ROOT%{yast_themedir} +%fdupes $RPM_BUILD_ROOT/usr/share/icons %files %defattr(-,root,root) ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.IgkRCf/_old 2014-09-03 12:50:38.000000000 +0200 +++ /var/tmp/diff_new_pack.IgkRCf/_new 2014-09-03 12:50:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-theme -Version: 3.1.25 +Version: 3.1.30 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,19 +37,23 @@ %description Contains the SuSE Linux theme for YaST2. -%package openSUSE +%package -n yast2-branding-openSUSE Summary: YaST2 - Theme (openSUSE) Group: System/YaST +Provides: yast2-branding = %{version} Provides: yast2_theme = %{version} +Conflicts: otherproviders(yast2-branding) +Supplements: packageand(yast2:branding-openSUSE) Conflicts: yast2-theme-SLE PreReq: /bin/ln Requires: hicolor-icon-theme Obsoletes: yast2-theme-openSUSE-Crystal < %{version} -Provides: yast2-theme-openSUSE-Crystal = %{version} -Obsoletes: yast2-theme-openSUSE-Oxygen < %{version} Provides: yast2-theme-openSUSE-Oxygen = %{version} +Obsoletes: yast2-theme-openSUSE < %{version} +Obsoletes: yast2-theme-openSUSE-Oxygen < %{version} +Provides: yast2-theme-openSUSE = %{version} -%description openSUSE +%description -n yast2-branding-openSUSE This package contains the openSUSE theme for YaST2. %prep @@ -61,41 +65,29 @@ %install %yast_install +rm -rf $RPM_BUILD_ROOT/%{yast_themedir}/SLE +mv $RPM_BUILD_ROOT%{yast_themedir}/openSUSE $RPM_BUILD_ROOT%{yast_themedir}/current + +# let's take hicolor icons for yast +ln -s /usr/share/icons/hicolor $RPM_BUILD_ROOT%{yast_themedir}/current/icons + # install opensuse icewm style mkdir -p $RPM_BUILD_ROOT/etc/icewm/ cp openSUSE/wmconfig/* $RPM_BUILD_ROOT/etc/icewm/ -rm -rf $RPM_BUILD_ROOT/%{yast_themedir}/SLE - cp -R "$RPM_BUILD_ROOT/%{yast_docdir}" "$RPM_BUILD_ROOT/%{yast_docdir}-openSUSE" rm -rf "$RPM_BUILD_ROOT/%{yast_docdir}" # ghost file (not packed in RPM but listed) -# -# make icons available to GNOME control center (hicolor theme) -# (bug #166008) -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps - -for dir in 22x22 32x32 48x48 64x64 256x256; do - cd $RPM_BUILD_ROOT/%{yast_themedir}/openSUSE/icons/$dir/apps - icons=$(ls *.png) - cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/$dir/apps - for icon in $icons; do - ln -s %{yast_themedir}/openSUSE/icons/$dir/apps/$icon . - done -done %fdupes $RPM_BUILD_ROOT%{yast_themedir} +%fdupes $RPM_BUILD_ROOT/usr/share/icons -%files openSUSE +%files -n yast2-branding-openSUSE %defattr(-,root,root) %dir %{yast_themedir} -%{yast_themedir}/openSUSE +%{yast_themedir}/current %config %{_sysconfdir}/icewm -/usr/share/icons/hicolor/*/apps/* +/usr/share/icons/* %doc %{yast_docdir}-openSUSE %changelog ++++++ yast2-theme-3.1.25.tar.bz2 -> yast2-theme-3.1.30.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-3.1.25.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-3.1.30.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
