X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fluxbox.spec;h=e5df2ba0f303abffa9c3c348fd149f22f8d36b17;hb=6820b4bd88f69f3eb1eda9be1e3ba8112f719d7e;hp=49bccd88ffe380286a30cc20c730f6125bb66af0;hpb=b964b7e53f7d59abe25cddd28095c120c3e78d40;p=packages%2Ffluxbox.git

diff --git a/fluxbox.spec b/fluxbox.spec
index 49bccd8..e5df2ba 100644
--- a/fluxbox.spec
+++ b/fluxbox.spec
@@ -1,38 +1,44 @@
-
-%define		snap 20040715
-
+#
+# Conditional build:
+%bcond_without	imlib2		# disable imlib2 (pixmap themes) support
+%bcond_with	old_wheel	# build with right wheel direction
+#
 Summary:	Fluxbox is a windowmanager that is based on Blackbox
 Summary(pl):	Ma³y i szybki zarz±dca okien dla X Window oparty o Blackbox
 Summary(pt_BR):	Fluxbox é um gerenciador de janelas baseado no Blackbox
+Summary(de):	Fluxbox ist ein weiterer Window Manager für X
 Name:		fluxbox
-Version:	0.9.9
-Release:	0.%{snap}.1
+Version:	0.9.15.1
+Release:	1
 Epoch:		1
 License:	BSD-like
 Group:		X11/Window Managers
-#Source0:	http://dl.sourceforge.net/fluxbox/%{name}-%{version}.tar.bz2
-Source0:	http://ep09.pld-linux.org/~havner/%{name}-%{version}_%{snap}.tar.bz2
-# Source0-md5:	d624c1ccc8284c02ed1542defb77aea4
+Source0:	http://dl.sourceforge.net/fluxbox/%{name}-%{version}.tar.bz2
+# Source0-md5:	098eb36a09338aabb63b938a5eab9ef6
 Source1:	%{name}.desktop
-Source2:        %{name}-xsession.desktop
-Source3:        %{name}-pld.style
-Source4:        %{name}-pld.jpg
-Source5:        %{name}.menu
-Patch0:		%{name}-fontcache.patch
+Source2:	%{name}-xsession.desktop
+Source3:	%{name}-pld.style
+Source4:	%{name}-pld.jpg
+Source5:	%{name}.menu
+Patch0:		%{name}-dont_generate_menu.patch
+Patch1:		%{name}-wheel_direction.patch
 URL:		http://fluxbox.sourceforge.net/
-BuildRequires:	XFree86-devel
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
+BuildRequires:	gettext-devel
+%{?with_imlib2:BuildRequires:	imlib2-devel >= 1.0.0}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-BuildRequires:	xft-devel
-BuildRequires:	xrender-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXinerama-devel
+%{?with_imlib2:BuildRequires:	xorg-lib-libXpm-devel}
+BuildRequires:	xorg-lib-libXrandr-devel
 Requires(post):	vfmg >= 0.9.16-3
 Requires:	vfmg >= 0.9.16-3
 Requires:	xinitrc-ng
 Provides:	blackbox
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	blackbox
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _sysconfdir     /etc/X11/%{name}
 %define		_wmpropsdir	/usr/share/wm-properties
@@ -58,12 +64,21 @@ Blackbox 0.61.1. Fluxbox tem a apar
 seus estilos, cores e temas. Então qual a diferença entre o fluxbox e
 o blackbox?
 
+%description -l de
+Fluxbox ist ein weiterer Window Manager für X basierend auf dem
+Quellcode von Blackbox 0.61.1. Fluxbox ähnelt Blackbox und behandelt
+Styles, Farben, Fensterplatzierungen und ähnliche Dinge genauso wie
+Blackbox. Es ist somit 100% kompatibel zu den Blackbox Themes und
+Styles.
+
 %prep
-%setup -q -n %{name}-%{version}_%{snap}
+%setup -q
 %patch0 -p1
+%{!?with_old_wheel:%patch1 -p1}
+
+echo "session.screen0.antialias: true" >> data/init.in
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal} -I .
 %{__autoheader}
@@ -72,7 +87,12 @@ rm -f missing
 %configure \
 	--enable-slit \
 	--enable-kde \
-	--enable-gnome
+	--enable-gnome \
+	--enable-xinerama \
+	--enable-nls \
+	--enable-xft \
+	--enable-xrandr \
+	%{?with_imlib2:--enable-imlib2}
 
 %{__make}
 
@@ -91,42 +111,52 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/wallpapers
 install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/fluxbox/menu
 touch $RPM_BUILD_ROOT%{_sysconfdir}/menu2
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/fluxbox/nls/no*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-vfmg -i -f -x -c -s fluxbox > %{_sysconfdir}/menu2 2>/dev/null
+# generate initial menu
+[ -f /etc/sysconfig/vfmg ] && . /etc/sysconfig/vfmg
+[ "$FLUXBOX" = yes -o "$FLUXBOX" = 1 -o ! -f %{_sysconfdir}/menu2 ] && \
+	vfmg -i -f -x -c -s fluxbox > %{_sysconfdir}/menu2 2>/dev/null ||:
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/menu2
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/menu2
 %dir %{_datadir}/fluxbox
 %{_datadir}/fluxbox/[!n]*
-#%dir %{_datadir}/fluxbox/nls
-#%{_datadir}/fluxbox/nls/C
-#%{_datadir}/fluxbox/nls/POSIX
-#%{_datadir}/fluxbox/nls/US_ASCII
-#%{_datadir}/fluxbox/nls/en*
-#%lang(bg) %{_datadir}/fluxbox/nls/bg*
-#%lang(da) %{_datadir}/fluxbox/nls/da*
-#%lang(de) %{_datadir}/fluxbox/nls/de*
-#%lang(es) %{_datadir}/fluxbox/nls/es*
-#%lang(et) %{_datadir}/fluxbox/nls/et*
-#%lang(fr) %{_datadir}/fluxbox/nls/fr*
-#%lang(it) %{_datadir}/fluxbox/nls/it*
-#%lang(ja) %{_datadir}/fluxbox/nls/ja*
-#%lang(lv) %{_datadir}/fluxbox/nls/lv*
-#%lang(nl) %{_datadir}/fluxbox/nls/nl*
-#%lang(pl) %{_datadir}/fluxbox/nls/pl*
-#%lang(pt) %{_datadir}/fluxbox/nls/pt_PT
-#%lang(pt_BR) %{_datadir}/fluxbox/nls/pt_BR
-#%lang(ru) %{_datadir}/fluxbox/nls/ru*
-#%lang(sl) %{_datadir}/fluxbox/nls/sl*
-#%lang(sv) %{_datadir}/fluxbox/nls/sv*
-#%lang(tr) %{_datadir}/fluxbox/nls/tr*
+%dir %{_datadir}/fluxbox/nls
+%{_datadir}/fluxbox/nls/C
+%lang(be) %{_datadir}/fluxbox/nls/be*
+%lang(bg) %{_datadir}/fluxbox/nls/bg*
+%lang(cs) %{_datadir}/fluxbox/nls/cs*
+%lang(da) %{_datadir}/fluxbox/nls/da*
+%lang(de) %{_datadir}/fluxbox/nls/de*
+%lang(el) %{_datadir}/fluxbox/nls/el*
+%lang(es) %{_datadir}/fluxbox/nls/es*
+%lang(et) %{_datadir}/fluxbox/nls/et*
+%lang(fr) %{_datadir}/fluxbox/nls/fr*
+%lang(it) %{_datadir}/fluxbox/nls/it*
+%lang(ja) %{_datadir}/fluxbox/nls/ja*
+%lang(ko) %{_datadir}/fluxbox/nls/ko*
+%lang(lv) %{_datadir}/fluxbox/nls/lv*
+%lang(nb) %{_datadir}/fluxbox/nls/nb*
+%lang(nl) %{_datadir}/fluxbox/nls/nl*
+%lang(pl) %{_datadir}/fluxbox/nls/pl*
+%lang(pt) %{_datadir}/fluxbox/nls/pt_PT
+%lang(pt_BR) %{_datadir}/fluxbox/nls/pt_BR
+%lang(ru) %{_datadir}/fluxbox/nls/ru*
+%lang(sl) %{_datadir}/fluxbox/nls/sl*
+%lang(sv) %{_datadir}/fluxbox/nls/sv*
+%lang(tr) %{_datadir}/fluxbox/nls/tr*
+%lang(uk) %{_datadir}/fluxbox/nls/uk*
+%lang(vi) %{_datadir}/fluxbox/nls/vi*
+%lang(zh_CN) %{_datadir}/fluxbox/nls/zh*
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/fluxbox.desktop
 %{_datadir}/wallpapers/*