X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fvwm2.spec;h=4c525945c68504a2637b192f70c80d5aae4f0546;hb=f055bf2d730d8b18b302a8421962a6ea741a7df8;hp=8d1bee270782f7212c73441141d39e5a9a71704c;hpb=53151870a5ea68886fdc87379ffb709de85ac870;p=packages%2Ffvwm2.git

diff --git a/fvwm2.spec b/fvwm2.spec
index 8d1bee2..4c52594 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -10,21 +10,21 @@
 #
 %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.10
-Release:	3
+Version:	2.5.21
+Release:	1
 License:	GPL
 Group:		X11/Window Managers
 Source0:	ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
-# Source0-md5:	b3c86e2af2a4eabe692c9c849ff4b243
+# Source0-md5:	c11efef91420e686d54f772e7162e879
 Source1:	fvwm-2.0.46.icons.tar.gz
 # Source1-md5:	8d81420cf49442fca4bb2b61ae54eeb9
 Source2:	%{name}.desktop
@@ -34,12 +34,10 @@ Source4:	%{name}.RunWM
 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
+Patch1:		FvwmPager.patch
+Patch2:		%{name}-locale_names.patch
+Patch3:		%{name}-varia.patch
 URL:		http://www.fvwm.org/
-%{?with_xft:BuildRequires:	xft-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_fribidi:BuildRequires:	fribidi-devel}
@@ -50,12 +48,13 @@ BuildRequires:	libpng-devel
 BuildRequires:	readline-devel >= 4.2
 %{?with_rplay:BuildRequires:	rplay-devel}
 BuildRequires:	rpm-perlprov
-Requires(post):	vfmg >= 0.9.18-2
+%{?with_xft:BuildRequires:	xorg-lib-libXft-devel}
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-lib-libXt-devel
+Requires(post):	vfmg >= 0.9.95
 Requires:	fvwm2-icons = %{version}-%{release}
 Requires:	m4
 Requires:	vfmg >= 0.9.18-2
-Requires:	xinitrc-ng
-Requires:	XFree86-tools
 Obsoletes:	fvwm95
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -68,67 +67,67 @@ Virtual Window Manager) is an improved version of the FVWM window
 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
@@ -136,7 +135,6 @@ fvwm-perllib, FvwmPerl i zale
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 mv -f po/FvwmScript.sv{_SE,}.po
 mv -f po/FvwmTaskBar.sv{_SE,}.po
@@ -194,7 +192,10 @@ 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
-touch $RPM_BUILD_ROOT/etc/X11/fvwm2/fvwm2.menu2
+touch $RPM_BUILD_ROOT%{_sysconfdir}/fvwm2.menu2
+
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xpmroot.1
+echo ".so fvwm-root.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xpmroot.1
 
 %find_lang %{name} --all-name
 
@@ -204,26 +205,28 @@ 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 ||:
+[ "$FVWM2" = yes -o "$FVWM2" = 1 -o ! -f /etc/X11/fvwm2/fvwm2.menu2 ] && \
+	vfmg 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/fvwm2.menu.m4
-%config(noreplace) %verify(not size mtime md5) /etc/X11/fvwm2/system.fvwm2rc
-%ghost /etc/X11/fvwm2/fvwm2.menu2
+%dir %{_sysconfdir}
+%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]*
 %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/FvwmTaskBar
 %attr(755,root,root) %{_libdir}/fvwm/FvwmW[!i]*
 %attr(755,root,root) %{_libdir}/fvwm/FvwmWinList
 %dir %{_datadir}/fvwm
@@ -242,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 %files icons
 %defattr(644,root,root,755)
 %{_pixmapsdir}/*.xpm
+%dir %{_pixmapsdir}/mini
 %{_pixmapsdir}/mini/*.xpm
 
 %files perl
@@ -250,6 +254,7 @@ rm -rf $RPM_BUILD_ROOT
 %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*