X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fluxbox.spec;h=5fb8f82e925ccd93744cb4b3ac2dff27db159dd8;hb=f0047bc66a4b686cd4b5294c3161fb91d93b551b;hp=d7b8151415e8e547e7e3ca61a229bcc6e850040d;hpb=b709bf46abf94e5e49d6015a876c7d6220413a1d;p=packages%2Ffluxbox.git

diff --git a/fluxbox.spec b/fluxbox.spec
index d7b8151..5fb8f82 100644
--- a/fluxbox.spec
+++ b/fluxbox.spec
@@ -1,41 +1,40 @@
 #
 # Conditional build:
-%bcond_with	old_wheel	# build with right wheel direction
+%bcond_without	imlib2		# disable imlib2 (pixmap themes) support
 #
-%define		snap 20041111
-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:	Fluxbox - a windowmanager that is based on Blackbox
+Summary(de.UTF-8):	Fluxbox - ein weiterer Window Manager für X
+Summary(pl.UTF-8):	Mały i szybki zarządca okien dla X Window oparty o Blackbox
+Summary(pt_BR.UTF-8):	Fluxbox é um gerenciador de janelas baseado no Blackbox
 Name:		fluxbox
-Version:	0.9.10
-Release:	0.%{snap}.2
+Version:	1.0.0
+Release:	1
 Epoch:		1
-License:	BSD-like
+License:	MIT-like
 Group:		X11/Window Managers
-#Source0:	http://dl.sourceforge.net/fluxbox/%{name}-%{version}.tar.bz2
-Source0:	http://ep09.pld-linux.org/~havner/%{name}-%{snap}.tar.bz2
-# Source0-md5:	dd834f348a5473d7daca2a58fb029d30
+Source0:	http://dl.sourceforge.net/fluxbox/%{name}-%{version}.tar.bz2
+# Source0-md5:	990e276ead0d04421dce4080f485caca
 Source1:	%{name}.desktop
-Source2:        %{name}-xsession.desktop
-Source3:        %{name}-pld.style
-Source4:        %{name}-pld.jpg
-Source5:        %{name}.menu
+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
+URL:		http://fluxbox.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
+%{?with_imlib2:BuildRequires:	imlib2-devel >= 1.0.0}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-BuildRequires:	xft-devel
-BuildRequires:	xrender-devel
-Requires(post):	vfmg >= 0.9.16-3
+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.95
 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
@@ -48,23 +47,29 @@ theme/style compatibility). So what's the difference between fluxbox
 and blackbox then? The answer is: LOTS! Have a look at the homepage
 for more info ;)
 
-%description -l pl
-Fluxbox jest zarz±dc± okien dla X Window opartym na Blackboksie
-0.61.1. Jego zalet± jest estetyczny i szybki interfejs z wieloma
-pulpitami i prostym menu. Wbudowano weñ tak¿e algorytm rysowania
-dekoracji okien, które mog± byæ jednokolorowe, gradientowe lub
-trójwymiarowe.
-
-%description -l pt_BR
-Fluxbox é um gerenciador de janelas para X. Ele é baseado no código do
-Blackbox 0.61.1. Fluxbox tem a aparência do blackbox e pode utilizar
-seus estilos, cores e temas. Então qual a diferença entre o fluxbox e
+%description -l pl.UTF-8
+Fluxbox jest zarządcą okien dla X Window opartym na Blackboksie
+0.61.1. Jego zaletą jest estetyczny i szybki interfejs z wieloma
+pulpitami i prostym menu. Wbudowano weń także algorytm rysowania
+dekoracji okien, które mogą być jednokolorowe, gradientowe lub
+trójwymiarowe.
+
+%description -l pt_BR.UTF-8
+Fluxbox é um gerenciador de janelas para X. Ele é baseado no código do
+Blackbox 0.61.1. Fluxbox tem a aparência do blackbox e pode utilizar
+seus estilos, cores e temas. Então qual a diferença entre o fluxbox e
 o blackbox?
 
+%description -l de.UTF-8
+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}
+%setup -q
 %patch0 -p1
-%{!?with_old_wheel:%patch1 -p1}
 
 echo "session.screen0.antialias: true" >> data/init.in
 
@@ -78,7 +83,11 @@ echo "session.screen0.antialias: true" >> data/init.in
 	--enable-slit \
 	--enable-kde \
 	--enable-gnome \
-	--enable-xinerama
+	--enable-xinerama \
+	--enable-nls \
+	--enable-xft \
+	--enable-xrandr \
+	%{?with_imlib2:--enable-imlib2}
 
 %{__make}
 
@@ -97,6 +106,8 @@ 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
 
@@ -104,38 +115,46 @@ rm -rf $RPM_BUILD_ROOT
 # 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 ||:
+	vfmg 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(en) %{_datadir}/fluxbox/nls/en*
+%lang(es) %{_datadir}/fluxbox/nls/es*
+%lang(et) %{_datadir}/fluxbox/nls/et*
+%lang(fi) %{_datadir}/fluxbox/nls/fi*
+%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_BR) %{_datadir}/fluxbox/nls/pt_BR*
+%lang(pt) %{_datadir}/fluxbox/nls/pt_PT*
+%lang(ru) %{_datadir}/fluxbox/nls/ru*
+%lang(sk) %{_datadir}/fluxbox/nls/sk*
+%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_CN*
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/fluxbox.desktop
 %{_datadir}/wallpapers/*