- fixed xlibdir usage (files must not be packaged as /usr/lib/X11/*)

[packages/fvwm.git] / fvwm.spec

diff --git a/fvwm.spec b/fvwm.spec
index 0185a178c91b12589c18e02459d0ece26848038b..48689e7e05ae8ce7f58b47a70963f5c8a32568de 100644 (file)
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -12,10 +12,12 @@ License:    GPL
 Group:         X11/Window Managers
 Requires:      fvwm2-icons
 Source0:       ftp://sunsite.unc.edu/pub/Linux/X11/window-managers/%{name}-%{version}.tar.gz
+# Source0-md5: 875733e77e285566197f4b50746aefc6
 Source1:       %{name}-system.%{name}rc
 Source2:       %{name}.desktop
 Source3:       %{name}.RunWM
 Source4:       %{name}.wm_style
+Source5:       %{name}-xsession.desktop
 Patch0:                %{name}-fsstnd.patch
 Patch1:                %{name}-imake.patch
 Patch2:                %{name}-security.patch
@@ -27,6 +29,7 @@ Requires:     xinitrc >= 3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _wmpropsdir     /usr/share/wm-properties
+%define                _xlibdir        /usr/X11R6/lib/X11
 
 %description
 FVWM (the F stands for whatever you want, but the VWM stands for
@@ -77,7 +80,9 @@ xmkmf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm},%{_wmpropsdir}}
+install -d \
+       $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm} \
+       $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_wmpropsdir}}
 
 %{__make} install install.man DESTDIR=$RPM_BUILD_ROOT
 
@@ -86,6 +91,7 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_wmpropsdir}
 
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
+install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,8 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/X11/fvwm/system.fvwmrc
 %attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
 /etc/sysconfig/wmstyle/*.names
-%dir %{_libdir}/X11/fvwm
-%attr(755,root,root) %{_libdir}/X11/fvwm/*
+%dir %{_xlibdir}/fvwm
+%attr(755,root,root) %{_xlibdir}/fvwm/*
 %attr(755,root,root) %{_bindir}/fvwm
+%{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/fvwm.desktop
 %{_mandir}/*/*