X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffvwm.git;a=blobdiff_plain;f=fvwm.spec;h=0f947888085c1bbb50c50d747d882c636c10d6b0;hp=f6ecd4d463572a3c6dc79c4071a77f6c20a0a33a;hb=38e5666a1b49636ab4c9a99b4f34c1ff4f9b3f5a;hpb=991be8ebc76436f6fd7e47fff9eb6ab13b001ac9

diff --git a/fvwm.spec b/fvwm.spec
index f6ecd4d..0f94788 100644
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -7,7 +7,7 @@ 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
@@ -16,19 +16,20 @@ Source0:	ftp://sunsite.unc.edu/pub/Linux/X11/window-managers/%{name}-%{version}.
 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		_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
@@ -64,6 +65,7 @@ de bot
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 PATH="$PATH:%{_bindir}"; export PATH
@@ -89,9 +91,14 @@ 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
 
@@ -101,10 +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
+%{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/fvwm.desktop
 %{_mandir}/*/*