- merge -maxpopups patch from Ra

[packages/fvwm.git] / fvwm.spec

diff --git a/fvwm.spec b/fvwm.spec
index 9782cff8c55cba370550413715de4971c98715c6..0f947888085c1bbb50c50d747d882c636c10d6b0 100644 (file)
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -7,28 +7,29 @@ Summary(pt):  Gerenciador de Janelas: Feeble (Fine?) Virtual Window Manager
 Summary(tr):   X11 için pencere denetleyicisi
 Name:          fvwm
 Version:       1.24r
-Release:       24
+Release:       25
 License:       GPL
 Group:         X11/Window Managers
 Requires:      fvwm2-icons
-Source0:       ftp://sunsite.unc.edu:/pub/Linux/X11/window-managers/%{name}-%{version}.tar.gz
+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
 Patch3:                %{name}-%{name}man.patch
 Patch4:                %{name}-enable-m4.patch
+Patch5:                %{name}-maxpopups.patch
 Requires:      wmconfig >= 0.9.9-5
 Requires:      m4
-Requires:      xinitrc >= 3.0
+Requires:      xinitrc-ng
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define                _wmpropsdir     %{_datadir}/wm-properties
+%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
@@ -44,13 +45,13 @@ Puede ser configurado para parecer con Motif, y posee una 
 de botones".
 
 %description -l pl
-FVWM (za F mo¿na sobie podstawic co kto woli, lecz VWM pochodzi od
-pierwszych liter "Virtual Window Manager", czyli wirtualnego mened¿era
-okien) to mened¿er okien dla systemu X Window. FVWM pochodzi od twm.
+FVWM (za F mo¿na sobie podstawiæ co kto woli, lecz VWM pochodzi od
+pierwszych liter "Virtual Window Manager", czyli wirtualny zarz±dca
+okien) to zarz±dca okien dla systemu X Window. FVWM pochodzi od twm.
 Zaprojektowano go tak, by zminimalizowaæ wymagania pamiêciowe,
 udostêpniæ ramki okien sprawiaj±ce wra¿enie trójwymiarowych i proste
-biurko wirtualne. Mo¿na tez skonfigurowaæ FVWM tak, by mia³ motiffowy
-wygl±d.
+biurko wirtualne. Mo¿na tez skonfigurowaæ FVWM tak, by mia³ wygl±d
+podobny do Motifa.
 
 %description -l pt
 fvwm é um gerente de janelas pequeno, rápido e muito flexível. Ele
@@ -64,6 +65,7 @@ de bot
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 PATH="$PATH:%{_bindir}"; export PATH
@@ -79,7 +81,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
 
@@ -87,7 +91,13 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fvwm/system.fvwmrc
 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
+
+install -d $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT/usr/X11R6/bin/fvwm $RPM_BUILD_ROOT%{_bindir}/fvwm
+
+install -d $RPM_BUILD_ROOT%{_mandir}
+mv $RPM_BUILD_ROOT/usr/X11R6/man/man1 $RPM_BUILD_ROOT%{_mandir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,9 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/X11/fvwm
 %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}/*/*