- one more autohide fix: moving out of newly created window at taskbar (for

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 0bc104e6de81fa3fd8520606baa2e2ae4a1ba004..b594d710a0980887e43ac55e3499e1399f580055 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -3,10 +3,10 @@
 %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_with    gnome2          # build with support for GNOME2 wm-properties
 #
 # TODO:
 # - make a PLD-theme - default :]
-# - -home_etc.patch needs update
 
 Summary:       IceWM X11 Window Manager
 Summary(de.UTF-8):     IceWM ist ein Window Manager für X
@@ -16,29 +16,28 @@ Summary(pt_BR.UTF-8):       Gerenciador de Janelas X11
 Summary(ru.UTF-8):     Оконный менеджер для X11
 Summary(uk.UTF-8):     Віконний менеджер для X11
 Name:          icewm
-Version:       1.3.6
-#%define _pre pre1
+Version:       1.3.7
 %define        _iceicons_ver           0.6
 %define        _netscapeicons_ver      0.2
-Release:       2
+Release:       4
 Epoch:         2
 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: 65a7ddb0fb3f60abea4af52184382570
+# Source0-md5: 224695231aedb2b91db3254a13e1c8dd
 Source1:       IceWM.desktop
 Source3:       http://dl.sourceforge.net/icewm/iceicons-%{_iceicons_ver}.tar.gz
 # Source3-md5: 53ed111a3c4d1e609bd1604ddccd4701
-Source4:       IceWM.RunWM
+Source4:       icewm-startup.sh
 Source6:       http://dl.sourceforge.net/icewm/netscapeicons-%{_netscapeicons_ver}.tar.gz
 # Source6-md5: 409aa9b02adc11309ed546c5120c01d2
 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
+Patch0:                %{name}-build-fixes.patch
+Patch1:                %{name}-tray_hotfixes.patch
+Patch2:                %{name}-fix_input_focus_loss_for_deiconified_frame_1.patch
+Patch3:                %{name}-ifstate-exact-check.patch
+Patch4:                %{name}-imap-unseen.patch
+Patch5:                %{name}-autohide.patch
 URL:           http://www.icewm.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -56,12 +55,12 @@ BuildRequires:      xorg-lib-libXinerama-devel
 %{?with_guievents:BuildRequires:       yiff-devel}
 Requires(pre): fileutils
 Requires(pre): sh-utils
+Requires:      shared-mime-info
 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/gnome/wm-properties
 %define                specflags_ia32  -fomit-frame-pointer
 
@@ -134,12 +133,13 @@ Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
 nice2, warp3, warp4, win95.
 
 %prep
-#setup -q -n %{name}-%{version}%{_pre}
 %setup -q
 %patch0 -p1
-#patch1 -p1
-#patch2 -p1
-#patch3 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 cd lib/icons
 tar -xzf %{SOURCE3}
@@ -161,14 +161,14 @@ cp -f /usr/share/automake/config.sub .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmstyledir}} \
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir}} \
        $RPM_BUILD_ROOT{%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}-session.sh
+%{?with_gnome2:install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
 install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
 sed 's|^# IconPath=""|IconPath="%{_datadir}/pixmaps:%{_datadir}/icons"|' < lib/preferences > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/preferences
@@ -201,13 +201,13 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %{_datadir}/icewm/icons
 %{_datadir}/icewm/ledclock
 %{_datadir}/icewm/mailbox
+%attr(755,root,root) %{_datadir}/icewm/startup
 %{_datadir}/icewm/taskbar
 %dir %{_datadir}/icewm/themes
 %{_datadir}/icewm/themes/Infadel2
 %{_datadir}/icewm/themes/icedesert
 %{_datadir}/xsessions/%{name}.desktop
-%{_wmpropsdir}/*
-%attr(755,root,root) %{_wmstyledir}/%{name}-session.sh
+%{?with_gnome2:%{_wmpropsdir}/*}
 
 %files themes-base
 %defattr(644,root,root,755)