- Added desktop file for gdm/kdm support

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 88da3331f845d121cf2f6fac5c30093cc07b0168..f8c534d0c324943e415ffa9a7ab77b9447bdb429 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -10,7 +10,6 @@
 # TODO:
 # - make a PLD-theme - default :]
 #
-%define        _pre    pre5
 
 Summary:       IceWM X11 Window Manager
 Summary(es):   Administrador de Ventanas X11
@@ -19,13 +18,13 @@ Summary(pt_BR):     Gerenciador de Janelas X11
 Summary(ru):   ïËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   ÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          icewm
-Version:       1.2.10
-Release:       0.%{_pre}.1
+Version:       1.2.13
+Release:       0.pre3.1
 Epoch:         2
 License:       LGPL
 Group:         X11/Window Managers
-Source0:       http://dl.sourceforge.net/icewm/%{name}-%{version}%{_pre}.tar.gz
-# Source0-md5: 286c9720878dfe97b5fee93d4d6dff72
+Source0:       http://dl.sourceforge.net/icewm/%{name}-%{version}pre3.tar.gz
+# Source0-md5: 0ccc3d4df8fc87642aad5864290a853e
 Source1:       IceWM.desktop
 Source2:       %{name}.directory
 Source3:       http://dl.sourceforge.net/icewm/iceicons-0.6.tar.gz
@@ -34,6 +33,7 @@ Source4:      IceWM.RunWM
 Source5:       IceWM.wm_style
 Source6:       http://dl.sourceforge.net/icewm/netscapeicons-0.2.tar.gz
 # Source6-md5: 409aa9b02adc11309ed546c5120c01d2
+Source7:       %{name}-xsession.desktop
 URL:           http://www.icewm.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
@@ -111,12 +111,11 @@ Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
 nice2, warp3, warp4, win95.
 
 %prep
-%setup -q -n %{name}-%{version}%{_pre}
+%setup -q -n %{name}-%{version}pre3
 
 cd lib/icons
 tar -xzf %{SOURCE3}
 tar -xzf %{SOURCE6}
-cd ../..
 
 %build
 rm -f missing
@@ -137,15 +136,17 @@ rm -f missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_wmstyledir}} \
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmstyledir}} \
        $RPM_BUILD_ROOT{%{_applnkdir}/Settings/IceWM,%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Settings/IceWM/.directory
-install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.sh
-install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.names
+install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}.sh
+install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}.names
+install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/xsesions/%{name}.desktop
 install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
 install lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/preferences
 install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/toolbar
@@ -185,11 +186,12 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm/themes
 %{_datadir}/icewm/themes/Infadel2
 %{_datadir}/icewm/themes/icedesert
+%{_datadir}/xsessions/%{name}.desktop
 %dir %{_applnkdir}/Settings/IceWM
 %{_applnkdir}/Settings/IceWM/.directory
 %{_wmpropsdir}/*
-%attr(755,root,root) %{_wmstyledir}/IceWM.sh
-%attr(644,root,root) %{_wmstyledir}/IceWM.names
+%{_wmstyledir}/%{name}.names
+%attr(755,root,root) %{_wmstyledir}/%{name}.sh
 
 %files themes-base
 %defattr(644,root,root,755)