Hello community,
here is the log from the commit of package icewm-theme-branding for
openSUSE:Factory checked in at 2020-09-29 18:59:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icewm-theme-branding (Old)
and /work/SRC/openSUSE:Factory/.icewm-theme-branding.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icewm-theme-branding"
Tue Sep 29 18:59:07 2020 rev:9 rq:837284 version:1.2.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/icewm-theme-branding/icewm-theme-branding.changes
2020-03-19 19:48:41.036128163 +0100
+++
/work/SRC/openSUSE:Factory/.icewm-theme-branding.new.4249/icewm-theme-branding.changes
2020-09-29 18:59:09.817581084 +0200
@@ -1,0 +2,32 @@
+Thu Sep 24 02:29:01 UTC 2020 - Yifan Jiang <[email protected]>
+
+- Improve spec:
+ * Conditionally define icewm_version to the version number used
+ in Leap/SLE 15 code stream and Tumbleweed.
+
+-------------------------------------------------------------------
+Wed Sep 23 07:35:16 UTC 2020 - Yifan Jiang <[email protected]>
+
+- Version update to 1.2.5
+ * Update the format of SLE backgound image to png (bsc#1176835).
+ * Drop upstreamed add-adwaita-legacy-iconpath-to-preference.patch.
+- Update spec
+ * Keep the format of Leap background image to jpg.
+
+-------------------------------------------------------------------
+Tue Aug 4 12:29:27 UTC 2020 - Marcus Meissner <[email protected]>
+
+- fixed obsoletion of icemwm-upstream-config (bsc#1173441 bsc#1170420)
+
+-------------------------------------------------------------------
+Thu Jun 11 09:42:26 UTC 2020 - Yifan Jiang <[email protected]>
+
+- Improve spec:
+ * Make a more explict summary since this package is not used by
+ openSUSE Tumbleweed.
+ * Introduce %{icewm_version} to make the provided capability had a
+ consistent version number with icewm-config-upstream.
+ * Explicitly obsoletes icewm-config-upstream to fix the "zypper
+ dup" issue on Leap (bsc#1170420).
+
+-------------------------------------------------------------------
@@ -4 +36,2 @@
-- Improve build tag consistency between SLE and Leap.
+- Improve build tag consistency between SLE and Leap
+ (jsc#SLE-11888, bsc#1170420).
@@ -11 +44,3 @@
-- Add the adwaita legacy path to the IconPath in
+- Add add-adwaita-legacy-iconpath-to-preference.patch:
+
+ Add the adwaita legacy path to the IconPath in
@@ -17 +51,0 @@
- * add-adwaita-legacy-iconpath-to-preference.patch
@@ -50,0 +85,6 @@
+
+-------------------------------------------------------------------
+Mon Apr 11 06:47:11 UTC 2016 - [email protected]
+
+- Copy package from openSUSE to SLE;
+ Allow icewm to have several brandings.(fate#319667)
Old:
----
add-adwaita-legacy-iconpath-to-preference.patch
icewm-config-openSUSE-1.2.4.tar.gz
New:
----
icewm-config-openSUSE-1.2.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icewm-theme-branding.spec ++++++
--- /var/tmp/diff_new_pack.y43klg/_old 2020-09-29 18:59:10.265581629 +0200
+++ /var/tmp/diff_new_pack.y43klg/_new 2020-09-29 18:59:10.269581634 +0200
@@ -17,6 +17,11 @@
%define _name icewm-config-openSUSE
+%if 0%{?suse_version} == 1500
+%define icewm_version 1.4.2
+%else
+%define icewm_version 1.6.5
+%endif
%define flavor @BUILD_FLAVOR@
%if "%{flavor}" == ""
@@ -36,18 +41,17 @@
%endif
Name: icewm-theme-branding
-Version: 1.2.4
+Version: 1.2.5
Release: 0
-Summary: Icewm theme branding for SLES or openSUSE
+Summary: Icewm theme branding
License: LGPL-2.1-or-later AND GPL-3.0-or-later
URL: https://github.com/openSUSE/icewm-config-openSUSE
Source:
https://github.com/openSUSE/%{_name}/archive/%{_name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM add-adwaita-legacy-iconpath-to-preference.patch
bsc#1157930 gh#openSUSE/icewm-config-openSUSE!8 [email protected] -- Add the
adwaita legacy path to the IconPath
-Patch0: add-adwaita-legacy-iconpath-to-preference.patch
Requires: icewm
Conflicts: icewm < 1.3.11
-Conflicts: icewm-configuration-files
-Provides: icewm-configuration-files = %{version}
+Conflicts: otherproviders(icewm-configuration-files)
+Provides: icewm-configuration-files = %{icewm_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -56,11 +60,11 @@
%prep
%setup -q -n %{_name}-%{_name}-%{version}
-%patch0 -p1
%build
%if 0%{?build_openSUSE}
sed -i -e 's:SLEdefault:openSUSEdefault:g' preferences
+sed -i -e 's:1920x1080.png:1920x1080.jpg:g' preferences
%endif
%install
++++++ icewm-config-openSUSE-1.2.4.tar.gz -> icewm-config-openSUSE-1.2.5.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icewm-config-openSUSE-icewm-config-openSUSE-1.2.4/preferences
new/icewm-config-openSUSE-icewm-config-openSUSE-1.2.5/preferences
--- old/icewm-config-openSUSE-icewm-config-openSUSE-1.2.4/preferences
2018-03-16 10:28:37.000000000 +0100
+++ new/icewm-config-openSUSE-icewm-config-openSUSE-1.2.5/preferences
2020-09-23 09:20:18.000000000 +0200
@@ -539,7 +539,7 @@
# NetWorkAreaBehaviour=0 # [0-2]
# Icon search path (colon separated)
-IconPath="/usr/share/icons/Adwaita/16x16/apps:/usr/share/icons/hicolor/16x16/apps:/usr/share/pixmaps"
+IconPath="/usr/share/icons/Adwaita/16x16/legacy:/usr/share/icons/Adwaita/16x16/apps:/usr/share/icons/hicolor/16x16/apps:/usr/share/pixmaps"
# Mailbox path (use $MAIL instead)
# MailBoxPath=""
@@ -1349,7 +1349,7 @@
# DesktopBackgroundColor="rgb:00/20/40"
# Desktop background image
-DesktopBackgroundImage="/usr/share/wallpapers/SLEdefault/contents/images/1920x1080.jpg"
+DesktopBackgroundImage="/usr/share/wallpapers/SLEdefault/contents/images/1920x1080.png"
# Color to announce for semi-transparent windows
# DesktopTransparencyColor=""
