- updated to current snapshot

Changed files:
    FvwmIconMan.patch -> 1.2
    fvwm2.spec -> 1.47

diff --git a/FvwmIconMan.patch b/FvwmIconMan.patch
index 177c2e1ab670bb51d30ec7f394891dd7a00c0387..fb3733c179309619dbc15ee9e37e4bb638ac7303 100644 (file)
--- a/FvwmIconMan.patch
+++ b/FvwmIconMan.patch
@@ -1,68 +1,58 @@
-# FvwmIconMan.patch
-# This patch adds one option to FvwmIconMan:
-# FvwmIconMan [id]: ShowOnlyIcons Never
-# If this option is set, FvwmIconMan doesn't display iconified windows
-# This patch was created by Grzegorz Niewêg³owski (\hoppke)
-# for FVWM - Crystal project
-
-# If you want to apply this patch, copy it to your FVWM source directory
-# and execute command below:
-# $ patch -p1 < FvwmIconMan.patch
-# Then recompile and reinstall your FVWM package
-
-diff -pruN fvwm/modules/FvwmIconMan/FvwmIconMan.1 fvwm-m/modules/FvwmIconMan/FvwmIconMan.1
---- fvwm/modules/FvwmIconMan/FvwmIconMan.1     2002-10-16 15:15:20.000000000 +0200
-+++ fvwm-m/modules/FvwmIconMan/FvwmIconMan.1   2003-03-13 15:57:55.000000000 +0100
-@@ -361,8 +361,10 @@ handled by this manager.
+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
-diff -pruN fvwm/modules/FvwmIconMan/FvwmIconMan.h fvwm-m/modules/FvwmIconMan/FvwmIconMan.h
---- fvwm/modules/FvwmIconMan/FvwmIconMan.h     2003-03-03 09:42:42.000000000 +0100
-+++ fvwm-m/modules/FvwmIconMan/FvwmIconMan.h   2003-03-13 15:52:53.000000000 +0100
-@@ -315,7 +315,7 @@ typedef struct win_manager {
-   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 */
+ 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 -pruN fvwm/modules/FvwmIconMan/readconfig.c fvwm-m/modules/FvwmIconMan/readconfig.c
---- fvwm/modules/FvwmIconMan/readconfig.c      2003-01-24 15:30:17.000000000 +0100
-+++ fvwm-m/modules/FvwmIconMan/readconfig.c    2003-03-13 15:52:54.000000000 +0100
-@@ -1466,11 +1466,14 @@ void read_in_resources (char *file)
-        ConsoleMessage ("Need argument to showonlyicons\n");
+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, "true")) {
 +       if (!strcasecmp (p, "false")) {
 +       i = 0;
 +       }
-+         else if (!strcasecmp (p, "true")) {
++       else if (!strcasecmp (p, "true")) {
         i = 1;
         }
--       else if (!strcasecmp (p, "false")) {
+-       else if (!strcasecmp(p, "false")) {
 -       i = 0;
 +       else if (!strcasecmp (p, "never")) {
 +       i = 2;
         }
         else {
-        ConsoleMessage ("Bad line: %s\n", current_line);
-diff -pruN fvwm/modules/FvwmIconMan/xmanager.c fvwm-m/modules/FvwmIconMan/xmanager.c
---- fvwm/modules/FvwmIconMan/xmanager.c        2003-03-03 09:42:42.000000000 +0100
-+++ fvwm-m/modules/FvwmIconMan/xmanager.c      2003-03-13 15:52:54.000000000 +0100
-@@ -1415,8 +1415,11 @@ void check_in_window (WinData *win)
+        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 =
@@ -73,6 +63,10 @@ diff -pruN fvwm/modules/FvwmIconMan/xmanager.c fvwm-m/modules/FvwmIconMan/xmanag
 +          ((win->iconified&&(win->manager->showonlyiconic==1))
 +              ))&&
 +               (win->manager->showtransient || !IS_TRANSIENT(win)));
-     in_viewport = win_in_viewport (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)

diff --git a/fvwm2.spec b/fvwm2.spec
index 45d77f78e5d33ef12fc90a7913ebff675760fd39..e5f1cc1694f655eee55db5dcf0c9274d61d364ea 100644 (file)
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -9,6 +9,7 @@
 # _without_xft         - without Xft (1 or 2) support
 #
 %include       /usr/lib/rpm/macros.perl
+%define snap   20031027
 Summary:       An improved version of the FVWM X-based window manager
 Summary(de):   F(?) Virtual Window Manager
 Summary(es):   Administrador de ventanas semejante al mwm
@@ -19,12 +20,12 @@ Summary(pl):        Ulepszona wersja zarz
 Summary(pt_BR):        Gerenciador de janelas semelhante ao mwm
 Summary(ru):   ÷ÉÒÔÕÁÌØÎÙÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ F(?)
 Name:          fvwm2
-Version:       2.5.6
-Release:       1
+Version:       2.5.8
+Release:       0.%{snap}.1
 License:       GPL
 Group:         X11/Window Managers
-Source0:       ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
-# Source0-md5: 2966bd304449604ce5fb21f2cfbb3a80
+Source0:       ftp://ftp.fvwm.org/pub/fvwm/devel/snapshots/fvwm-snap-%{snap}.tar.gz
+# Source0-md5: d6260e16e46f778db3d36743f43d1515
 Source1:       fvwm-2.0.46.icons.tar.gz
 # Source1-md5: 8d81420cf49442fca4bb2b61ae54eeb9
 Source2:       %{name}.desktop
@@ -127,7 +128,7 @@ fvwm-perllib, FvwmPerl and dependent modules.
 fvwm-perllib, FvwmPerl i zale¿ne modu³y.
 
 %prep
-%setup -n fvwm-%{version} -q -a1 -a3
+%setup -n fvwm-snap-%{snap} -q -a1 -a3
 %patch0 -p1
 %patch1 -p1
 
@@ -214,7 +215,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/[!Ff]*.1*
 %{_mandir}/man1/Fvwm[!DGPW]*.1*
 %{_mandir}/man1/FvwmD[!e]*.1*
-%{_mandir}/man1/FvwmGtk.1*
 %{_mandir}/man1/FvwmP[!e]*.1*
 %{_mandir}/man1/FvwmW[!i]*.1*
 %{_mandir}/man1/FvwmWinList.1*