+++ /dev/null
-diff -uNr fvwm-snap-20031025-org/modules/FvwmIconMan/FvwmIconMan.1 fvwm-snap-20031025/modules/FvwmIconMan/FvwmIconMan.1
---- fvwm-snap-20031025-org/modules/FvwmIconMan/FvwmIconMan.1 Sat Apr 19 13:30:03 2003
-+++ fvwm-snap-20031025/modules/FvwmIconMan/FvwmIconMan.1 Sat Oct 25 17:00:44 2003
-@@ -361,9 +361,11 @@
- .IP "*FvwmIconMan: [id] ShowTransient \fIboolean\fP"
- Show transient windows in the list (default false).
-
--.IP "*FvwmIconMan: [id] ShowOnlyIcons \fIboolean\fP"
--Only iconified windows are shown if \fIboolean\fP is true.
--
-+.IP "*FvwmIconMan: [id] ShowOnlyIcons \fIvalue\fP"
-+If set to "false" both normal and iconified windows are shown. If "true" then
-+only iconified windows will get displayed, and "never" means that no iconified
-+windows will be shown.
-+
- .SH ACTIONS
- Actions are commands which may be bound to an event of the type: a key press, a
- mouse click, or the mouse entering a window manager button - denoted by the
-diff -uNr fvwm-snap-20031025-org/modules/FvwmIconMan/FvwmIconMan.h fvwm-snap-20031025/modules/FvwmIconMan/FvwmIconMan.h
---- fvwm-snap-20031025-org/modules/FvwmIconMan/FvwmIconMan.h Tue Oct 21 07:52:36 2003
-+++ fvwm-snap-20031025/modules/FvwmIconMan/FvwmIconMan.h Sat Oct 25 17:01:33 2003
-@@ -300,7 +300,7 @@
- WeightedSort *weighted_sorts;
- int weighted_sorts_len, weighted_sorts_size;
- char *AnimCommand;
-- Uchar showonlyiconic;
-+ int showonlyiconic;
- Uchar showtransient;
- rectangle managed_g; /* dimensions of managed screen portion */
-
-diff -uNr fvwm-snap-20031025-org/modules/FvwmIconMan/readconfig.c fvwm-snap-20031025/modules/FvwmIconMan/readconfig.c
---- fvwm-snap-20031025-org/modules/FvwmIconMan/readconfig.c Sat Jul 5 13:30:03 2003
-+++ fvwm-snap-20031025/modules/FvwmIconMan/readconfig.c Sat Oct 25 17:16:56 2003
-@@ -1497,11 +1497,14 @@
- ConsoleMessage("Need argument to showonlyicons\n");
- continue;
- }
-- if (!strcasecmp(p, "true")) {
-+ if (!strcasecmp (p, "false")) {
-+ i = 0;
-+ }
-+ else if (!strcasecmp (p, "true")) {
- i = 1;
- }
-- else if (!strcasecmp(p, "false")) {
-- i = 0;
-+ else if (!strcasecmp (p, "never")) {
-+ i = 2;
- }
- else {
- ConsoleMessage("Bad line: %s\n", current_line);
-diff -uNr fvwm-snap-20031025-org/modules/FvwmIconMan/xmanager.c fvwm-snap-20031025/modules/FvwmIconMan/xmanager.c
---- fvwm-snap-20031025-org/modules/FvwmIconMan/xmanager.c Tue Oct 21 07:52:36 2003
-+++ fvwm-snap-20031025/modules/FvwmIconMan/xmanager.c Sat Oct 25 17:30:57 2003
-@@ -1476,11 +1476,15 @@
-
- if (win->manager && win->complete) {
- is_state_selected =
-- ((!win->manager->showonlyiconic || win->iconified) &&
-- (win->manager->showtransient || !IS_TRANSIENT(win)));
-+ (((!win->iconified&&(win->manager->showonlyiconic==2))||
-+ (win->manager->showonlyiconic==0)||
-+ ((win->iconified&&(win->manager->showonlyiconic==1))
-+ ))&&
-+ (win->manager->showtransient || !IS_TRANSIENT(win)));
- in_viewport = win_in_viewport(win);
- if (win->manager->usewinlist && DO_SKIP_WINDOW_LIST(win))
- in_viewport = 0;
-+ in_viewport = win_in_viewport(win);
- if (win->button == NULL && in_viewport && is_state_selected) {
- insert_windows_button(win);
- if (win->manager->window_up == 0 && globals.got_window_list)
-# This patch was created by anonymous user
-# After applying, when you click on a miniature window
-# in a pager with left mouse button, it will become focused
-# and will raise to the top
-# Clickong on miniature desktop doesn'd do anything.
-
-diff -urN fvwm/modules/FvwmPager/x_pager.c fvwm.patched/modules/FvwmPager/x_pager.c
---- fvwm/modules/FvwmPager/x_pager.c 2003-06-29 21:53:00.000000000 +0200
-+++ fvwm.patched/modules/FvwmPager/x_pager.c 2003-08-27 19:48:29.000000000 +0200
-@@ -1080,6 +1080,29 @@
+diff -urN fvwm-2.5.12.vanilla/modules/FvwmPager/x_pager.c fvwm-2.5.12/modules/FvwmPager/x_pager.c
+--- fvwm-2.5.12.vanilla/modules/FvwmPager/x_pager.c 2004-09-27 12:32:20.000000000 +0200
++++ fvwm-2.5.12/modules/FvwmPager/x_pager.c 2005-02-21 21:47:10.254445160 +0100
+@@ -1078,6 +1078,29 @@
else if((Event->xbutton.button == 1)||
(Event->xbutton.button == 2))
{
---- fvwm-2.5.10/configure.in~ Sat Jul 24 00:59:21 2004
-+++ fvwm-2.5.10/configure.in Sat Jul 24 00:59:21 2004
-@@ -779,7 +779,7 @@
+diff -urN fvwm-2.5.12.vanilla/configure.in fvwm-2.5.12/configure.in
+--- fvwm-2.5.12.vanilla/configure.in 2005-02-21 21:46:48.924687776 +0100
++++ fvwm-2.5.12/configure.in 2005-02-21 21:48:37.672155648 +0100
+@@ -794,7 +794,7 @@
AC_SUBST(FVWM_PERLLIB)
dnl ******* gettext
--ALL_LINGUAS="ar de fr sv_SE"
-+ALL_LINGUAS="ar de fr sv"
+-ALL_LINGUAS="ar de fr sv_SE zh_CN"
++ALL_LINGUAS="ar de fr sv zh"
FVWM_DOMAIN="fvwm"
FVWMTASKBAR_DOMAIN="FvwmTaskBar"
FVWMSCRIPT_DOMAIN="FvwmScript"
---- fvwm-2.5.5/configure.in.orig Tue Jul 3 09:58:15 2001
-+++ fvwm-2.5.5/configure.in Mon Aug 20 03:34:00 2001
-@@ -5,7 +5,7 @@
+diff -urN fvwm-2.5.12.vanilla/configure.in fvwm-2.5.12/configure.in
+--- fvwm-2.5.12.vanilla/configure.in 2004-10-06 02:42:02.000000000 +0200
++++ fvwm-2.5.12/configure.in 2005-02-21 21:46:00.825000040 +0100
+@@ -72,7 +72,7 @@
AM_CONFIG_HEADER(config.h)
dnl installation paths
FVWM_DATASUBDIR=/${PACKAGE}
AC_ARG_ENABLE(package-subdirs,
-@@ -13,8 +13,8 @@
+@@ -80,8 +80,8 @@
[if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR="";
fi], [])
Summary(pt_BR): Gerenciador de janelas semelhante ao mwm
Summary(ru): ÷ÉÒÔÕÁÌØÎÙÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ F(?)
Name: fvwm2
-Version: 2.5.10
-Release: 4
+Version: 2.5.12
+Release: 1
License: GPL
Group: X11/Window Managers
Source0: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
-# Source0-md5: b3c86e2af2a4eabe692c9c849ff4b243
+# Source0-md5: f323c59c2becb6766648b25b2111501c
Source1: fvwm-2.0.46.icons.tar.gz
# Source1-md5: 8d81420cf49442fca4bb2b61ae54eeb9
Source2: %{name}.desktop
Source5: mozilla.xpm
Source6: %{name}-xsession.desktop
Patch0: %{name}-paths.patch
-Patch1: FvwmIconMan.patch
-Patch2: FvwmPager.patch
-Patch3: %{name}-locale_names.patch
-Patch4: %{name}-varia.patch
+Patch1: FvwmPager.patch
+Patch2: %{name}-locale_names.patch
+Patch3: %{name}-varia.patch
URL: http://www.fvwm.org/
%{?with_xft:BuildRequires: xft-devel}
BuildRequires: autoconf
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
mv -f po/FvwmScript.sv{_SE,}.po
mv -f po/FvwmTaskBar.sv{_SE,}.po