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

diff --git a/fvwm.spec b/fvwm.spec
index c341e11..0f94788 100644
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -1,30 +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(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(pl):	X11/Zarz±dcy Okien
-Group(es):	X11/Administraadores De Ventanas
-Group(fr):	X11/Gestionnaires De Fenêtres
 Requires:	fvwm2-icons
-Source0:	ftp://sunsite.unc.edu:/pub/Linux/X11/window-managers/%{name}-%{version}.tar.gz
-Source1:	fvwm-system.fvwmrc
-Source2:	fvwm.desktop
+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
-Patch0:		fvwm-1.24r-fsstnd.patch
-Patch1:		fvwm-1.24r-imake.patch
-Patch2:		fvwm-1.24r-security.patch
-Patch3:		fvwm-1.24r-fvwmman.patch
-Patch4:		fvwm-enable-m4.patch
+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	/usr/X11R6/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
@@ -34,14 +39,24 @@ minimize memory consumption, to provide window frames with a 3D look,
 and to provide a simple virtual desktop. FVWM can be configured to
 look like Motif.
 
+%description -l es
+fvwm es un administrador de ventanas pequeño, rápido y muy flexible.
+Puede ser configurado para parecer con Motif, y posee una útil "barra
+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
+pode ser configurado para parecer com Motif, e possui uma útil "barra
+de botões".
 
 %prep
 %setup -q
@@ -50,33 +65,39 @@ wygl
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
-export PATH=$PATH:%{_bindir}
+PATH="$PATH:%{_bindir}"; export PATH
 xmkmf
 %{__make} Makefiles
 %{__make} \
-	"BOOTSTRAPCFLAGS=$RPM_OPT_FLAGS" \
-	"CDEBUGFLAGS=" "CCOPTIONS=$RPM_OPT_FLAGS" \
-	"CXXDEBUGFLAGS=" "CXXOPTIONS=$RPM_OPT_FLAGS"
+	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} \
-	$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
 
-strip --strip-unneeded $RPM_BUILD_ROOT%{_bindir}/fvwm \
-	$RPM_BUILD_ROOT%{_libdir}/X11/fvwm/* || :
+install -d $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT/usr/X11R6/bin/fvwm $RPM_BUILD_ROOT%{_bindir}/fvwm
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/*/*
+install -d $RPM_BUILD_ROOT%{_mandir}
+mv $RPM_BUILD_ROOT/usr/X11R6/man/man1 $RPM_BUILD_ROOT%{_mandir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,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}/*/*