- updated gettext BR

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 632c33b23becbbaf911d4d4db3037bab453f4f0b..aacee8e7853acff5ed0becc581b6c321c430f255 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -3,6 +3,7 @@
 %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 :]
@@ -18,7 +19,7 @@ Name:         icewm
 Version:       1.3.7
 %define        _iceicons_ver           0.6
 %define        _netscapeicons_ver      0.2
-Release:       1
+Release:       4
 Epoch:         2
 License:       LGPL
 Group:         X11/Window Managers
@@ -27,7 +28,7 @@ Source0:      http://dl.sourceforge.net/icewm/%{name}-%{version}.tar.gz
 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
@@ -36,13 +37,14 @@ 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
 BuildRequires: gdk-pixbuf-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: gtk+2-devel
-BuildRequires: kde4-kde3support-devel
+BuildRequires: kde4-kde3support
 BuildRequires: libstdc++-devel
 BuildRequires: pkgconfig
 BuildRequires: xorg-lib-libICE-devel
@@ -59,7 +61,6 @@ 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
 
@@ -138,6 +139,7 @@ nice2, warp3, warp4, win95.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cd lib/icons
 tar -xzf %{SOURCE3}
@@ -159,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
@@ -199,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)