Hello community, here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at 2017-09-25 13:50:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-theme (Old) and /work/SRC/openSUSE:Factory/.yast2-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-theme" Mon Sep 25 13:50:44 2017 rev:153 rq:528309 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme.changes 2017-08-29 11:34:04.800743914 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme.changes 2017-09-25 13:50:47.087701544 +0200 @@ -1,0 +2,6 @@ +Fri Sep 22 14:17:01 UTC 2017 - [email protected] + +- fix packaging for SLE (bsc#1057838) +- 4.0.0 + +------------------------------------------------------------------- Old: ---- yast2-theme-3.3.0.tar.bz2 New: ---- yast2-theme-4.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.908LQE/_old 2017-09-25 13:50:48.055565367 +0200 +++ /var/tmp/diff_new_pack.908LQE/_new 2017-09-25 13:50:48.059564804 +0200 @@ -19,7 +19,7 @@ # YaST Oxygen icons maintained by Martin Schlander <martin.schlander () gmail ! com> Name: yast2-theme -Version: 3.3.0 +Version: 4.0.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,6 +66,7 @@ Group: System/YaST Supplements: packageand(yast2:plasma5-session) PreReq: /bin/ln +Conflicts: yast2-theme-SLE Requires: yast2-branding-openSUSE = %{version} Provides: yast2-theme-openSUSE-Oxygen = %{version} Obsoletes: yast2-theme-openSUSE-Oxygen < %{version} @@ -85,7 +86,7 @@ Provides: yast2_theme = %{version} Obsoletes: yast2-theme-NLD <= 0.4.5 Conflicts: yast2-theme-openSUSE -Conflicts: yast2-theme-openSUSE-any +Conflicts: yast2-theme-openSUSE-Oxygen PreReq: /bin/ln %description SLE @@ -127,10 +128,12 @@ rm -rf "$RPM_BUILD_ROOT/%{yast_docdir}" rm -rf "$RPM_BUILD_ROOT/%{_docdir}/yast2-theme" -mv $RPM_BUILD_ROOT/usr/share/icons/hicolor $RPM_BUILD_ROOT/usr/share/YaST2/theme/SLE/icons/ +mv $RPM_BUILD_ROOT%{yast_themedir}/SLE $RPM_BUILD_ROOT%{yast_themedir}/current + +mv $RPM_BUILD_ROOT/usr/share/icons/hicolor $RPM_BUILD_ROOT/usr/share/YaST2/theme/current/icons/ # remove all icons that were not part of RC2 to avoid information leak -pushd $RPM_BUILD_ROOT/usr/share/YaST2/theme/SLE/icons/ +pushd $RPM_BUILD_ROOT/usr/share/YaST2/theme/current/icons/ rm -rf 256x256 rm 16x16/apps/pattern-enlightenment.png rm 16x16/apps/pattern-lxde.png @@ -283,11 +286,11 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps for dir in 22x22 32x32 48x48 64x64; do - cd $RPM_BUILD_ROOT/%{yast_themedir}/SLE/icons/$dir/apps + cd $RPM_BUILD_ROOT/%{yast_themedir}/current/icons/$dir/apps icons=$(ls *.png) cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/$dir/apps for icon in $icons; do - [ -e $icon ] || ln -s %{yast_themedir}/SLE/icons/$dir/apps/$icon . + [ -e $icon ] || ln -s %{yast_themedir}/current/icons/$dir/apps/$icon . done done @@ -330,10 +333,17 @@ /usr/share/doc/packages/yast2-theme/yast2-branding-openSUSE-Oxygen.txt %else + +%pre SLE +# used to be a symlink, we need to remove it so rpm can update to the directory +if test -L %{yast_themedir}/current ; then + rm %{yast_themedir}/current +fi + %files SLE %defattr(-,root,root) %dir %{yast_themedir} -%{yast_themedir}/SLE +%{yast_themedir}/current /usr/share/icons/hicolor/*/apps/* %config %{_sysconfdir}/icewm %endif ++++++ yast2-theme-3.3.0.tar.bz2 -> yast2-theme-4.0.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-3.3.0.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-4.0.0.tar.bz2 differ: char 11, line 1
