# TODO: more updates in system.fvwm2rc (see warnings on run)
#
# Conditional build:
-# _with_fribidi - with bidirectional text support
-# _with_gnome - with gnome-libs
-# _with_rplay - with internal sound support (through rplay)
-# _without_stroke - without mouse strokes (gestures) support
-# _without_xft - without Xft (1 or 2) support
+%bcond_without stroke # without mouse strokes (gestures) support
+%bcond_without xft # without Xft (1 or 2) support
+%bcond_with fribidi # with bidirectional text support
+%bcond_with gnome # with gnome-libs
+%bcond_with rplay # with internal sound support (through rplay)
#
%include /usr/lib/rpm/macros.perl
-%define snap 20031101
Summary: An improved version of the FVWM X-based window manager
Summary(de): F(?) Virtual Window Manager
Summary(es): Administrador de ventanas semejante al mwm
Summary(pt_BR): Gerenciador de janelas semelhante ao mwm
Summary(ru): ÷ÉÒÔÕÁÌØÎÙÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ F(?)
Name: fvwm2
-Version: 2.5.8
-Release: 0.%{snap}.1
+Version: 2.5.10
+Release: 3
License: GPL
Group: X11/Window Managers
-Source0: ftp://ftp.fvwm.org/pub/fvwm/devel/snapshots/fvwm-snap-%{snap}.tar.gz
-# Source0-md5: f1139cb5c5f82097a4bbfd3e5e7d4957
+Source0: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
+# Source0-md5: b3c86e2af2a4eabe692c9c849ff4b243
Source1: fvwm-2.0.46.icons.tar.gz
# Source1-md5: 8d81420cf49442fca4bb2b61ae54eeb9
Source2: %{name}.desktop
Source3: %{name}-system.%{name}rc.tar.gz
# Source3-md5: 22c1f6c5ab4bd84376daa37debd3e889
Source4: %{name}.RunWM
-Source5: %{name}.wm_style
+Source5: mozilla.xpm
Source6: %{name}-xsession.desktop
Patch0: %{name}-paths.patch
Patch1: FvwmIconMan.patch
Patch2: FvwmPager.patch
+Patch3: %{name}-locale_names.patch
+Patch4: %{name}-varia.patch
URL: http://www.fvwm.org/
-%{!?_without_xft:BuildRequires: Xft-devel}
+%{?with_xft:BuildRequires: xft-devel}
BuildRequires: autoconf
BuildRequires: automake
-%{?_with_fribidi:BuildRequires: fribidi-devel}
-%{?_with_gnome:BuildRequires: gnome-libs-devel}
+%{?with_fribidi:BuildRequires: fribidi-devel}
+%{?with_gnome:BuildRequires: gnome-libs-devel}
BuildRequires: gtk+-devel
BuildRequires: libpng-devel
-%{!?_without_stroke:BuildRequires: libstroke-devel}
+%{?with_stroke:BuildRequires: libstroke-devel}
BuildRequires: readline-devel >= 4.2
-%{?_with_rplay:BuildRequires: rplay-devel}
+%{?with_rplay:BuildRequires: rplay-devel}
BuildRequires: rpm-perlprov
-Requires: fvwm2-icons
-Requires: wmconfig >= 0.9.10-6
+Requires(post): vfmg >= 0.9.18-2
+Requires: fvwm2-icons = %{version}-%{release}
Requires: m4
-Requires: xinitrc >= 3.0
+Requires: vfmg >= 0.9.18-2
+Requires: xinitrc-ng
Requires: XFree86-tools
Obsoletes: fvwm95
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Window System ÍÑ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ç¤¹¡£
%description -l pl
-FVWM (za F mo¿na sobie podstawic co kto woli, lecz VWM pochodzi od
+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 ulepszona wersja zarz±dcy okien dla systemu X Window FVWM i
posiadaj±ca te same cechy.
fvwm-perllib, FvwmPerl i zale¿ne modu³y.
%prep
-%setup -n fvwm-snap-%{snap} -q -a1 -a3
+%setup -n fvwm-%{version} -q -a1 -a3
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+mv -f po/FvwmScript.sv{_SE,}.po
+mv -f po/FvwmTaskBar.sv{_SE,}.po
+mv -f po/fvwm.sv{_SE,}.po
%build
rm -f missing
--disable-efence \
--%{!?debug:dis}%{?debug:en}able-debug-msgs \
--disable-command-log \
- %{!?_with_fribidi:--disable-bidi} \
- %{?_without_xft:--disable-xft} \
+ %{!?with_fribidi:--disable-bidi} \
+ %{!?with_xft:--disable-xft} \
--enable-multibyte \
--enable-shape \
--enable-sm \
- %{?_with_gnome:--with-gnome}%{!?_with_gnome:--without-gnome} \
+ %{?with_gnome:--with-gnome}%{!?with_gnome:--without-gnome} \
--with-xpm-library \
- %{!?_with_rplay:--without-rplay-library} \
+ %{!?with_rplay:--without-rplay-library} \
--with-stroke-library \
--with-ncurses-library \
--with-readline-library \
--with-ncurses-library \
+ --with-iconv-library=no \
--without-termcap-library
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle,%{_wmpropsdir},%{_datadir}/{locale,xsessions}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name} --all-name
+install -d \
+ $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle,%{_wmpropsdir}} \
+ $RPM_BUILD_ROOT{%{_datadir}/{locale,xsessions},%{_pixmapsdir}/mini}
-sed -e 's@^ModulePath.*@ModulePath /usr/lib/fvwm:/usr/share/fvwm@;s@^PixmapPath.*@@' \
- -e 's@^IconPath.*@ImagePath /usr/share/pixmaps:/usr/X11R6/share/pixmaps:/usr/X11R6/include/X11/pixmaps:/usr/X11R6/include/X11/bitmaps:/usr/share/icons:/usr/share/icons/mini@' \
- system.fvwm2rc > $RPM_BUILD_ROOT%{_sysconfdir}/system.fvwm2rc
+install system.fvwm2rc $RPM_BUILD_ROOT%{_sysconfdir}/system.fvwm2rc
install fvwm2.menu.m4 $RPM_BUILD_ROOT%{_sysconfdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
-install -d $RPM_BUILD_ROOT%{_datadir}/icons/mini
+install icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
-install icons/*.xpm $RPM_BUILD_ROOT%{_datadir}/icons
-mv -f $RPM_BUILD_ROOT%{_datadir}/icons/mini-*.xpm $RPM_BUILD_ROOT%{_datadir}/icons/mini
+mv $RPM_BUILD_ROOT%{_pixmapsdir}/mini-*.xpm \
+ $RPM_BUILD_ROOT%{_pixmapsdir}/mini
-install %{SOURCE2} $RPM_BUILD_ROOT%{_wmpropsdir}
+# Conflicts with wmmaker
+mv $RPM_BUILD_ROOT%{_pixmapsdir}/xv{,-fvwm}.xpm
+install %{SOURCE2} $RPM_BUILD_ROOT%{_wmpropsdir}
install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
+install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}
install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
+touch $RPM_BUILD_ROOT/etc/X11/fvwm2/fvwm2.menu2
-# conflicts with gimp
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/{folder,question}.xpm
+%find_lang %{name} --all-name
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+# generate initial menu
+[ -f /etc/sysconfig/vfmg ] && . /etc/sysconfig/vfmg
+[ $FVWM2 = yes -o $FVWM2 = 1 -o ! -f /etc/X11/fvwm2/fvwm2.menu2 ] && \
+ vfmg -i -f -x -c fvwm2 >/etc/X11/fvwm2/fvwm2.menu2 2>/dev/null ||:
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc README AUTHORS NEWS docs
%dir /etc/X11/fvwm2
-%config(noreplace) %verify(not size mtime md5) /etc/X11/fvwm2/*
+%config(noreplace) %verify(not size mtime md5) /etc/X11/fvwm2/fvwm2.menu.m4
+%config(noreplace) %verify(not size mtime md5) /etc/X11/fvwm2/system.fvwm2rc
+%ghost /etc/X11/fvwm2/fvwm2.menu2
%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
-/etc/sysconfig/wmstyle/*.names
%attr(755,root,root) %{_bindir}/[!f]*
%attr(755,root,root) %{_bindir}/fvwm
%attr(755,root,root) %{_bindir}/fvwm2
%files icons
%defattr(644,root,root,755)
-%dir %{_datadir}/icons
-%dir %{_datadir}/icons/mini
-%{_datadir}/icons/*.xpm
-%{_datadir}/icons/mini/*.xpm
+%{_pixmapsdir}/*.xpm
+%{_pixmapsdir}/mini/*.xpm
%files perl
%defattr(644,root,root,755)