X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fvwm2.spec;h=b238ab5799553d6e172af3b7850c74f3d5768675;hb=0860444189fbd0e9ec3aa930868c7dfb6a5da966;hp=8a03ac0242d95035201b094e4c50ec57e9954907;hpb=1d0d5f68afc270d5bdac3d562520c1a7a6fb6b0c;p=packages%2Ffvwm2.git

diff --git a/fvwm2.spec b/fvwm2.spec
index 8a03ac0..b238ab5 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -1,3 +1,14 @@
+#
+# 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
+#
+%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
@@ -8,37 +19,40 @@ Summary(pl):	Ulepszona wersja zarz
 Summary(pt_BR):	Gerenciador de janelas semelhante ao mwm
 Summary(ru):	÷ÉÒÔÕÁÌØÎÙÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ F(?)
 Name:		fvwm2
-Version:	2.4.3
-Release:	4
+Version:	2.5.6
+Release:	1
 License:	GPL
 Group:		X11/Window Managers
-Group(de):	X11/Fenstermanager
-Group(es):	X11/Administraadores De Ventanas
-Group(fr):	X11/Gestionnaires De Fenêtres
-Group(pl):	X11/Zarz±dcy Okien
-Source0:	ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.gz
+Source0:	ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
+# Source0-md5:	2966bd304449604ce5fb21f2cfbb3a80
 Source1:	fvwm-2.0.46.icons.tar.gz
 Source2:	%{name}.desktop
 Source3:	%{name}-system.%{name}rc.tar.gz
 Source4:	%{name}.RunWM
 Source5:	%{name}.wm_style
 Patch0:		%{name}-paths.patch
+Patch1:		FvwmIconMan.patch
 URL:		http://www.fvwm.org/
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Requires:	fvwm2-icons
-Requires:	wmconfig >= 0.9.10-6
-Requires:	m4
-Requires:	xinitrc >= 3.0
+%{!?_without_xft:BuildRequires:	Xft-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
+%{?_with_fribidi:BuildRequires:	fribidi-devel}
+%{?_with_gnome:BuildRequires:	gnome-libs-devel}
 BuildRequires:	gtk+-devel
+BuildRequires:	libpng-devel
+%{!?_without_stroke:BuildRequires:	libstroke-devel}
 BuildRequires:	readline-devel >= 4.2
+%{?_with_rplay:BuildRequires:	rplay-devel}
+BuildRequires:	rpm-perlprov
+Requires:	fvwm2-icons
+Requires:	wmconfig >= 0.9.10-6
+Requires:	m4
+Requires:	xinitrc >= 3.0
 Obsoletes:	fvwm95
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
 %define		_sysconfdir	/etc/X11/fvwm2
-%define		_wmpropsdir	%{_datadir}/wm-properties
+%define		_wmpropsdir	/usr/share/wm-properties
 
 %description
 FVWM2 (the F stands for whatever you want, but the VWM stands for
@@ -46,10 +60,6 @@ Virtual Window Manager) is an improved version of the FVWM window
 manager for the X Window System and shares the same characteristics as
 FVWM.
 
-Install the fvwm2 package if you'd like to use the FVWM2 window
-manager. If you install fvwm2, you'll also need to install
-fvwm2-icons.
-
 %description -l es
 Fvwm2 es una versión del popular administrador de ventanas "Feeble
 Virtual Window Manager".
@@ -59,19 +69,11 @@ FVWM2 (F
 Manager ¤ò¾Êά¤·¤¿¤â¤Î¤Ç¤¹¡£)¤Ï FVWM ¤ÈƱ¤¸ÆÃħ¤ò»ý¤Á ¹¹¤Ë³ÈÄ¥¤µ¤ì¤¿ X
 Window System ÍÑ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ç¤¹¡£
 
-FVWM2 ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢ fvwm2
-¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë ¤·¤Æ¤¯¤À¤µ¤¤¡£ fvwm2
-¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï fvwm2-icons ¥Ñ¥Ã¥±¡¼¥¸ ¤âɬÍפǤ¹¡£
-
 %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 ulepszona wersja mened¿era okien dla systemu X Window FVWM i
-posiada te same cechy.
-
-Nale¿y zainstalowaæ pakiet fvwm2 jesli chce siê uzywaæ mened¿era okien
-FVWM2. Instaluj±c fvwm2 nalezy równiez zainstalowaæ pakiet
-fvwm2-icons.
+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
@@ -88,10 +90,6 @@ Summary(pl):	Pliki graficzne u
 Summary(ru):	ðÉËÔÏÇÒÁÍÍÙ É ÒÁÓÔÒÏ×ÙÅ ËÁÒÔÉÎËÉ ÄÌÑ fvwm2
 Summary(tr):	Fvwm için çeþitli minik görüntü ve simgeler
 Group:		X11/Window Managers
-Group(de):	X11/Fenstermanager
-Group(es):	X11/Administraadores De Ventanas
-Group(fr):	X11/Gestionnaires De Fenêtres
-Group(pl):	X11/Zarz±dcy Okien
 Obsoletes:	fvwm95-icons
 
 %description icons
@@ -112,45 +110,61 @@ Ten pakiet zawiera ikony, bitmapy i pixmapy dla fvwm i fvwm2.
 %description icons -l tr
 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
+Group:		X11/Window Managers/Tools
+Requires:	%{name} = %{version}
+
+%description perl
+fvwm-perllib, FvwmPerl and dependent modules.
+
+%description perl -l pl
+fvwm-perllib, FvwmPerl i zale¿ne modu³y.
+
 %prep
 %setup -n fvwm-%{version} -q -a1 -a3
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
-aclocal
-autoconf
-automake -a -c
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" \
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
-	--disable-package-subdirs \
 	--disable-dmalloc \
 	--disable-efence \
-	--disable-debug-msgs \
+	--%{!?debug:dis}%{?debug:en}able-debug-msgs \
 	--disable-command-log \
+	%{!?_with_fribidi:--disable-bidi} \
+	%{?_without_xft:--disable-xft} \
 	--enable-multibyte \
 	--enable-shape \
-	--disable-gnome \
 	--enable-sm \
-	--disable-xinerama \
+	%{?_with_gnome:--with-gnome}%{!?_with_gnome:--without-gnome} \
 	--with-xpm-library \
-	--with-rplay-library \
+	%{!?_with_rplay:--without-rplay-library} \
 	--with-stroke-library \
+	--with-ncurses-library \
 	--with-readline-library \
 	--with-ncurses-library \
-	--with-gnome
+	--without-termcap-library
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm2},%{_wmpropsdir}}
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle,%{_wmpropsdir},%{_datadir}/locale}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install system.fvwm2rc $RPM_BUILD_ROOT%{_sysconfdir}
+%find_lang %{name} --all-name
+
+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 fvwm2.menu.m4 $RPM_BUILD_ROOT%{_sysconfdir}
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
@@ -167,29 +181,39 @@ install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
 # conflicts with gimp
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/{folder,question}.xpm
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/wm-properties{,_}
-install -d $RPM_BUILD_ROOT%{_wmpropsdir}
-mv -f $RPM_BUILD_ROOT{%{_datadir}/wm-properties_,%{_wmpropsdir}/fvwm2.desktop}
-
-gzip -9fn README AUTHORS NEWS
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc {README,AUTHORS,NEWS,ChangeLog}.gz
-%doc docs
+%doc README AUTHORS NEWS docs
 %dir /etc/X11/fvwm2
-%config(noreplace) /etc/X11/fvwm2/*
+%config(noreplace) %verify(not size mtime md5) /etc/X11/fvwm2/*
 %attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
 /etc/sysconfig/wmstyle/*.names
-%attr(755,root,root) %{_libdir}/Fvwm*
-%attr(755,root,root) %{_bindir}/*
+%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/FvwmD[!e]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmGtk
+%attr(755,root,root) %{_libdir}/fvwm/FvwmP[!e]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmW[!i]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmWinList
 %dir %{_datadir}/fvwm
-%{_datadir}/fvwm/*
+%{_datadir}/fvwm/[!p]*
 %{_wmpropsdir}/fvwm2.desktop
-%{_mandir}/man1/*
+%{_mandir}/man1/[!Ff]*.1*
+%{_mandir}/man1/Fvwm[!DGPW]*.1*
+%{_mandir}/man1/FvwmD[!e]*.1*
+%{_mandir}/man1/FvwmGtk.1*
+%{_mandir}/man1/FvwmP[!e]*.1*
+%{_mandir}/man1/FvwmW[!i]*.1*
+%{_mandir}/man1/FvwmWinList.1*
+%{_mandir}/man1/fvwm.1*
+%{_mandir}/man1/fvwm-[!p]*.1*
 
 %files icons
 %defattr(644,root,root,755)
@@ -197,3 +221,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/icons/mini
 %{_datadir}/icons/*.xpm
 %{_datadir}/icons/mini/*.xpm
+
+%files perl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fvwm-perllib
+%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/FvwmWindowMenu
+%{_datadir}/fvwm/perllib
+%{_mandir}/man1/fvwm-perllib.1*
+%{_mandir}/man1/FvwmDebug.1*
+%{_mandir}/man1/FvwmGtkDebug.1*
+%{_mandir}/man1/FvwmPerl.1*
+%{_mandir}/man1/FvwmWindowMenu.1*