X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=blackbox.spec;h=dd2c0a0ef41ded53b550b611069ffb79536d6931;hb=5731932c2feac58adf9a725162cbeed9019e0703;hp=9e1d0ab4594254cd3527b5903e204c3db8db7ab2;hpb=b0597b68bc2bf0ece304c11d99860e96ce62ed37;p=packages%2Fblackbox.git

diff --git a/blackbox.spec b/blackbox.spec
index 9e1d0ab..dd2c0a0 100644
--- a/blackbox.spec
+++ b/blackbox.spec
@@ -1,25 +1,38 @@
+# --with	epistrophy	(enables using epistorophy key grabber)
+
 Summary:	Very small and fast window manger for the X Window
-Summary(pl):	Ma³y i szybki menad¿er okien dla X Window
+Summary(pl):	Ma³y i szybki zarz±dca okien dla X Window
 Name:		blackbox
-Version:	0.62.0
-Release:	1
+Version:	0.65.0
+Release:	2
 License:	GPL
 Group:		X11/Window Managers
-Group(de):	X11/Fenstermanager
-Group(pl):	X11/Zarz±dcy Okien
 Vendor:		Brad Hughes <blackbox@alug.org>
-Source0:	ftp://portal.alug.org/pub/blackbox/0.6x.x/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/blackboxwm/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source3:	%{name}.1
+Source4:	bsetroot.1
+Source5:	%{name}-README.PLD
 Patch0:		%{name}-am_fixes.patch
-URL:		http://blackbox.alug.org/
+Patch1:		%{name}-pipe.patch
+Patch3:		%{name}-epistrophy.patch
+Patch4:		%{name}-etc_dir.patch
+URL:		http://blackboxwm.sourceforge.net/
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	rpm >= 4.0.2-48
+%{?_with_epistrophy:Requires:	epistrophy}
+Obsoletes:	fluxbox
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
 %define		_sysconfdir	/etc/X11/%{name}
+%define		_wmpropsdir	/usr/share/wm-properties
+
+%define		_gcc_ver	%(%{__cc} -dumpversion | cut -b 1)
+%if %{_gcc_ver} == 2
+%define		__cxx		"%{__cc}"
+%endif
 
 %description
 Blackbox is a window manager for the X Window environment, which is
@@ -30,7 +43,7 @@ gradients and bevels is used to draw window decorations. Remaining
 small in size, blackbox preserves memory and CPU.
 
 %description -l pl
-Blackbox jest mened¿erem okien dla X Window spe³niaj±cym prawie
+Blackbox jest zarz±dc± okien dla X Window spe³niaj±cym prawie
 wszystkie zalecenia ICCM. 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,
@@ -39,35 +52,41 @@ gradientowe lub tr
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%{?_with_epistrophy:%patch3 -p1}
+%patch4 -p1
 
 %build
-aclocal
-autoconf
-automake -a -c
+rm -f missing
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
-%{__make} CXX="%{__cc}"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/wm-properties
+install -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_mandir}/pl/man1,%{_sysconfdir}}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/wm-properties/
-
-gzip -9nf README* ChangeLog
+install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
+install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/pl/man1
+cp %{SOURCE5} README.PLD
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc README* ChangeLog
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}
 %dir %{_datadir}/blackbox
-%{_datadir}/blackbox/styles/*
-%{_datadir}/blackbox/nls/*
-%{_datadir}/wm-properties/blackbox.desktop
+%{_datadir}/blackbox/styles
+%{_datadir}/blackbox/nls
+%{_wmpropsdir}/blackbox.desktop
 %{_mandir}/man1/*
+%lang(pl) %{_mandir}/pl/man1/*
 %{_sysconfdir}/menu