- orphaned, outdated

[packages/fvwm.git] / fvwm.spec

diff --git a/fvwm.spec b/fvwm.spec
index 59ca31a4d5d484d36318f3165527078c4e6add0f..8c1231c98a00fc5f009d98326ba3693b1ae84c27 100644 (file)
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -7,29 +7,35 @@ 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:       28
 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://ftp.fvwm.org/pub/fvwm/version-1/%{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
-Requires:      wmconfig >= 0.9.9-5
+Patch5:                %{name}-maxpopups.patch
+Patch6:                %{name}-man.patch
+URL:           http://www.fvwm.org/
+BuildRequires: XFree86
+BuildRequires: XFree86-devel
+BuildRequires: imake
+Requires(post):        vfmg >= 0.9.95
+Requires:      fvwm2-icons
 Requires:      m4
+Requires:      vfmg >= 0.9.18-3
 Requires:      xinitrc-ng
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _wmpropsdir     /usr/share/wm-properties
-%define                _xlibdir        /usr/X11R6/lib/X11
+%define                _sysconfdir     /etc/X11/fvwm
 
 %description
 FVWM (the F stands for whatever you want, but the VWM stands for
@@ -65,9 +71,10 @@ de bot
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
-PATH="$PATH:%{_bindir}"; export PATH
 xmkmf
 %{__make} Makefiles
 %{__make} \
@@ -81,37 +88,45 @@ xmkmf
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d \
-       $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm} \
+       $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle} \
        $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_wmpropsdir}}
 
-%{__make} install install.man DESTDIR=$RPM_BUILD_ROOT
+%{__make} install install.man \
+       DESTDIR=$RPM_BUILD_ROOT \
+       BINDIR=%{_libdir}/fvwm1 \
+       MANDIR=%{_mandir}/man1
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fvwm/system.fvwmrc
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/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
+mv $RPM_BUILD_ROOT%{_libdir}/fvwm1/fvwm $RPM_BUILD_ROOT%{_bindir}/fvwm1
 
-install -d $RPM_BUILD_ROOT%{_mandir}
-mv $RPM_BUILD_ROOT/usr/X11R6/man/man1 $RPM_BUILD_ROOT%{_mandir}/
+mv $RPM_BUILD_ROOT%{_mandir}/man1/fvwm{,1}.1x
+touch $RPM_BUILD_ROOT%{_sysconfdir}/fvwm.menu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+# generate initial menu
+[ -f /etc/sysconfig/vfmg ] && . /etc/sysconfig/vfmg
+[ "$FVWM" = yes -o "$FVWM" = 1 -o ! -f /etc/X11/fvwm/fvwm.menu ] && \
+       vfmg fvwm >/etc/X11/fvwm/fvwm.menu 2>/dev/null ||:
+
 %files
 %defattr(644,root,root,755)
 %doc sample.fvwmrc/*
-%dir %{_sysconfdir}/X11/fvwm
-%config %{_sysconfdir}/X11/fvwm/system.fvwmrc
+%dir %{_sysconfdir}
+%config %{_sysconfdir}/system.fvwmrc
+%ghost %{_sysconfdir}/fvwm.menu
 %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
+%dir %{_libdir}/fvwm1
+%attr(755,root,root) %{_libdir}/fvwm1/*
+%attr(755,root,root) %{_bindir}/fvwm1
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/fvwm.desktop
 %{_mandir}/*/*