- merge -maxpopups patch from Ra

[packages/fvwm.git] / fvwm.spec

diff --git a/fvwm.spec b/fvwm.spec
index 56c665b4be35d3c398132e95a482f54a467d8ca1..0f947888085c1bbb50c50d747d882c636c10d6b0 100644 (file)
--- 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,16 +16,16 @@ 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
@@ -65,6 +65,7 @@ de bot
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 PATH="$PATH:%{_bindir}"; export PATH
@@ -90,7 +91,6 @@ 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}
@@ -108,7 +108,6 @@ 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 %{_xlibdir}/fvwm
 %attr(755,root,root) %{_xlibdir}/fvwm/*
 %attr(755,root,root) %{_bindir}/fvwm