X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffvwm.git;a=blobdiff_plain;f=fvwm.spec;h=8e7609ecfaf8048dbb99485eb8f179cc0a0cf094;hp=f713b2459f0f87e086b98cb1a02084000881db38;hb=6b73dab27cbe6fcea5b0f289887c73d7d53bf7cc;hpb=87fd9e135b6afd229ed50681f9dd39ea1eed2f21

diff --git a/fvwm.spec b/fvwm.spec
index f713b24..8e7609e 100644
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -1,34 +1,41 @@
 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
+Summary(es.UTF-8):	Administrador de Ventanas: Feeble (Fine?) Virtual Window Manager
+Summary(de.UTF-8):	Feeble (Fine?) Virtual Window Manager
+Summary(fr.UTF-8):	Feeble (Fine ?) Virtual Window Manager
+Summary(pl.UTF-8):	Zarządca okien dla X Window System
+Summary(pt.UTF-8):	Gerenciador de Janelas: Feeble (Fine?) Virtual Window Manager
+Summary(tr.UTF-8):	X11 için pencere denetleyicisi
 Name:		fvwm
 Version:	1.24r
-Release:	24
+Release:	29
 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:	xinitrc >= 3.0
+Requires:	vfmg >= 0.9.18-3
+Conflicts:	filesystem < 3.0-20
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
-%define		_wmpropsdir	%{_datadir}/wm-properties
+%define		_wmpropsdir	/usr/share/gnome/wm-properties
+%define		_sysconfdir	/etc/X11/fvwm
 
 %description
 FVWM (the F stands for whatever you want, but the VWM stands for
@@ -38,24 +45,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
+%description -l es.UTF-8
+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.
-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.
+%description -l pl.UTF-8
+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ł 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".
+%description -l pt.UTF-8
+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
@@ -64,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} \
@@ -79,28 +87,46 @@ xmkmf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm},%{_wmpropsdir}}
+install -d \
+	$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%{_libdir}/fvwm1/fvwm $RPM_BUILD_ROOT%{_bindir}/fvwm1
+
+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 %{_libdir}/X11/fvwm
-%attr(755,root,root) %{_libdir}/X11/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}/*/*