- merge -maxpopups patch from Ra

[packages/fvwm.git] / fvwm.spec

diff --git a/fvwm.spec b/fvwm.spec
index 804942966d4c32d96d56a8a683e8351c5777f14e..0f947888085c1bbb50c50d747d882c636c10d6b0 100644 (file)
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -1,7 +1,3 @@
-#
-# TODO:
-# cleanups, more BRs,
-#
 Summary:       An X Window System based window manager
 Summary(es):   Administrador de Ventanas: Feeble (Fine?) Virtual Window Manager
 Summary(de):   Feeble (Fine?) Virtual Window Manager
@@ -10,27 +6,30 @@ Summary(pl): Zarz
 Summary(pt):   Gerenciador de Janelas: Feeble (Fine?) Virtual Window Manager
 Summary(tr):   X11 için pencere denetleyicisi
 Name:          fvwm
-Version:       2.4.15
-Release:       0.1
+Version:       1.24r
+Release:       25
 License:       GPL
 Group:         X11/Window Managers
 Requires:      fvwm2-icons
-Source0:       ftp://ftp.fvwm.org/pub/fvwm/version-2/%{name}-%{version}.tar.bz2
+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                _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
@@ -61,33 +60,44 @@ de bot
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
-rm -f missing
-%{__gettextize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
-%{__make}
+PATH="$PATH:%{_bindir}"; export PATH
+xmkmf
+%{__make} Makefiles
+%{__make} \
+       BOOTSTRAPCFLAGS="%{rpmcflags}" \
+       CCOPTIONS="%{rpmcflags}" \
+       CXXOPTIONS="%{rpmcflags}" \
+       CXXDEBUGFLAGS="" \
+       CDEBUGFLAGS="" \
+       LOCAL_LDFLAGS="%{rpmldflags}"
 
 %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 DESTDIR=$RPM_BUILD_ROOT
+%{__make} install install.man DESTDIR=$RPM_BUILD_ROOT
 
 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,11 +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}/%{name}/%{version}
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/*
-%attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/%{name}/
-%attr(755,root,root) %{_datadir}/%{name}/*
+%dir %{_xlibdir}/fvwm
+%attr(755,root,root) %{_xlibdir}/fvwm/*
+%attr(755,root,root) %{_bindir}/fvwm
+%{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/fvwm.desktop
 %{_mandir}/*/*