diff --git a/fvwm-configure.patch b/fvwm-configure.patch index 9d5d6b4..13ae80e 100644 --- a/fvwm-configure.patch +++ b/fvwm-configure.patch @@ -1,11 +1,13 @@ ---- configure.ac +Index: configure.ac +=================================================================== +--- configure.ac.orig +++ configure.ac -@@ -82,7 +82,7 @@ - [if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR=""; +@@ -111,7 +111,7 @@ AC_ARG_ENABLE(package-subdirs, fi], []) + -FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR" +FVWM_MODULEDIR='${libexecdir}' FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR" + FVWM_DOCDIR='${datadir}'"$FVWM_DOCSUBDIR" FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib" - FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc diff --git a/fvwm2.changes b/fvwm2.changes index cfb5331..c5d82fd 100644 --- a/fvwm2.changes +++ b/fvwm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:16 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Tue Jun 24 16:34:14 CEST 2008 - lmichnovic@suse.cz diff --git a/fvwm2.spec b/fvwm2.spec index fc2d047..9dd5436 100644 --- a/fvwm2.spec +++ b/fvwm2.spec @@ -20,13 +20,13 @@ Name: fvwm2 BuildRequires: freetype2-devel fribidi-devel gcc-c++ gnome-libs-devel gtk-devel gtkdoc imlib-config imlib-devel libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/Other Provides: fvwm fvwmicns windowmanager xpmroot Obsoletes: fvwm xpmroot AutoReqProv: on Version: 2.5.26 -Release: 40 +Release: 41 Summary: Improved Version of FVWM Window Manager Url: http://www.fvwm.org Source0: fvwm-%{version}.tar.bz2 @@ -58,7 +58,7 @@ Authors: The fvwm developers %package gtk -License: BSD 3-Clause +License: BSD3c Summary: Improved Version of FVWM Window Manager Group: System/GUI/Other Requires: fvwm2 @@ -219,450 +219,3 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{_xorg7libs32}/X11/fvwm2/FvwmGtk* %changelog -* Tue Jun 24 2008 lmichnovic@suse.cz -- update to version 2.5.26 - * New features: - - New MenuStyle option VerticalMargins. - * New module features: - - FvwmButtons: New button alignment option: top. - * Bug fixes: - - Fixed crash in ARGB visual detection code. - - Fixed compilation without XRender support. - - Fixed drawing of background pictures in menu items and titles. - - Fixed hadling of shaped windows. - - Fixed a 64-bit bug in the EWMH code. -* Wed Feb 27 2008 lmichnovic@suse.cz -- update to version 2.5.25 - * New features: - - Handle the STATE_ADD command of the EWMH _NET_WM_STATE - message from version 1.3 of the EWMH spec. - - Support transparency in ARGB windows - * Bug Fixes: - - Fixed problem with windows disappearing when created - unless the style Unmanaged was used. - - Edge move delay was used as resistance for the top edge. - - Fixed a parsing problem of the screen argument of the - SnapAttraction style. - - Some html documentation files were not installed. - - Fixed a memory leak in internationalized font handling. - - Fixed a bug in MinOverlap placement. - - Fixed the StickyAcrossPages style in the FvwmPager. - - Fixed the determination of the X charset on UTF-8 systems. - - Fixed a crash when certain EWMH messages were sent to - unmanaged windows. - - Fixed a memory leak in multibyte codepage code. - - Ignore the EWMH staysontop and staysonbottom hints if the - EWMHIgnoreStackingOrderHints style is used. - - Fixed a sporadic crash when the root background set by gnome, - fvwm-root, esetroot etc. changes and a root transparent - colour set is used. - - Fixed spradic crash in modules with root transparent - background from colour sets. - - Fixed a possible crash if the last active module fails. -* Wed Jan 30 2008 lmichnovic@suse.cz -- adjusted system.fvwm2rc and _system.fvwm2rc files - * checked and fixed menu entries - * fixed missing wallpaper after restart - * changed Control center execution for systems with X.org < 7.0 -* Fri Jan 11 2008 lmichnovic@suse.cz -- update to version 2.5.24 - * New features: - - Disabled paging during interactive resize operations by - default (see 2.5.20) as it is annoying to many people. - - New style command options: - EdgeMoveResistance - EdgeMoveDelay - EdgeResizeDelay - SnapGrid - SnapAttraction - that replace the now obsolete commands EdgeResistance, - SnapGrid and SnapAttraction. The EdgeResistance command has - a new syntax with only one argument. - - New command MenuCloseAndExec for menu bindinngs that can be - used to trigger certain commands from a menu without an - associated item. For example, with - Key F1 MTI[]-_ A MenuCloseAndExec Menu RootMenu - the RootMenu can be opened from any other menu by pressing - F1. - * Bug Fixes: - - Sometimes a window jumped by half the screen's size when - moving with the mouse and hitting the border of the desktop. - - Fixed the "screen w" argument of the Move and other commands. - - Clicking on a menu title did not close the menu by default. - - Temporary files in FvwmPerl overwrote each other. -* Tue Oct 23 2007 lmichnovic@suse.cz -- Removed librsvg from BuildRequires to keep the fvwm lightweight - WM suitable for installation; keeping gnome-libs-devel which - affects only gtk subpackage [#335658] -* Mon Oct 15 2007 lmichnovic@suse.cz -- fixed wrong font for non ascii characters in titles of windows - especially for english locales (charset_in_title.patch) [#307361] -* Tue Sep 25 2007 lmichnovic@suse.cz -- excluding useless file README.vms -- file list with %%lang (macro find_lang is hard to use for fvwm) -- added gnome-libs-devel (/usr/bin/gnome-config) and librsvg into - BuildReq to enable more features -* Tue Sep 25 2007 lmichnovic@suse.cz -- update to version 2.5.23 - - obsoletes *string_compar.patch - - fixes segfault on dual core processors [#304236] -- New Features in 2.5.23 cumulative with 2.5.22: - - New Style command options: - StartShaded - UnderMousePlacementHonorsStartsOnPage - UnderMousePlacementIgnoresStartsOnPage - !MinOverlapPlacementPenalties - !MinOverlapPercentPlacementPenalties - MinWindowSize - - SVG (scalable vector graphics) image loading support. - - New extended variables - $[w.iconfile.svgopts] - $[w.miniiconfile.svgopts]. - - Added suffix 'w' to the arguments of the Move command and - similar. It is now possible to add multiple shifts to a - window position, e.g. "50-50w 50-50w" for the center of the - screen. - - Removed UnderMousePlacement and CenterPlacement. Use - "PositionPlacement Center" and "PositionPlacement UnderMouse" - instead. - - Documentation in HTML format. - - Replaced "UseListSkip" with "UseSkipList" & "OnlyListSkip" with - "OnlySkipList" in WindowList command. (Old options deprecated.) - - New subject ImageCache for PrintInfo command. - - The new commad EchoFuncDefinition prints a function's - definition to the console for debugging purposes. - - The CursorStyle command can now load PNG and SVG images as - mouse cursors. New x and y arguments to specify the - hot spot. Also, it is now possible to load non-monochrome - cursors and cursors with partial transparency. -- New module features: - - FvwmScript: New instructions: ChangeWindowTitle and - ChangeWindowTitleFromArg. -- Bug Fixes: - - Windows with aspect ratio no longer maximize past the screen - edges. - - Fixed CenterPlacement with Xinerama screens. - - Fixed CascadePlacement with title direction west and east - - Windows no longer unstick when going to fullscreen mode. - - Fixed crash when raising/lowering a destroyed window. - - Fixed expansion of $[n-] and $[*], broken in 2.5.20. - - Fixes for resizing shaded windows and windows with a gravity - other than northwest. - - Fixed CursorStyle POSITION, broken since 2.3.24. - - The hi, sh and fgsh colors in colorsets are no longer replaced - by computed values if not explicit set on the same line as the - bg, or for fgsh fg, changes. (bug #3359) - - FvwmButtons now redraws stretched button backgrounds correctly - on partial expose. - - Windows with circular transient for hints may no longer crash - fvwm with StackTransientParent style. - - FvwmPager now displays windows that are StickyAcrossPages - correctly. - - Fixed a possible crash with modules closing down. - - Fixed broken demo script fvwm_make_browse_menu.sh. - - The conditon following a comma separator without whitespace - padding was previously ignored if the presiding condition was - multi-worded. - - Various FvwmButtons drawing problems. - - Window movement or resizing triggered by an EWMH message now - honours the FixedSize and FixedPosition window styles. - - Properly generate leave_window and enter_window events for - the root window in FvwmEvent. - - Fixed crash in UTF8 code. - - Fixed parsing of the PropertyChange command. - - Fixed windowlist crash when combining CurrentAtEnd with - IconifiedAtEnd and all windows are iconified. -* Fri Aug 10 2007 dmueller@suse.de -- package size reduction (#217472) -* Thu Jul 19 2007 lmichnovic@suse.cz -- wiped susewmif from rc file because it's not available since 9.1 -* Thu May 10 2007 ro@suse.de -- split off FvwmGtk to its own subpackage -* Wed Apr 04 2007 schwab@suse.de -- Fix last change. -* Wed Apr 04 2007 lmichnovic@suse.cz -- fixed gcc warnings: comparing a char* pointer with a - string literal (string_compar.patch) -* Fri Mar 09 2007 lmichnovic@suse.cz -- Fixed corrupted characters in sax2 test mode for some locales - [#251639] (*utf_encoding.patch) -* Wed Feb 28 2007 lmichnovic@suse.cz -- renamed sv_SE to sv, (sv_SE.patch) [#248751] -- removed xorg-x11 from Requires and Buildrequires since - /usr/share/xsessions is part of filesystem [#229172] -* Tue Feb 13 2007 lmichnovic@suse.cz -- adjusted fvwm2rc file, thanks to Thomas Adam [#242015] -* Tue Feb 13 2007 lmichnovic@suse.cz -- update to version 2.5.21 - * New feature: The command Scroll can now be used for interactive - scrolling. - * Bug Fix: Tile...Placement styles (SmartPlacement) that were - broken in 2.5.20. -* Wed Jan 24 2007 lmichnovic@suse.cz -- removed superfluous slashes ante macros -- now building with icecream -* Tue Jan 16 2007 lmichnovic@suse.cz -- fixed wrong path for icons in system.fvwm2rc [#223521] -- changed titles to openSUSE -- created openSuSE.xpm icon for Button bar menu -- spec cleanup -* Mon Jan 15 2007 lmichnovic@suse.cz -- update to 2.5.20 - - many bug fixes - - fixed few memory leaks - - some new functions and features: - * "Mouse n M N" is no longer used to disable or remap the - builtin tear off menu button. See the section Tear Off Menus. - * Full support for menu context (M) key and mouse bindings. - * New window conditions: StickyIcon, StickyAcrossPagesIcon - and StickyAcrossDesksIcon. - * Hilighted menu backgrounds now use pixmaps gradients and - transparency from their related colorset. -* Fri Jan 05 2007 lmichnovic@suse.cz -- fixed missing background image [#223521] -* Tue Dec 19 2006 lmichnovic@suse.cz -- added xorg-x11 into Requires and Buildrequires and excluding - /usr/share/xsessions directory from filelist [#229172] -* Tue Dec 12 2006 lmichnovic@suse.cz -- update to version 2.5.19 including bugfix in FvwmWinList: problem - with window name/button mixups during Init/Restart of fvwm. - * Many bugfixes: - - fvwm no longer crashes on 1 and 4 bit displays. - - Security fix in fvwm-menu-directory. (CVE-2006-5969) -- which obsoletes *sec-fvwmname.patch - * New features (from version 2.5.17): - - New MenuStyle options TitleFont, TitleColorset and - HilightTitleBack. - - New command PressButton in module FvwmButtons for being able - to emulate button press via other means than the mouse. - - New wrap options to EdgeScroll command for wrapping with pixel - distances. - - New Style option UnderMousePlacement. - - Unused arguments to Style options generate warnings. - - The name style names match against can be augmented by the - X-resource "fvwmstyle". - - New options, Reverse and UseStack, to All command. - - WindowShade can now reshade windows using the Last direction. - - Positional parameters to complex functions can now be expanded - using $[n], $[n-m], $[n-] and $[*] expressions. - - The width and height arguments of the Resize command now - accept the prefix 'w' to allow resizing relative to the - current window size. - - New command ModuleListenOnly. - - New "Periodic" option added to Schedule command. -* Tue Nov 14 2006 lmichnovic@suse.cz -- fixed possible command execution (sec-fvwmname.patch) [#220708] -* Tue Sep 05 2006 lmichnovic@suse.cz -- distinquishing from X.org version which config file to install - (Source4 resp. Source5) -* Mon Sep 04 2006 lmichnovic@suse.cz -- omitting X11R6 in config file (which is Source4) -- specifying X.org libs and headers -* Sun Aug 06 2006 pnemec@suse.cz -- major change in specfile instalation and file section to build - with Xorg 7 -* Mon Jul 03 2006 schwab@suse.de -- Set mandir. -* 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 -- converted neededforbuild to BuildRequires -* Thu Oct 20 2005 pnemec@suse.cz -- changed fvmw default theme to use diferent program to set background #106011 -- fixed gcc warnings -* Thu Aug 25 2005 schwab@suse.de -- Remove obsolete patch. -* Mon May 16 2005 ltinkl@suse.cz -- update to 2.5.12 -- adapt patches -* Thu Feb 10 2005 adrian@suse.de -- install session desktop file -* Thu Jan 27 2005 ro@suse.de -- add 64bit fix from lubos (#50203) -* Fri May 07 2004 ltinkl@suse.cz -- added mktemp to requirements -- updated sources to 2.5.10 -* Thu Apr 08 2004 ltinkl@suse.cz -- fix button background (#37677) -* Thu Mar 18 2004 ltinkl@suse.cz -- fixed missing icons (#35551) -- fixed SUSE helpcenter command line -- reworked color scheme to match the current blueish design -- build the list of screensavers dynamically -- fixed the invocation of fvwm2 manpage -- build with -fno-strict-aliasing -- make Acroread work in fullscreen mode (#36189) -* Mon Mar 15 2004 kukuk@suse.de -- Provide/Obsolete xpmroot -* Thu Mar 11 2004 ltinkl@suse.cz -- SuSE -> SUSE -- use the default system wallpaper (#31644, #35687) -* Tue Mar 09 2004 schwab@suse.de -- Don't require on xpmroot. -* Thu Mar 04 2004 ltinkl@suse.cz -- updated to 2.4.9 -* Wed Jan 28 2004 ltinkl@suse.cz -- fix security problem with temp file handling (#34077) -* Sat Jan 10 2004 adrian@suse.de -- build as user -* Wed Dec 17 2003 mfabian@suse.de -- enable building with Xft2 again (configure script had changed - the way of detecting Xft2, therefore building with Xft2 was - accidentally disabled again after the update). -* Tue Nov 18 2003 ltinkl@suse.cz -- update to latest stable version 2.5.8 -* Wed Sep 17 2003 ltinkl@suse.cz -- fix menu encoding (has to be UTF-8) -- fix RMB desktop menu -* Mon Sep 15 2003 ltinkl@suse.cz -- adjusted default fonts and fixed some broken menu entries (#30521) -* Sat Sep 13 2003 schwab@suse.de -- Workaround broken module interface (it can't handle padding). -* Fri Sep 05 2003 mfabian@suse.de -- enable Xft2 support to get better i18n support out of the box - and to be able to finally fix Bugzilla #24765. -- change system.fvwm2rc to use only fonts via Xft2 by default -- specify "StringEncoding=UTF-8:" and ":encoding=iso10646-1" - for all fonts (config file should be UTF-8 encoded!). -- remove my fvwm-nls-examples.tar.bz2 documentation, it is very - obsolete now. -- add xpmroot to Requires because it is used to draw the - background in system.fvwmrc. -* Fri Sep 05 2003 ltinkl@suse.cz -- integrate common (XDG) menu, closes #29498 -* Tue Sep 02 2003 ltinkl@suse.cz -- created an implicit configuration to fix #29498 -* Wed Jul 30 2003 schwab@suse.de -- Update to fvwm 2.5.7. -- Fix misalignment bug. -* Tue Jul 15 2003 ltinkl@suse.cz -- updated sources to 2.4.16 -* Sun Mar 09 2003 adrian@suse.de -- add wallpaper background pixmap -* Sun Feb 16 2003 adrian@suse.de -- do not require icon packages anymore, default config will be - without icons due to dropped package. Let's see what breaks :/ -* Tue Feb 04 2003 pmladek@suse.cz -- updated to version 2.4.15 (many bug fixes) -* Tue Sep 03 2002 mfabian@suse.de -- add fvwm-2.4.8-utf-8-font-load.patch. - Thanks to Egbert Eich - Without this patch, fvwm2 doesn't work in UTF-8 locales. - It writes many "internal error" messages about missing fonts - to stdout and the menus are empty because the fonts couldn't - be loaded. I.e. without this patch fvwm2 is unusable in UTF-8 - locales. -* Sat Aug 17 2002 ro@suse.de -- don't duplicate README's in filelist -* Tue Jul 09 2002 pmladek@suse.cz -- updated to version 2.4.8: - * many bugfixes, some improvents -- removed obsolete ia64-prep patch -* Tue Apr 02 2002 pmladek@suse.cz -- fixed to compile with autoconf-2.53 - * added missing brackets into smr_SWITCH macro - * removed redundant AC_SUBST(LIBOBJS) -* Wed Mar 06 2002 mmj@suse.de -- Fixed permissions [Bug #14421] -* Sun Feb 10 2002 ro@suse.de -- new option for bz2 tar is "j" -* Tue Feb 05 2002 pmladek@suse.cz -- updated to version 2.4.5 -* Mon Jan 21 2002 pmladek@suse.cz -- updated to version 2.4.4 -* Tue Dec 04 2001 pmladek@suse.cz -- fixed too long time of deadlock when fvwm2 tries to grab mouse - pointer but the mouse pointer is already grabbed by another - application (#12167) -* Thu Nov 29 2001 pmladek@suse.cz -- updated to version 2.4.3 - * many bug fixes - * new commands and options -* Thu Aug 09 2001 pmladek@suse.cz -- updated to stable version 2.4.0 -- fixed configure.in - * forget cached value in readline tests -* Thu Jun 14 2001 pmladek@suse.cz -- fixed to compile with new automake -* Wed May 16 2001 pmladek@suse.cz -- fixed cast warnigs on ia64 -* Thu May 10 2001 pmladek@suse.cz -- removed link: - ln -sf system.fvwm2rc $RPM_BUILD_ROOT/etc/X11/fvwm2/.fvwm2rc - (because susewm generates right config file system.fvwm2rc now) -- /etc/X11/fvwm2/system.fvwm2rc is right config file now -* Tue Apr 24 2001 pmladek@suse.cz -- fixed conversions int <-> poiter on ia64 -- fixed preprocesor problems on ia64 -* Thu Apr 12 2001 pmladek@suse.cz -- updated to version 2.3.31 -* Mon Apr 09 2001 pmladek@suse.cz -- added icons-xpm to Requires -* Wed Apr 04 2001 mfabian@suse.de -- removed rplay again from "# neededforbuild" because a small - fvwm2 is needed as a default windowmanager and rplay will not - be in the default selection. -* Wed Apr 04 2001 mfabian@suse.de -- added libstroke, libstroke-devel, and rplay to "# neededforbuild" - (request of upstream fvwm2 authors) -* Fri Mar 30 2001 pmladek@suse.cz -- updated to version 2.3.30 -- added URL -- compiled witk GTK and IMLIB - * added gtk gtk-devel gtkdoc glib glib-devel imlib imlib-devel - imlib-config to neededforbuild -- fixed call of suse_update_config -* Thu Mar 15 2001 cihlar@suse.cz -- fixed file list -- removed xselection, package xselect is better -* Wed Mar 07 2001 mfabian@suse.de -- repair packaging mistake, forgot to pack /usr/X11R6/share/ -* Wed Mar 07 2001 mfabian@suse.de -- upgrade to fvwm2-2.3.29 -- improve nls examples -* Fri Feb 23 2001 ro@suse.de -- added readline/readline-devel to neededforbuild (split from bash) -* Sun Jan 28 2001 mfabian@suse.de -- upgraded to "stable beta release" FVWM 2.3.28. -- added icons tarball (previously included in main tarball) -- added "--enable-multibyte" to ./configure -- added fvwm-nls-examples.tar.bz2 (explanation and examples - for native language support, especially for Japanese) -- added symlink: - ln -sf system.fvwm2rc $RPM_BUILD_ROOT/etc/X11/fvwm2/.fvwm2rc - (because fvwm2 now reads only /etc/X11/fvwm2/system.fvwm2rc, but - SuSEconfig generates /etc/X11/fvwm/.fvwm2rc) -- removed patches changing path of perl (handled by configure now) -- removed old i18n patch (already included upstream now) -* Wed Dec 13 2000 cihlar@suse.cz -- fixed i18n patch [#4532] -- removed %%preun -* Mon Nov 20 2000 cihlar@suse.cz -- fixed neededforbuild -- requires: icons ... -* Fri Oct 13 2000 cihlar@suse.cz -- fixed i18n -- bzipped sources -- fixed configuration -* Fri Aug 18 2000 cihlar@suse.cz -- fixed to work with new pixmaps -- fixed config file -* Tue Jun 06 2000 kukuk@suse.de -- Update to 2.2.4 -- Move sysconfdir to /etc/X11/fvwm2 -* Mon Jun 05 2000 ro@suse.de -- doc relocation -* Tue Dec 14 1999 ro@suse.de -- use /usr/X11R6/bin instead of /usr/bin/X11 -- use /usr/X11R6/lib/X11 instead of /usr/lib/X11 -* Mon Sep 20 1999 ro@suse.de -- added Provides windowmanager -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Sat Jul 17 1999 maddin@suse.de -- created package version 2.2.2 (based on and conflicting with fvwm-2.0)