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

diff --git a/fvwm.spec b/fvwm.spec
index 0670ccb..0f94788 100644
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -1,36 +1,35 @@
 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 
+Summary(de):	Feeble (Fine?) Virtual Window Manager
 Summary(fr):	Feeble (Fine ?) Virtual Window Manager
+Summary(pl):	Zarz±dca okien dla X Window System
 Summary(pt):	Gerenciador de Janelas: Feeble (Fine?) Virtual Window Manager
 Summary(tr):	X11 için pencere denetleyicisi
 Name:		fvwm
 Version:	1.24r
-Release:	23
+Release:	25
 License:	GPL
 Group:		X11/Window Managers
-Group(de):	X11/Fenstermanager
-Group(es):	X11/Administraadores De Ventanas
-Group(fr):	X11/Gestionnaires De Fenêtres
-Group(pl):	X11/Zarz±dcy Okien
 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	/usr/share/wm-properties
+%define		_xlibdir	/usr/X11R6/lib/X11
 
 %description
 FVWM (the F stands for whatever you want, but the VWM stands for
@@ -46,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
@@ -66,31 +65,39 @@ de bot
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
-export PATH=$PATH:%{_bindir}
+PATH="$PATH:%{_bindir}"; export PATH
 xmkmf
 %{__make} Makefiles
 %{__make} \
-	BOOTSTRAPCFLAGS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}" \
-	CCOPTIONS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}" \
-	CXXOPTIONS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}" \
+	BOOTSTRAPCFLAGS="%{rpmcflags}" \
+	CCOPTIONS="%{rpmcflags}" \
+	CXXOPTIONS="%{rpmcflags}" \
 	CXXDEBUGFLAGS="" \
 	CDEBUGFLAGS="" \
-	LOCAL_LDFLAGS="%{!?debug:-s}"
+	LOCAL_LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm} \
-	$RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+install -d \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm} \
+	$RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_wmpropsdir}}
 
 %{__make} install install.man DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fvwm/system.fvwmrc
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+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,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}/gnome/wm-properties/fvwm.desktop
+%{_datadir}/xsessions/%{name}.desktop
+%{_wmpropsdir}/fvwm.desktop
 %{_mandir}/*/*