Hello community, here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at 2019-05-10 09:13:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-theme (Old) and /work/SRC/openSUSE:Factory/.yast2-theme.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-theme" Fri May 10 09:13:10 2019 rev:166 rq:701795 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme.changes 2019-04-12 09:12:02.901605488 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-theme.new.5148/yast2-theme.changes 2019-05-10 09:13:12.671619638 +0200 @@ -1,0 +2,8 @@ +Thu May 2 13:46:02 UTC 2019 - [email protected] + +- on SLE the qt branding files are included in yast2-them so they + conflict with the separate package that exists on openSUSE + (boo#1133415) +- 4.2.1 + +------------------------------------------------------------------- Old: ---- yast2-theme-4.2.0.tar.bz2 New: ---- yast2-theme-4.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.jF9KJH/_old 2019-05-10 09:13:13.803622870 +0200 +++ /var/tmp/diff_new_pack.jF9KJH/_new 2019-05-10 09:13:13.803622870 +0200 @@ -17,7 +17,7 @@ Name: yast2-theme -Version: 4.2.0 +Version: 4.2.1 Release: 0 Source0: %{name}-%{version}.tar.bz2 @@ -39,6 +39,12 @@ %if 0%{?is_opensuse} # bsc#1105792: firstboot wizard missing branding Requires: yast2-qt-branding +%else +# on SLE the qt branding files are included in yast2-them so they +# conflict with the separate package that exists on openSUSE +# (boo#1133415) +Obsoletes: yast2-qt-branding-openSUSE +Conflicts: yast2-qt-branding-openSUSE %endif Provides: yast2-branding = %{version} @@ -114,8 +120,10 @@ %else mv %{buildroot}%{yast_themedir}/SLE %{buildroot}%{yast_themedir}/current cp theme/SLE/wmconfig/* %{buildroot}/etc/icewm/ -# SLE doesn't have oxygen5-icon-theme -rm -rf %{buildroot}%{yast_icondir}/oxygen %{buildroot}%{yast_icondir}/breeze +# SLE doesn't have those icon themes: +rm -rf %{buildroot}%{yast_icondir}/oxygen +rm -rf %{buildroot}%{yast_icondir}/breeze +rm -rf %{buildroot}%{yast_icondir}/breeze-dark %endif # We only need current theme ++++++ yast2-theme-4.2.0.tar.bz2 -> yast2-theme-4.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-theme-4.2.0/package/yast2-theme.changes new/yast2-theme-4.2.1/package/yast2-theme.changes --- old/yast2-theme-4.2.0/package/yast2-theme.changes 2019-04-09 15:44:32.000000000 +0200 +++ new/yast2-theme-4.2.1/package/yast2-theme.changes 2019-05-09 14:54:48.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu May 2 13:46:02 UTC 2019 - [email protected] + +- on SLE the qt branding files are included in yast2-them so they + conflict with the separate package that exists on openSUSE + (boo#1133415) +- 4.2.1 + +------------------------------------------------------------------- Mon Mar 25 13:49:42 UTC 2019 - [email protected] - use yast2-qt-branding as requirement to allow alternative branding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-theme-4.2.0/package/yast2-theme.spec new/yast2-theme-4.2.1/package/yast2-theme.spec --- old/yast2-theme-4.2.0/package/yast2-theme.spec 2019-04-09 15:44:32.000000000 +0200 +++ new/yast2-theme-4.2.1/package/yast2-theme.spec 2019-05-09 14:54:48.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-theme -Version: 4.2.0 +Version: 4.2.1 Release: 0 Source0: %{name}-%{version}.tar.bz2 @@ -38,6 +38,12 @@ %if 0%{?is_opensuse} # bsc#1105792: firstboot wizard missing branding Requires: yast2-qt-branding +%else +# on SLE the qt branding files are included in yast2-them so they +# conflict with the separate package that exists on openSUSE +# (boo#1133415) +Obsoletes: yast2-qt-branding-openSUSE +Conflicts: yast2-qt-branding-openSUSE %endif Provides: yast2-branding = %{version} @@ -113,8 +119,10 @@ %else mv %{buildroot}%{yast_themedir}/SLE %{buildroot}%{yast_themedir}/current cp theme/SLE/wmconfig/* %{buildroot}/etc/icewm/ -# SLE doesn't have oxygen5-icon-theme -rm -rf %{buildroot}%{yast_icondir}/oxygen %{buildroot}%{yast_icondir}/breeze +# SLE doesn't have those icon themes: +rm -rf %{buildroot}%{yast_icondir}/oxygen +rm -rf %{buildroot}%{yast_icondir}/breeze +rm -rf %{buildroot}%{yast_icondir}/breeze-dark %endif # We only need current theme
