Hello community, here is the log from the commit of package fvwm2 checked in at Fri Jun 2 01:50:59 CEST 2006. -------- --- fvwm2/cdesim.changes 2006-01-25 21:36:04.000000000 +0100 +++ fvwm2/cdesim.changes 2006-06-01 15:44:12.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 30 15:03:29 CEST 2006 - pnemec@suse.cz + +- updated to 2.5.16 + clean up in code see changelog +- patches (-64bit, -grab_pointer, -conf) are in upstream now +- patch -ia64 is in upstream only partially + +------------------------------------------------------------------- fvwm2.changes: same change Old: ---- fvwm-2.5.12-64bit.patch fvwm-2.5.12-conf.patch fvwm-2.5.12-config.patch fvwm-2.5.12-gcc-warnings.patch fvwm-2.5.12-grab_pointer.patch fvwm-2.5.12-ia64.patch fvwm-2.5.12.tar.bz2 New: ---- fvwm-2.5.16-gcc-warnings.patch fvwm-2.5.16-ia64.patch fvwm-2.5.16.tar.bz2 fvwm-configure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdesim.spec ++++++ --- /var/tmp/diff_new_pack.pbsvnH/_old 2006-06-02 01:50:34.000000000 +0200 +++ /var/tmp/diff_new_pack.pbsvnH/_new 2006-06-02 01:50:34.000000000 +0200 @@ -18,19 +18,17 @@ Requires: fvwm2 Autoreqprov: on Version: 0.42 -Release: 1258 -%define fvwmver 2.5.12 +Release: 1270 +%define fvwmver 2.5.16 Summary: CDE Simulator Source: cdesim-%{version}.tar.bz2 Source1: fvwm-%{fvwmver}.tar.bz2 Source2: CDEBanner.tar.bz2 Source3: %name.desktop Patch0: cdesim-%{version}.patch -Patch1: fvwm-%{fvwmver}-config.patch +Patch1: fvwm-configure.patch +Patch2: fvwm-%{fvwmver}-gcc-warnings.patch Patch3: fvwm-%{fvwmver}-ia64.patch -Patch4: fvwm-%{fvwmver}-conf.patch -Patch5: fvwm-%{fvwmver}-grab_pointer.patch -Patch6: fvwm-%{fvwmver}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,10 +60,10 @@ ln -sf fvwm-%{fvwmver} fvwm cd fvwm-%{fvwmver} %patch1 +%patch2 %patch3 -%patch4 -%patch5 -%patch6 +# +# build %build cd fvwm @@ -116,6 +114,11 @@ %changelog -n cdesim +* Tue May 30 2006 - pnemec@suse.cz +- updated to 2.5.16 + clean up in code see changelog +- patches (-64bit, -grab_pointer, -conf) are in upstream now +- patch -ia64 is in upstream only partially * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Jan 04 2006 - lmichnovic@suse.cz ++++++ fvwm2.spec ++++++ --- /var/tmp/diff_new_pack.pbsvnH/_old 2006-06-02 01:50:34.000000000 +0200 +++ /var/tmp/diff_new_pack.pbsvnH/_new 2006-06-02 01:50:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package fvwm2 (Version 2.5.12) +# spec file for package fvwm2 (Version 2.5.16) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,22 +17,19 @@ Provides: fvwmicns windowmanager xpmroot Obsoletes: fvwm xpmroot Autoreqprov: on -Version: 2.5.12 -Release: 7 +Version: 2.5.16 +Release: 1 Summary: Improved Version of FVWM Window Manager URL: http://www.fvwm.org Source0: fvwm-%{version}.tar.bz2 Source1: fvwm_icons.tar.bz2 Source3: %name.desktop Source4: system.fvwm2rc -Patch0: fvwm-%{version}-config.patch -Patch2: fvwm-%{version}-ia64.patch -Patch3: fvwm-%{version}-conf.patch -Patch4: fvwm-%{version}-grab_pointer.patch -Patch6: fvwm-%{version}-64bit.patch -Patch7: fvwm-%{version}-gcc-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: xdg-menu, desktop-data, mktemp, xli +Patch0: fvwm-configure.patch +Patch1: fvwm-%{version}-gcc-warnings.patch +Patch2: fvwm-%{version}-ia64.patch %description FVWM is a virtual desktop window manager for the X Window System. @@ -50,14 +47,12 @@ %prep %setup -q -n fvwm-%{version} %patch0 +%patch1 %patch2 -%patch3 -%patch4 -%patch6 -%patch7 -# mkdir icons tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2 +# +# build %build %{?suse_update_config:%{suse_update_config -f}} @@ -96,11 +91,6 @@ # icons install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fvwm2/pixmaps install -m 644 icons/* $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fvwm2/pixmaps -# -# Remove xpmroot, it conflicts with the xpmroot package -# xpmroot does not exist any longer -#rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/xpmroot -#rm -f $RPM_BUILD_ROOT/usr/X11R6/man/man?/xpmroot.* # install kdm/gdm entry install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/ install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/xsessions/ @@ -124,6 +114,11 @@ /usr/share/xsessions %changelog -n fvwm2 +* Tue May 30 2006 - pnemec@suse.cz +- updated to 2.5.16 + clean up in code see changelog +- patches (-64bit, -grab_pointer, -conf) are in upstream now +- patch -ia64 is in upstream only partially * Fri Feb 17 2006 - pnemec@suse.cz - fixed menu entry #150221 * Wed Jan 25 2006 - mls@suse.de ++++++ fvwm-2.5.12-gcc-warnings.patch -> fvwm-2.5.16-gcc-warnings.patch ++++++ --- fvwm2/fvwm-2.5.12-gcc-warnings.patch 2005-10-20 14:12:50.000000000 +0200 +++ fvwm2/fvwm-2.5.16-gcc-warnings.patch 2006-06-01 14:02:37.000000000 +0200 @@ -1,6 +1,6 @@ --- fvwm/borders.c +++ fvwm/borders.c -@@ -3872,6 +3872,7 @@ +@@ -3912,6 +3912,7 @@ #define ROTATE_RECTANGLE(rot, r, vs_frame, vs_titlebar, vs_title) \ { \ rectangle tr; \ @@ -10,7 +10,7 @@ case ROTATION_270: /* ccw */ \ --- libs/Flocale.c +++ libs/Flocale.c -@@ -422,7 +422,7 @@ +@@ -419,7 +419,7 @@ int **l_to_v) { char *str1, *str2, *str3; @@ -19,13 +19,3 @@ int i; Bool do_iconv = True; const char *bidi_charset; -@@ -535,8 +535,7 @@ - { - free(str2); - } -- *do_free = True; -- len1 = len2; -+ *do_free = True; len1 = len2; - str1 = str3; - } - /* if we failed to do BIDI convert, return string string from ++++++ fvwm-2.5.12-ia64.patch -> fvwm-2.5.16-ia64.patch ++++++ --- fvwm2/fvwm-2.5.12-ia64.patch 2005-05-16 13:49:37.000000000 +0200 +++ fvwm2/fvwm-2.5.16-ia64.patch 2006-06-01 10:44:29.000000000 +0200 @@ -1,66 +1,37 @@ ---- fvwm/stack.c 2004-07-16 12:48:34.000000000 +0200 -+++ fvwm/stack.c 2005-05-16 13:48:08.855240323 +0200 -@@ -109,8 +109,8 @@ - for (t1 = Scr.FvwmRoot.stack_next; t1 != &Scr.FvwmRoot; - t1 = t1->stack_next) +--- fvwm/stack.c ++++ fvwm/stack.c +@@ -111,7 +111,7 @@ + t1 = t1->stack_next) { -- fprintf(stderr," l=%d fw=0x%08x f=0x%08x '%s'\n", t1->layer, -- (int)t1, (int)FW_W_FRAME(t1), t1->name.name); -+ fprintf(stderr," l=%d fw=%p f=%p '%s'\n", t1->layer, + fprintf(stderr," l=%d fw=%p f=0x%08x '%s'\n", t1->layer, +- t1, (int)FW_W_FRAME(t1), t1->name.name); + t1, FW_W_FRAME(t1), t1->name.name); } return; -@@ -168,8 +168,8 @@ - stderr, - "vsrc: stack ring is corrupt -" - " fvwm will probably crash! " -- "0x%08x -> 0x%08x but 0x%08x <- 0x%08x\n", -- (int)t2, (int)t1, (int)(t1->stack_prev), (int)t1); -+ "%p -> %p but %p <- %p\n", -+ t2, t1, t1->stack_prev, t1); - dump_stack_ring(); - return; - } -@@ -193,15 +193,15 @@ - { +@@ -199,14 +199,14 @@ fprintf( stderr,"vsrc: window already died:" -- " fw=0x%08x w=0x%08x '%s'\n", -- (int)t1, (int)FW_W_FRAME(t1), t1->name.name); -+ " fw=%p w=%p '%s'\n", + " fw=%p w=0x%08x '%s'\n", +- t1, (int)FW_W_FRAME(t1), t1->name.name); + t1, FW_W_FRAME(t1), t1->name.name); } else if (i >= last_index) { fprintf( stderr, "vsrc: window is at wrong position" -- " in stack ring: fw=0x%08x f=0x%08x '%s'\n", -- (int)t1, (int)FW_W_FRAME(t1), -+ " in stack ring: fw=%p f=%p '%s'\n", + " in stack ring: fw=%p f=0x%08x '%s'\n", +- t1, (int)FW_W_FRAME(t1), + t1, FW_W_FRAME(t1), t1->name.name); dump_stack_ring(); fprintf(stderr,"dumping X stacking order:\n"); -@@ -214,8 +214,8 @@ - if (FW_W_FRAME(t1) == children[i]) +@@ -222,7 +222,7 @@ { fprintf( -- stderr, " f=0x%08x\n", + stderr, " f=0x%08x\n", - (int)children[i]); -+ stderr, " f=%p\n", + children[i]); break; } } ---- modules/FvwmGtk/windowlist.c 2003-06-29 21:53:25.000000000 +0200 -+++ modules/FvwmGtk/windowlist.c 2005-05-16 13:48:08.873241736 +0200 -@@ -277,7 +277,7 @@ - compare_desk (const window_list_entry **u1, const window_list_entry **u2) - { - int r = (*u1)->desk - (*u2)->desk; -- return ((r != 0) ? r : (int) u1 - (int) u2); -+ return ((r != 0) ? r : (u1 > u2) - (u1 < u2)); - } - - static int ++++++ fvwm-2.5.12.tar.bz2 -> fvwm-2.5.16.tar.bz2 ++++++ ++++ 91192 lines of diff (skipped) ++++++ fvwm-configure.patch ++++++ --- configure.ac +++ configure.ac @@ -81,7 +81,7 @@ [if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR=""; fi], []) -FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR" +FVWM_MODULEDIR='${libexecdir}' FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR" FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib" FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc ++++++ system.fvwm2rc ++++++ --- fvwm2/system.fvwm2rc 2006-02-17 09:20:55.000000000 +0100 +++ fvwm2/system.fvwm2rc 2006-05-30 12:48:50.000000000 +0200 @@ -24,7 +24,7 @@ #paths specific to fvwm2 ModulePath /usr/X11R6/lib/X11/fvwm2 -ImagePath /usr/X11R6/share/icons/xpm/hicolor/all:/usr/X11R6/share/icons/xpm/locolor/all:/usr/X11R6/lib/X11/fvwm2/pixmaps:/usr/share/wallpapers +ImagePath /usr/X11R6/lib/X11/fvwm2/pixmaps:/usr/share/wallpapers #colors @@ -71,7 +71,6 @@ + "I" Quit AddToFunc InitFunction + "I" Module FvwmBanner - + "I" Exec susewmif xmessages + "I" Exec xterm -ls -geometry +150+85 + "I" Module FvwmButtons + "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png @@ -79,13 +78,11 @@ AddToFunc RestartFunction + "I" Module FvwmBanner + "I" Module FvwmButtons - + "I" Exec xmessages - + "I" Exec fvwm-root /usr/share/wallpapers/suse9.1-default.png+ "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png + + "I" Exec fvwm-root /usr/share/wallpapers/suse9.1-default.png + + "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png AddToFunc ExitFunction + "I" Exec xsetroot - + "I" Exec susewmif kill - + "I" Exec xsetroot #fvwm window modifier functions @@ -118,14 +115,14 @@ + "XV" Exec xv AddToMenu bartoolspopup "Tools" Title - + "Mozilla" Exec mozilla + + "Firefox" Exec firefox AddToMenu barshellspopup "Shell in XTerm" Title + "Shell in XTerm" Exec xterm -e bash -login + "Root shell" Function RootShell AddToMenu barsusepopup "SUSE" Title - + "Control Center" Exec xterm -e su - -cyast2 + + "Control Center" Exec xterm -e su - -c yast2 + "Help" Exec susehelp + "SUSE menu" Popup xdg_menu @@ -434,10 +431,9 @@ #button bar popup menus Key s A SM Function "barsusepopupfunc" -Key g A SM Function "bargraphicpopupfunc" +Key g A SM Function "bargraphicspopupfunc" Key t A SM Function "bartoolspopupfunc" -Key l A SM Function "barshellpopupfunc" -Key m A SM Function "MailFunc" +Key l A SM Function "barshellspopupfunc" Key F1 A SM Restart fvwm2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org