Hello community,
here is the log from the commit of package icewm for openSUSE:Factory checked in at 2017-11-10 14:36:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icewm (Old)
and /work/SRC/openSUSE:Factory/.icewm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icewm"
Fri Nov 10 14:36:06 2017 rev:52 rq:533028 version:1.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/icewm/icewm.changes 2017-06-16 10:52:33.658270141 +0200
+++ /work/SRC/openSUSE:Factory/.icewm.new/icewm.changes 2017-11-10 14:36:09.454153289 +0100
@@ -1,0 +2,34 @@
+Tue Oct 10 14:02:45 UTC 2017 - tchvatal@suse.com
+
+- Bring back full icewm-preferences.patch from 1.3 series to actually
+ work
+
+-------------------------------------------------------------------
+Tue Oct 10 13:36:06 UTC 2017 - tchvatal@suse.com
+
+- Use prefoverride instead of preferences in the sysconfig to make
+ sure take priority over theme
+- Move programs config option to /etc from /usr/share
+
+-------------------------------------------------------------------
+Thu Oct 5 17:39:23 UTC 2017 - stefan.bruens@rwth-aachen.de
+
+- Partially revert icewm-preferences.patch to previous revision, otherwise
+ the icewm default desktop background is used instead of the openSUSE/SLE
+ specific one, breaking openQA all over the place
+
+-------------------------------------------------------------------
+Sun Sep 24 21:41:00 UTC 2017 - aavindraa@gmail.com
+
+- Update to 1.4.2
+- Rebase patches
+ - icewm-susemenu.patch: rebase "suseprog" function
+ - icewm-preferences.patch: rebase, only IconPath hunk not in upstream now
+ - icewm-mate.patch: rebase several hunks in which context changed
+- Drop patches that were accepted upstream
+ - icewm-session-desktop.patch
+ - icewm-exit-fork.patch
+ - icewm-mail.patch
+- Swap "sgmltool" for "asciidoc"
+
+-------------------------------------------------------------------
Old:
----
1.3.12.tar.gz
icewm-exit-fork.patch
icewm-mail.patch
icewm-session-desktop.patch
New:
----
icewm-1.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icewm.spec ++++++
--- /var/tmp/diff_new_pack.lk4n8Y/_old 2017-11-10 14:36:10.966098651 +0100
+++ /var/tmp/diff_new_pack.lk4n8Y/_new 2017-11-10 14:36:10.970098507 +0100
@@ -18,34 +18,27 @@
%global lites icewm icewmhint icewmbg icesh icewm-session
Name: icewm
-Version: 1.3.12
+Version: 1.4.2
Release: 0
Summary: Window Manager with a Taskbar
License: LGPL-2.1+
Group: System/GUI/Other
Url: http://www.icewm.org/
-Source0: https://github.com/bbidulock/icewm/archive/%{version}.tar.gz
+Source0: https://github.com/bbidulock/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
Source1: icewm.desktop
# PATCH-FIX-OPENSUSE icewm-mate.patch sor.alexei@meowr.ru -- Add MATE Menus support.
Patch0: icewm-mate.patch
# PATCH-FEATURE-SUSE icewm-susemenu.patch tyang@suse.com -- Add xdg-menu for SLED icewm
Patch1: icewm-susemenu.patch
-# PATCH-FIX-UPSTREAM tweak the desktop session files to work correctly
-Patch2: icewm-session-desktop.patch
-# PATCH-FIX-OPENSUSE run shutdown and reboot in background
-Patch3: icewm-exit-fork.patch
-# Fix for bsc#1026134, replace alpine by an alternative being available by
-# default on SLE/openSUSE, same as done on Debian
-Patch4: icewm-mail.patch
Patch99: icewm-preferences.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libtool
+BuildRequires: pkgconfig
# Needed for documentation.
-BuildRequires: pkg-config
-BuildRequires: sgmltool
+BuildRequires: asciidoc
BuildRequires: update-alternatives
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(alsa)
@@ -65,11 +58,6 @@
Requires: icewm-bin
Requires: icewm-configuration-files
Requires: xdg-menu
-%if 0%{?suse_version} > 1315
-Requires: xterm-bin
-%else
-Requires: xterm
-%endif
Requires(post): update-alternatives
Requires(postun): update-alternatives
# If you have the choice, prefer the big one.
@@ -80,6 +68,11 @@
Provides: icewm-gnome = %{version}
Obsoletes: icewm-gnome < %{version}
Provides: windowmanager
+%if 0%{?suse_version} > 1315
+Requires: xterm-bin
+%else
+Requires: xterm
+%endif
%description
A window manager for the X Window System that can emulate the look
@@ -140,9 +133,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
# Do not require needlessly new gettext.
sed -i 's/0.19.6/0.18.3/g' configure.ac
@@ -194,7 +184,7 @@
wallpaper="SLEdefault"
%endif
sed -i \
- -e "s:BRANDING_PICTURE:/usr/share/wallpapers/$wallpaper/contents/images/1920x1080.jpg:" \
+ -e "s:BRANDING_PICTURE:%{_datadir}/wallpapers/$wallpaper/contents/images/1920x1080.jpg:" \
src/preferences
%install
@@ -204,10 +194,13 @@
rm -f %{buildroot}%{_bindir}/icewm-set-{gnomewm,matewm}
mkdir -p %{buildroot}%{_sysconfdir}/icewm/
-for cfgfile in keys menu preferences toolbar winoptions ; do
+for cfgfile in keys menu preferences toolbar winoptions programs; do
mv -f %{buildroot}%{_datadir}/icewm/$cfgfile \
%{buildroot}%{_sysconfdir}/icewm/
done
+# move preferences to prefoverride to take preference over themes
+mv %{buildroot}/%{_sysconfdir}/icewm/preferences \
+ %{buildroot}/%{_sysconfdir}/icewm/prefoverride
%find_lang icewm
ln -sf icewm.html %{buildroot}/%{_docdir}/icewm/index.html
@@ -267,7 +260,6 @@
fi
%files
-%defattr(-,root,root)
%doc %{_docdir}/icewm
%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
%{_datadir}/icewm/
@@ -277,15 +269,12 @@
%{_mandir}/man1/icewm.1%{?ext_man}
%files config-upstream
-%defattr(-,root,root)
%dir %{_sysconfdir}/icewm/
%config %{_sysconfdir}/icewm/*
%files lang -f icewm.lang
-%defattr(-,root,root)
%files default
-%defattr(-,root,root)
%ghost %{_sysconfdir}/alternatives/icewm
%ghost %{_sysconfdir}/alternatives/icewmhint
%ghost %{_sysconfdir}/alternatives/icewmbg
@@ -308,7 +297,6 @@
%{_datadir}/applications/icewm.desktop
%files lite
-%defattr(-,root,root)
%ghost %{_sysconfdir}/alternatives/icewm
%ghost %{_sysconfdir}/alternatives/icewmhint
%ghost %{_sysconfdir}/alternatives/icewmbg
++++++ icewm-mate.patch ++++++
--- /var/tmp/diff_new_pack.lk4n8Y/_old 2017-11-10 14:36:11.006097206 +0100
+++ /var/tmp/diff_new_pack.lk4n8Y/_new 2017-11-10 14:36:11.006097206 +0100
@@ -66,8 +66,8 @@
+gsettings get org.mate.session.required-components windowmanager
--- a/Makefile.am
+++ b/Makefile.am
-@@ -36,8 +36,12 @@ dist_noinst_SCRIPTS = \
- autogen.sh
+@@ -106,5 +106,8 @@ icewm.lsm: icewm.lsm.in
+ sed -r -e 's:%%PACKAGE%%:$(PACKAGE):g;s:%%VERSION%%:$(VERSION):g;s:%%DATE%%:$(DATE):g' $< >$@
dist_bin_SCRIPTS = \
+ icewm-set-matewm \
@@ -75,13 +75,9 @@
+desktopdir = $(datadir)/applications
+desktop_DATA = icewm.desktop
-+
- ChangeLog:
- ( \
- echo -e "# created with git log -n 200 --abbrev-commit --decorate --stat=76 -M -C|fmt -sct -w80\n" ; \
--- a/src/gnome2.cc
+++ b/src/gnome2.cc
-@@ -22,12 +22,17 @@
+@@ -25,10 +25,16 @@ char const * ApplicationName = "icewm-menu-gnome2";
#include