diff --git a/WindowMaker.spec b/WindowMaker.spec index a7cfd0b..04b602b 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -1,13 +1,12 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: User Interface/Desktops URL: http://www.windowmaker.org/ Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2 -Source1: WindowMaker.xsession Source2: WindowMaker.desktop Source3: WindowMaker-uk.po Source4: WPrefs-uk.po @@ -155,10 +154,8 @@ make DESTDIR=$RPM_BUILD_ROOT NLSDIR=%{_datadir}/locale install %find_lang '\(WPrefs\|%{name}\|WINGs\)' -install -D -m0755 %{SOURCE1} \ -%{buildroot}%{_sysconfdir}/X11/gdm/Sessions/WindowMaker -install -D -m0644 %{SOURCE2} \ -%{buildroot}%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop +install -D -m0644 -p %{SOURCE2} \ +%{buildroot}%{_datadir}/xsessions/WindowMaker.desktop find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' @@ -173,8 +170,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS FAQ* README* COPYING* %config %{_sysconfdir}/%{name} -%{_sysconfdir}/X11/gdm/Sessions/WindowMaker -%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop +%{_datadir}/xsessions/WindowMaker.desktop %{_bindir}/* %{_datadir}/%{name} %{_datadir}/WINGs @@ -197,6 +193,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 02 2006 Andreas Bierfert +0.92.0-8 +- fix gdm detection + * Sun Feb 26 2006 Andreas Bierfert 0.92.0-7 - fix #181981 diff --git a/WindowMaker.xsession b/WindowMaker.xsession deleted file mode 100644 index d17ce12..0000000 --- a/WindowMaker.xsession +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /etc/X11/xdm/Xsession wmaker