diff --git a/icewm-1.3.7-configurenotify.patch b/icewm-1.3.7-configurenotify.patch new file mode 100644 index 0000000..07e7e13 --- /dev/null +++ b/icewm-1.3.7-configurenotify.patch @@ -0,0 +1,19 @@ +--- icewm-1.3.7/src/decorate.cc.old 2012-06-10 10:59:22.496484163 +0300 ++++ icewm-1.3.7/src/decorate.cc 2012-06-10 11:00:05.453078780 +0300 +@@ -320,6 +320,7 @@ + YWindow::configure(r); + + performLayout(); ++ sendConfigure(); + } + + void YFrameWindow::performLayout() +@@ -331,8 +332,6 @@ + layoutShape(); + if (affectsWorkArea()) + manager->updateWorkArea(); +- +- sendConfigure(); + } + + void YFrameWindow::layoutTitleBar() { diff --git a/icewm-1.3.7-deprecated.patch b/icewm-1.3.7-deprecated.patch new file mode 100644 index 0000000..a6be360 --- /dev/null +++ b/icewm-1.3.7-deprecated.patch @@ -0,0 +1,14 @@ +--- icewm-1.3.7/src/base.h.old 2010-10-31 16:09:36.000000000 +0200 ++++ icewm-1.3.7/src/base.h 2012-06-10 11:08:34.643875363 +0300 +@@ -2,7 +2,11 @@ + #define __BASE_H + + #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 ++#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3 ++#define __icewm_deprecated __attribute__((deprecated)) ++#else + #define deprecated __attribute__((deprecated)) ++#endif + #else + #define deprecated + #endif diff --git a/icewm-menu.patch b/icewm-menu.patch index 82c9add..c5b7e68 100644 --- a/icewm-menu.patch +++ b/icewm-menu.patch @@ -1,5 +1,5 @@ ---- icewm-1.2.30/lib/menu.in.old 2007-01-28 15:14:30.000000000 +0200 -+++ icewm-1.2.30/lib/menu.in 2007-01-28 15:17:12.000000000 +0200 +--- icewm-1.2.30/lib/menu.in.old 2007-01-18 18:51:55.000000000 +0200 ++++ icewm-1.3.7/lib/menu.in 2012-06-10 09:36:00.000000000 +0200 @@ -4,16 +4,7 @@ # since modifications to this file will be discarded when you # (re)install icewm. @@ -11,8 +11,8 @@ -prog Mozilla mozilla mozilla -prog XChat xchat xchat -prog Gimp gimp gimp -+prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm -+prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png xdg-open about:blank ++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 separator -menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@ -menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@ diff --git a/icewm-toolbar.patch b/icewm-toolbar.patch index ee834df..a6f0f15 100644 --- a/icewm-toolbar.patch +++ b/icewm-toolbar.patch @@ -1,5 +1,5 @@ --- icewm-1.2.30/lib/toolbar.in.old 2007-01-18 18:51:55.000000000 +0200 -+++ icewm-1.2.30/lib/toolbar.in 2007-01-18 18:55:50.000000000 +0200 ++++ icewm-1.3.7/lib/toolbar.in 2012-06-10 09:36:00.000000000 +0200 @@ -4,6 +4,6 @@ # since modifications to this file will be discarded when you # (re)install icewm. @@ -7,6 +7,6 @@ -prog XTerm xterm xterm -prog FTE fte fte -prog Netscape netscape netscape -+prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm -+prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png xdg-open about:blank ++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 + diff --git a/icewm.spec b/icewm.spec index 317bb7d..0079c7b 100644 --- a/icewm.spec +++ b/icewm.spec @@ -1,20 +1,7 @@ Name: icewm Version: 1.3.7 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Light and configurable window manager - -%if 0%{?rhel} != 0 -%define platform rhel -%if %{?rhel} <= 5 -%define new_version 0 -%else -%define new_version 1 -%endif -%else -%define new_version 1 -%define platform fedora -%endif - Group: User Interface/Desktops License: LGPLv2+ URL: http://www.icewm.org @@ -35,25 +22,14 @@ BuildRequires: libICE-devel BuildRequires: gettext BuildRequires: gnome-desktop-devel BuildRequires: fribidi-devel - -%if %{new_version} == 1 BuildRequires: libgnomeui-devel BuildRequires: gnome-vfs2-devel BuildRequires: popt-devel -%else -BuildRequires: popt -%endif +Requires: gnome-icon-theme Requires: alsa-utils -Requires: xterm - -%if %{new_version} == 1 -Requires: bluecurve-icon-theme Requires: xdg-utils -%else -Requires: xorg-x11-fonts-truetype -Requires: htmlview -%endif +Requires: xterm Patch0: icewm-configure.patch Patch1: icewm-menu.patch @@ -64,6 +40,8 @@ Patch5: icewm-1.3.7-dso.patch Patch6: icewm-defaults.patch Patch7: icewm-wmclient.patch Patch8: icewm-1.3.7-menuiconsize.patch +Patch9: icewm-1.3.7-configurenotify.patch +Patch10: icewm-1.3.7-deprecated.patch %description @@ -83,9 +61,7 @@ IceWM-gnome adds gnome-menu support for the IceWM window manager. %package xdgmenu -%if %{new_version} == 1 BuildArch: noarch -%endif License: Public Domain Summary: Automatically generate the main IceWM menu Group: User Interface/Desktops @@ -100,18 +76,12 @@ user logs-in. %package clearlooks -%if %{new_version} == 1 BuildArch: noarch -%endif Summary: Clearlooks like theme for IceWM Group: User Interface/Desktops Requires: ImageMagick Requires: icewm = %{version}-%{release} -%if %{platform} == fedora Requires: fedora-logos -%else -Requires: redhat-logos -%endif %description clearlooks @@ -129,6 +99,8 @@ older Fedora releases and RHEL. %patch6 -p0 -b .defaults %patch7 -p0 -b .wmclient %patch8 -p1 -b .menuiconsize +%patch9 -p1 -b .dont_send_config_notify +%patch10 -p1 -b .redefine_icewm_deprecated %build @@ -139,9 +111,6 @@ older Fedora releases and RHEL. --enable-i18n \ --enable-menus-gnome2 \ --disable-menus-gnome1 \ -%if %{new_version} == 0 - --disable-xrandr \ -%endif --with-cfgdir=%{_sysconfdir}/icewm make %{?_smp_mflags} @@ -175,24 +144,10 @@ rm -rf $RPM_BUILD_ROOT %post clearlooks -%if %{platform} == fedora [ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] && \ [ -f /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png ] && \ convert /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png \ - /usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n -%else -%if %{new_version} == 1 -[ -d /usr/share/icewm/themes/clearlooks ] && \ - [ -f /usr/share/pixmaps/redhat/rpmlogo-mini.xpm ] && \ - cp /usr/share/pixmaps/redhat/rpmlogo-mini.xpm \ - /usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n -%else -[ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] && \ - [ -f /usr/share/pixmaps/redhat/shadowman-transparent-22.png ] && \ - convert /usr/share/pixmaps/redhat/shadowman-transparent-22.png \ - /usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n -%endif -%endif + /usr/share/icewm/themes/clearlooks/taskbar/linux.xpm || echo -n %files -f %{name}.lang @@ -231,6 +186,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 10 2012 Gilboa Davara - 1.3.7-4 +- Emacs replaced fixes (BZ #805939, Ported Debian fix). +- Use gnome-icon-theme instead of bluecurve (BZ #811335). +- Gcc 4.7 compile fix. +- spec cleanup. + +* Sun Mar 4 2012 Gilboa Davara - 1.3.7-3 +- Fix missing bluecurve-icon-theme in EL-6. +- Start menu icon should now be generated correctly on both Fedora and EPEL. + * Fri Jan 13 2012 Fedora Release Engineering - 1.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild