Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package icewm-theme-branding for
openSUSE:Factory checked in at 2022-03-01 17:03:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icewm-theme-branding (Old)
and /work/SRC/openSUSE:Factory/.icewm-theme-branding.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icewm-theme-branding"
Tue Mar 1 17:03:05 2022 rev:12 rq:957988 version:1.2.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/icewm-theme-branding/icewm-theme-branding.changes
2020-12-12 20:27:20.457538260 +0100
+++
/work/SRC/openSUSE:Factory/.icewm-theme-branding.new.1958/icewm-theme-branding.changes
2022-03-01 17:03:11.680327502 +0100
@@ -1,0 +2,15 @@
+Mon Feb 28 09:24:08 UTC 2022 - Yifan Jiang <yfji...@suse.com>
+
+- Add pass-env-var-to-systemd-user-session.patch instead of changing
+ the tar ball to fix the bsc#1179237.
+- Update the tar ball to sync with upstream.
+
+-------------------------------------------------------------------
+Wed Feb 23 12:49:39 UTC 2022 - Yifan Jiang <yfji...@suse.com>
+
+- Add fix-font-configuration.patch:
+
+ Fix font configuration after google-droid-fonts update
+ (boo#1195328 bsc#1196336)
+
+-------------------------------------------------------------------
New:
----
fix-font-configuration.patch
pass-env-var-to-systemd-user-session.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icewm-theme-branding.spec ++++++
--- /var/tmp/diff_new_pack.4y31PQ/_old 2022-03-01 17:03:12.260327655 +0100
+++ /var/tmp/diff_new_pack.4y31PQ/_new 2022-03-01 17:03:12.264327657 +0100
@@ -1,7 +1,7 @@
#
# spec file for package icewm-theme-branding
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -44,9 +44,13 @@
Version: 1.2.5
Release: 0
Summary: Icewm theme branding
-License: LGPL-2.1-or-later AND GPL-3.0-or-later
+License: GPL-3.0-or-later AND LGPL-2.1-or-later
URL: https://github.com/openSUSE/icewm-config-openSUSE
Source:
https://github.com/openSUSE/%{_name}/archive/%{_name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM pass-env-var-to-systemd-user-session.patch bsc#1179237
yfji...@suse.com -- Pass environment variables to the 'systemd --user' session
+Patch0: pass-env-var-to-systemd-user-session.patch
+# PATCH-FIX-UPSTREAM fix-font-configuration.patch boo#1195328 bsc#1196336
yfji...@suse.com -- Fix font configuration after google-droid-fonts update
+Patch1: fix-font-configuration.patch
Requires: icewm
Conflicts: icewm < 1.3.11
Conflicts: otherproviders(icewm-configuration-files)
@@ -63,6 +67,8 @@
%prep
%setup -q -n %{_name}-%{_name}-%{version}
+%patch0 -p1
+%patch1 -p1
%build
%if 0%{?build_openSUSE}
++++++ fix-font-configuration.patch ++++++
>From 266d837988d3489c00ca5e4178a0a49077b438a2 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fv...@suse.de>
Date: Mon, 31 Jan 2022 12:12:11 +0100
Subject: [PATCH] Fix font configuration (boo#1195328)
Droid Sans Fallback is only meant to be used as fallback, it does not provide
many common glyphs.
---
themes/zpaker/default.theme | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/themes/zpaker/default.theme b/themes/zpaker/default.theme
index 59b2aa4..490afed 100644
--- a/themes/zpaker/default.theme
+++ b/themes/zpaker/default.theme
@@ -82,23 +82,23 @@ ColorClockText="black"
#DesktopBackgroundScaled=1 # 0 / 1
#DesktopBackgroundImage="6_10.jpg"
-TitleFontNameXft="Droid Sans Fallback:size=10:bold"
-MenuFontNameXft="Droid Sans Fallback:size=10"
-StatusFontNameXft="Droid Sans Fallback:size=10"
-QuickSwitchFontNameXft="Droid Sans Fallback:size=10"
-NormalButtonFontNameXft="Droid Sans Fallback:size=10"
-ActiveButtonFontNameXft="Droid Sans Fallback:size=10"
-NormalTaskBarFontNameXft="Droid Sans Fallback:size=10"
-ActiveTaskBarFontNameXft="Droid Sans Fallback:size=10:bold"
-ToolButtonFontNameXft="Droid Sans Fallback:size=10"
-NormalWorkspaceFontNameXft="Droid Sans Fallback:size=10"
-ActiveWorkspaceFontNameXft="Droid Sans Fallback:size=10"
-MinimizedWindowFontNameXft="Droid Sans Fallback:size=10"
-ListBoxFontNameXft="Droid Sans Fallback:size=10"
-ToolTipFontNameXft="Droid Sans Fallback:size=10"
-ClockFontNameXft="Droid Sans Fallback:size=10:bold"
-ApmFontNameXft="Droid Sans Fallback:size=10:bold"
-InputFontNameXft="Droid Sans Fallback:size=10"
-LabelFontNameXft="Droid Sans Fallback:size=10"
+TitleFontNameXft="Droid Sans:size=10:bold, Droid Sans Fallback:size=10:bold"
+MenuFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+StatusFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+QuickSwitchFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+NormalButtonFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+ActiveButtonFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+NormalTaskBarFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+ActiveTaskBarFontNameXft="Droid Sans:size=10:bold, Droid Sans
Fallback:size=10:bold"
+ToolButtonFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+NormalWorkspaceFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+ActiveWorkspaceFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+MinimizedWindowFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+ListBoxFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+ToolTipFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+ClockFontNameXft="Droid Sans:size=10:bold, Droid Sans Fallback:size=10:bold"
+ApmFontNameXft="Droid Sans:size=10:bold, Droid Sans Fallback:size=10:bold"
+InputFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
+LabelFontNameXft="Droid Sans:size=10, Droid Sans Fallback:size=10"
TaskBarClockLeds=0
++++++ 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.5/startup
new/icewm-config-openSUSE-icewm-config-openSUSE-1.2.5/startup
--- old/icewm-config-openSUSE-icewm-config-openSUSE-1.2.5/startup
2020-12-10 04:20:37.730678307 +0100
+++ new/icewm-config-openSUSE-icewm-config-openSUSE-1.2.5/startup
2020-09-23 09:20:18.000000000 +0200
@@ -14,8 +14,3 @@
# Start xscreensaver daemon
[ -x /usr/bin/xscreensaver ] && /usr/bin/xscreensaver > /dev/null &
-
-# Pass environment variables to systemd --user session (to fix bsc#1179237)
-if command -v dbus-update-activation-environment >/dev/null 2>&1; then
- dbus-update-activation-environment --systemd --all
-fi
++++++ pass-env-var-to-systemd-user-session.patch ++++++
Index: icewm-config-openSUSE-icewm-config-openSUSE-1.2.5/startup
===================================================================
--- icewm-config-openSUSE-icewm-config-openSUSE-1.2.5.orig/startup
+++ icewm-config-openSUSE-icewm-config-openSUSE-1.2.5/startup
@@ -14,3 +14,8 @@ done;
# Start xscreensaver daemon
[ -x /usr/bin/xscreensaver ] && /usr/bin/xscreensaver > /dev/null &
+
+# Pass environment variables to systemd --user session (to fix bsc#1179237)
+if command -v dbus-update-activation-environment >/dev/null 2>&1; then
+ dbus-update-activation-environment --systemd --all
+fi
