Accepting request 353662 from home:czerw:branches:X11:windowmanagers

- Version bump to 1.3.12:
  * various bugfixes collected from all upstream vendors
  * added new translations
- Removed upstreamed patches:
  * icewm-toolbar-icons-generic.patch
  * icewm-fix-local-search.patch

OBS-URL: https://build.opensuse.org/request/show/353662
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=52
This commit is contained in:
Tomáš Chvátal 2016-01-17 08:36:01 +00:00 committed by Git OBS Bridge
parent 53cf204a29
commit ef0dd657c9
6 changed files with 16 additions and 37 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8e697e92e1697109522eb286eaa282bee10dcdb747b18bbb26d7d21a3d99588
size 930484

3
1.3.12.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7e0fe0fb07e297fa40f0c9d149c0cf6da19e13b98178fc779dca9ed81b3b232
size 944617

View File

@ -1,13 +0,0 @@
--- a/src/fdomenu.cc
+++ b/src/fdomenu.cc
@@ -378,7 +378,9 @@ int main(int argc, const char **argv)
opt_g_free(pmdir);
}
// user's stuff might replace the system links
- proc_dir(usershare);
+ gchar *usershare_full = g_strjoin(NULL, usershare, "/applications", NULL);
+ proc_dir(usershare_full);
+ opt_g_free(usershare_full);
dump_menu();

View File

@ -1,11 +0,0 @@
--- a/lib/toolbar.in
+++ b/lib/toolbar.in
@@ -4,6 +4,6 @@
# since modifications to this file will be discarded when you
# (re)install icewm.
#
-prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
-prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
+prog xterm utilities-terminal xterm
+prog "Web browser" web-browser xdg-open about:blank

View File

@ -1,4 +1,13 @@
-------------------------------------------------------------------
Thu Jan 14 09:26:54 UTC 2016 - petr@cervinka.net
- Version bump to 1.3.12:
* various bugfixes collected from all upstream vendors
* added new translations
- Removed upstreamed patches:
* icewm-toolbar-icons-generic.patch
* icewm-fix-local-search.patch
-------------------------------------------------------------------
Mon Oct 26 10:51:29 UTC 2015 - tchvatal@suse.com
- Split out configuration files to allow icewm-theme-branding to

View File

@ -1,7 +1,7 @@
#
# spec file for package icewm
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%global lites icewm icewmhint icewmbg icesh icewm-session
Name: icewm
Version: 1.3.11
Version: 1.3.12
Release: 0
Summary: Window Manager with a Taskbar
License: LGPL-2.1+
@ -26,12 +26,8 @@ Group: System/GUI/Other
Url: http://www.icewm.org/
Source0: https://github.com/bbidulock/icewm/archive/%{version}.tar.gz
Source1: icewm.desktop
# PATCH-FIX-UPSTREAM icewm-fix-local-search.patch sor.alexei@meowr.ru -- Make icewm-menu-fdo not to search through whole ~/.local/share/.
Patch0: icewm-fix-local-search.patch
# PATCH-FIX-OPENSUSE icewm-toolbar-icons-generic.patch sor.alexei@meowr.ru -- Don't specify paths in toolbar icons.
Patch1: icewm-toolbar-icons-generic.patch
# PATCH-FIX-OPENSUSE icewm-mate.patch sor.alexei@meowr.ru -- Add MATE Menus support.
Patch2: icewm-mate.patch
Patch0: icewm-mate.patch
Patch99: icewm-preferences.patch
BuildRequires: autoconf
BuildRequires: automake
@ -126,10 +122,8 @@ mailbox status, and a digital clock. It is fast and small.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
# Do not require needlessly new gettext.
sed -i 's/0.19.5/0.18.3/g' configure.ac
sed -i 's/0.19.6/0.18.3/g' configure.ac
%build
autoreconf -fi