- upgraded to 1.3.6

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 021aa60223f0b867631ee3c8a12746ee93225774..267438db6a642ad60ce9b10bd6e11c2d5efdcdda 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,10 +1,8 @@
 #
 # Conditional build:
-%bcond_without gradients       # disable gradients (implies with_antialiasing)
-%bcond_without antialiasing    # disable antialiasing
+%bcond_without gradients       # disable gradients (requires antialiasing which requires freetype)
 %bcond_without freetype        # disable xfreetype support (implies !with_antialiasing)
 %bcond_without guievents       # disable guievents
-%bcond_without imlib           # disable imlib support
 #
 # TODO:
 # - make a PLD-theme - default :]
@@ -18,7 +16,7 @@ Summary(ru.UTF-8):    Оконный менеджер для X11
 Summary(uk.UTF-8):     Віконний менеджер для X11
 Summary(de.UTF-8):     IceWM ist ein Window Manager für X
 Name:          icewm
-Version:       1.2.30
+Version:       1.3.6
 #%define _pre pre1
 %define        _iceicons_ver           0.6
 %define        _netscapeicons_ver      0.2
@@ -28,7 +26,7 @@ License:      LGPL
 Group:         X11/Window Managers
 #Source0:      http://dl.sourceforge.net/icewm/%{name}-%{version}%{_pre}.tar.gz
 Source0:       http://dl.sourceforge.net/icewm/%{name}-%{version}.tar.gz
-# Source0-md5: 8a302c5e629bb81d87cc02004a694ece
+# Source0-md5: 65a7ddb0fb3f60abea4af52184382570
 Source1:       IceWM.desktop
 Source3:       http://dl.sourceforge.net/icewm/iceicons-%{_iceicons_ver}.tar.gz
 # Source3-md5: 53ed111a3c4d1e609bd1604ddccd4701
@@ -39,26 +37,29 @@ Source7:    %{name}-xsession.desktop
 Patch0:                %{name}-broken-xrandr.patch
 #Patch1:               %{name}-home_etc.patch
 Patch2:                %{name}-helpbrowser.patch
+# exctracted from http://ftp.de.debian.org/debian/pool/main/i/icewm/icewm_1.2.32-2.diff.gz
+Patch3:                %{name}-tray_hotfixes.patch
 URL:           http://www.icewm.org/
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 %{?with_guievents:BuildRequires:       esound-devel}
+BuildRequires: gdk-pixbuf-devel
 BuildRequires: gettext-devel
-%{?with_imlib:BuildRequires:   imlib-devel}
 BuildRequires: libstdc++-devel
 #%:wq
 %{?with_freetype:BuildRequires:        xorg-lib-libXft-devel >= 2.1}
 %{?with_guievents:BuildRequires:       yiff-devel}
 Requires(pre): fileutils
 Requires(pre): sh-utils
-Requires:      vfmg >= 0.9.95
 Requires:      xinitrc-ng
+Suggests:      vfmg >= 0.9.95
+Conflicts:     filesystem < 3.0-20
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _wmstyledir     /etc/sysconfig/wmstyle
-%define                _wmpropsdir     /usr/share/wm-properties
-%define                specflags_ia32   -fomit-frame-pointer
+%define                _wmpropsdir     /usr/share/gnome/wm-properties
+%define                specflags_ia32  -fomit-frame-pointer
 
 %description
 Window Manager for X Window System. Can emulate the look of
@@ -134,8 +135,7 @@ nice2, warp3, warp4, win95.
 %patch0 -p1
 #patch1 -p1
 #patch2 -p1
-
-mv -f po/{zh_TW.Big5,zh_TW}.po
+#patch3 -p1
 
 cd lib/icons
 tar -xzf %{SOURCE3}
@@ -147,12 +147,9 @@ cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %{__autoheader}
 %configure \
-       %{?with_gradients:--enable-gradients} \
-       %{?with_antialiasing:--enable-antialiasing} \
+       %{!?with_gradients:--disable-gradients} \
        %{!?with_freetype:--disable-xfreetype --enable-corefonts} \
        %{?with_guievents:--enable-guievents} \
-       %{!?with_imlib:--without-imlib} \
-       --disable-menus-gnome \
        --enable-shaped-decorations \
        --with-cfgdir=%{_sysconfdir}/X11/%{name} \
        --with-docdir=%{_docdir}