%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 gnome # with gnome-libs and wm-properties
%bcond_with rplay # with internal sound support (through rplay)
-#
%include /usr/lib/rpm/macros.perl
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(fr): F(?) Virtual Window Manager
-Summary(ja): ²þÎÉÈÇ FVWM - X ÍÑ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã
-Summary(tr): Yaygýn bir pencere denetleyicisi
-Summary(pl): Ulepszona wersja zarz±dcy okien FVWM
-Summary(pt_BR): Gerenciador de janelas semelhante ao mwm
-Summary(ru): ÷ÉÒÔÕÁÌØÎÙÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ F(?)
+Summary(de.UTF-8): F(?) Virtual Window Manager
+Summary(es.UTF-8): Administrador de ventanas semejante al mwm
+Summary(fr.UTF-8): F(?) Virtual Window Manager
+Summary(ja.UTF-8): 改良版 FVWM - X 用ウィンドウマネージャ
+Summary(pl.UTF-8): Ulepszona wersja zarządcy okien FVWM
+Summary(pt_BR.UTF-8): Gerenciador de janelas semelhante ao mwm
+Summary(ru.UTF-8): Виртуальный оконный менеджер F(?)
+Summary(tr.UTF-8): Yaygın bir pencere denetleyicisi
Name: fvwm2
-Version: 2.5.16
+Version: 2.6.5
Release: 1
License: GPL
Group: X11/Window Managers
Source0: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
-# Source0-md5: 78eb609bd913868f659034173292b9bd
-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: mozilla.xpm
-Source6: %{name}-xsession.desktop
+# Source0-md5: 090ba4e0c517e8b94f71317951530f69
+Source1: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm_icons-20070101.tar.bz2
+# Source1-md5: 2ab5ee60a96830af23a43855e33afc7d
+Source2: %{name}-system.%{name}rc.tar.gz
+# Source2-md5: 22c1f6c5ab4bd84376daa37debd3e889
+Source3: %{name}.RunWM
+Source4: %{name}-xsession.desktop
+Source5: %{name}.desktop
+Source6: mozilla.xpm
Patch0: %{name}-paths.patch
Patch1: FvwmPager.patch
Patch2: %{name}-locale_names.patch
Patch3: %{name}-varia.patch
+Patch5: %{name}-xft2-link.patch
+Patch7: %{name}-aclocal.patch
+Patch8: %{name}-format-string.patch
URL: http://www.fvwm.org/
BuildRequires: autoconf
BuildRequires: automake
%{?with_fribidi:BuildRequires: fribidi-devel}
%{?with_gnome:BuildRequires: gnome-libs-devel}
BuildRequires: gtk+-devel
-BuildRequires: libpng-devel
+BuildRequires: libpng-devel >= 1.4
%{?with_stroke:BuildRequires: libstroke-devel}
+BuildRequires: pkgconfig
BuildRequires: readline-devel >= 4.2
%{?with_rplay:BuildRequires: rplay-devel}
BuildRequires: rpm-perlprov
%{?with_xft:BuildRequires: xorg-lib-libXft-devel}
BuildRequires: xorg-lib-libXpm-devel
BuildRequires: xorg-lib-libXt-devel
-Requires(post): vfmg >= 0.9.18-2
+BuildRequires: librsvg-devel
+BuildRequires: imlib-devel
+Requires(post): vfmg >= 0.9.95
Requires: fvwm2-icons = %{version}-%{release}
Requires: m4
Requires: vfmg >= 0.9.18-2
-Requires: xinitrc-ng
Obsoletes: fvwm95
+Conflicts: filesystem < 3.0-20
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/X11/fvwm2
-%define _wmpropsdir /usr/share/wm-properties
+%define _wmpropsdir /usr/share/gnome/wm-properties
%description
FVWM2 (the F stands for whatever you want, but the VWM stands for
manager for the X Window System and shares the same characteristics as
FVWM.
-%description -l es
-Fvwm2 es una versión del popular administrador de ventanas "Feeble
+%description -l es.UTF-8
+Fvwm2 es una versión del popular administrador de ventanas "Feeble
Virtual Window Manager".
-%description -l ja
-FVWM2 (F¤Ï¹¥¤¤Ê¤è¤¦¤Ë²ò¼á¤·¤Æ¤¯¤À¤µ¤¤¡£¤¿¤À¤·¡¢ VWM ¤Ï Virtual Window
-Manager ¤ò¾Êά¤·¤¿¤â¤Î¤Ç¤¹¡£)¤Ï FVWM ¤ÈƱ¤¸ÆÃħ¤ò»ý¤Á ¹¹¤Ë³ÈÄ¥¤µ¤ì¤¿ X
-Window System ÍÑ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ç¤¹¡£
+%description -l ja.UTF-8
+FVWM2 (Fは好きなように解釈してください。ただし、 VWM は Virtual Window
+Manager を省略したものです。)は FVWM と同じ特徴を持ち 更に拡張された X
+Window System 用ウィンドウマネージャです。
-%description -l pl
-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.
+%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 ulepszona wersja zarządcy okien dla systemu X Window FVWM i
+posiadająca te same cechy.
-%description -l pt_BR
-Fvwm2 é uma versão do popular gerenciador de janelas "Feeble Virtual
+%description -l pt_BR.UTF-8
+Fvwm2 é uma versão do popular gerenciador de janelas "Feeble Virtual
Window Manager".
-%description -l ru
-fvwm2 - ÜÔÏ ×ÅÒÓÉÑ ÐÏÐÕÌÑÒÎÏÇÏ "Feeble Virtual Window Manager".
+%description -l ru.UTF-8
+fvwm2 - это версия популярного "Feeble Virtual Window Manager".
%package icons
Summary: Graphic files used by the FVWM and FVWM2 window managers
-Summary(de): Symbole und Pixmaps für fvwm
-Summary(fr): Icônes et pixmaps pour fvwm
-Summary(pl): Pliki graficzne u¿ywane przez zarz±dców okien FVWM i FVWM2
-Summary(ru): ðÉËÔÏÇÒÁÍÍÙ É ÒÁÓÔÒÏ×ÙÅ ËÁÒÔÉÎËÉ ÄÌÑ fvwm2
-Summary(tr): Fvwm için çeþitli minik görüntü ve simgeler
+Summary(de.UTF-8): Symbole und Pixmaps für fvwm
+Summary(fr.UTF-8): Icônes et pixmaps pour fvwm
+Summary(pl.UTF-8): Pliki graficzne używane przez zarządców okien FVWM i FVWM2
+Summary(ru.UTF-8): Пиктограммы и растровые картинки для fvwm2
+Summary(tr.UTF-8): Fvwm için çeşitli minik görüntü ve simgeler
Group: X11/Window Managers
Obsoletes: fvwm95-icons
%description icons
This package contains icons, bitmaps and pixmaps for fvwm and fvwm2.
-%description icons -l de
-Dieses Paket enthält Symbole, Bitmaps und Pixmaps für fvwm und fvwm2.
+%description icons -l de.UTF-8
+Dieses Paket enthält Symbole, Bitmaps und Pixmaps für fvwm und fvwm2.
-%description icons -l fr
+%description icons -l fr.UTF-8
Ce package contient des icones, bitmaps et pixmaps pour fvwm et fvwm2.
-%description icons -l pl
+%description icons -l pl.UTF-8
Ten pakiet zawiera ikony, bitmapy i pixmapy dla fvwm i fvwm2.
-%description icons -l ru
-üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÐÉËÔÏÇÒÁÍÍÙ É ÐÒÏÞÉÅ ËÁÒÔÉÎËÉ ÄÌÑ fvwm2.
+%description icons -l ru.UTF-8
+Этот пакет содержит пиктограммы и прочие картинки для fvwm2.
-%description icons -l tr
-Fvwm için çeþitli minik görüntü ve simgeler.
+%description icons -l tr.UTF-8
+Fvwm için çeşitli minik görüntü ve simgeler.
%package perl
Summary: fvwm-perllib, FvwmPerl and dependent modules
-Summary(pl): fvwm-perllib, FvwmPerl i zale¿ne modu³y
+Summary(pl.UTF-8): fvwm-perllib, FvwmPerl i zależne moduły
Group: X11/Window Managers/Tools
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
%description perl
fvwm-perllib, FvwmPerl and dependent modules.
-%description perl -l pl
-fvwm-perllib, FvwmPerl i zale¿ne modu³y.
+%description perl -l pl.UTF-8
+fvwm-perllib, FvwmPerl i zależne moduły.
%prep
-%setup -n fvwm-%{version} -q -a1 -a3
+%setup -n fvwm-%{version} -q -a1 -a2
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch5 -p1
+%patch7 -p1
+%patch8 -p1
mv -f po/FvwmScript.sv{_SE,}.po
mv -f po/FvwmTaskBar.sv{_SE,}.po
--disable-command-log \
%{!?with_fribidi:--disable-bidi} \
%{!?with_xft:--disable-xft} \
- --enable-multibyte \
--enable-shape \
--enable-sm \
%{?with_gnome:--with-gnome}%{!?with_gnome:--without-gnome} \
--with-iconv-library=no \
--without-termcap-library
-%{__make}
+%{__make} -j1
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
install -d \
- $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle,%{_wmpropsdir}} \
+ $RPM_BUILD_ROOT{%{_sysconfdir},%{_wmpropsdir}} \
$RPM_BUILD_ROOT{%{_datadir}/{locale,xsessions},%{_pixmapsdir}/mini}
install system.fvwm2rc $RPM_BUILD_ROOT%{_sysconfdir}/system.fvwm2rc
install fvwm2.menu.m4 $RPM_BUILD_ROOT%{_sysconfdir}
-install icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+install fvwm_icons-20070101/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
-mv $RPM_BUILD_ROOT%{_pixmapsdir}/mini-*.xpm \
+mv $RPM_BUILD_ROOT%{_pixmapsdir}/mini.*.xpm \
$RPM_BUILD_ROOT%{_pixmapsdir}/mini
# 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%{_pixmapsdir}
-install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
+install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/fvwm2-session
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
+%{?with_gnome:install %{SOURCE5} $RPM_BUILD_ROOT%{_wmpropsdir}}
+install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir}
+
touch $RPM_BUILD_ROOT%{_sysconfdir}/fvwm2.menu2
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xpmroot.1
# 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 ||:
+ vfmg fvwm2 >/etc/X11/fvwm2/fvwm2.menu2 2>/dev/null ||:
%files -f %{name}.lang
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fvwm2.menu.m4
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/system.fvwm2rc
%ghost %{_sysconfdir}/fvwm2.menu2
-%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
%attr(755,root,root) %{_bindir}/[!f]*
%attr(755,root,root) %{_bindir}/fvwm
-%attr(755,root,root) %{_bindir}/fvwm2
%attr(755,root,root) %{_bindir}/fvwm-[!p]*
+%attr(755,root,root) %{_bindir}/fvwm2
+%attr(755,root,root) %{_bindir}/fvwm2-session
%dir %{_libdir}/fvwm
-%attr(755,root,root) %{_libdir}/fvwm/Fvwm[!DGPW]*
+%attr(755,root,root) %{_libdir}/fvwm/Fvwm[!DGPWT]*
%attr(755,root,root) %{_libdir}/fvwm/FvwmD[!e]*
%attr(755,root,root) %{_libdir}/fvwm/FvwmGtk
%attr(755,root,root) %{_libdir}/fvwm/FvwmP[!e]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmT[!a]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmTalk
+%attr(755,root,root) %{_libdir}/fvwm/FvwmTaskBar
%attr(755,root,root) %{_libdir}/fvwm/FvwmW[!i]*
%attr(755,root,root) %{_libdir}/fvwm/FvwmWinList
%dir %{_datadir}/fvwm
%{_datadir}/fvwm/[!p]*
%{_datadir}/xsessions/%{name}.desktop
-%{_wmpropsdir}/fvwm2.desktop
+%{_datadir}/locale/ar/LC_MESSAGES/FvwmScript.mo
+%{?with_gnome:%{_wmpropsdir}/fvwm2.desktop}
%{_mandir}/man1/[!Ff]*.1*
%{_mandir}/man1/Fvwm[!DGPW]*.1*
%{_mandir}/man1/FvwmD[!e]*.1*
%{_mandir}/man1/FvwmWinList.1*
%{_mandir}/man1/fvwm.1*
%{_mandir}/man1/fvwm-[!p]*.1*
+%{_mandir}/man1/fvwm2.1*
+%{_mandir}/man1/FvwmGtk.1.*
%files icons
%defattr(644,root,root,755)
%{_pixmapsdir}/*.xpm
+%dir %{_pixmapsdir}/mini
%{_pixmapsdir}/mini/*.xpm
%files perl
%attr(755,root,root) %{_libdir}/fvwm/FvwmDebug
%attr(755,root,root) %{_libdir}/fvwm/FvwmGtkDebug
%attr(755,root,root) %{_libdir}/fvwm/FvwmPerl
+%attr(755,root,root) %{_libdir}/fvwm/FvwmTabs
%attr(755,root,root) %{_libdir}/fvwm/FvwmWindowMenu
%{_datadir}/fvwm/perllib
%{_mandir}/man1/fvwm-perllib.1*
projects / packages / fvwm2.git / blobdiff