- fixed building on x86_64, %files cleanup, added TODO, release 2

[packages/blackbox.git] / blackbox.spec

diff --git a/blackbox.spec b/blackbox.spec
index 0dcb923fd45090fcf9308caa016b76d20bdf1f82..ac9e60906b4af85ef9e4e60152a41b44dbf2d5cf 100644 (file)
--- a/blackbox.spec
+++ b/blackbox.spec
@@ -1,17 +1,19 @@
 #
+# TODO: review/update patches
+#
 # Conditional build:
-# _with_epistrophy     - enables using epistorophy key grabber
+%bcond_with    epistrophy      # enables using epistorophy key grabber
 #
 Summary:       Very small and fast window manger for the X Window
-Summary(pl):   Ma³y i szybki zarz±dca okien dla X Window
+Summary(pl.UTF-8):     Mały i szybki zarządca okien dla X Window
+Summary(de.UTF-8):     Blackbox ist ein Windowmanager
 Name:          blackbox
-Version:       0.65.0
+Version:       0.70.1
 Release:       2
 License:       BSD-like
 Group:         X11/Window Managers
-Vendor:                Brad Hughes <blackbox@alug.org>
 Source0:       http://dl.sourceforge.net/blackboxwm/%{name}-%{version}.tar.gz
-# Source0-md5: 08560fa287c68d65fbe894696d04deaf
+# Source0-md5: 2d173b95ca5e64ef478c6a5d2deee9df
 Source1:       %{name}.desktop
 Source3:       %{name}.1
 Source4:       bsetroot.1
@@ -23,17 +25,20 @@ Patch3:             %{name}-epistrophy.patch
 Patch4:                %{name}-etc_dir.patch
 Patch5:                %{name}-nls-codesets.patch
 Patch6:                %{name}-assert.patch
+Patch7:                %{name}-assert.patch
 URL:           http://blackboxwm.sourceforge.net/
-BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
+%{?with_epistrophy:Requires:   epistrophy}
 BuildRequires: rpm >= 4.0.2-48
-%{?_with_epistrophy:Requires:  epistrophy}
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXft-devel
 Obsoletes:     fluxbox
+Conflicts:     filesystem < 3.0-20
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/X11/%{name}
-%define                _wmpropsdir     /usr/share/wm-properties
+%define                _wmpropsdir     /usr/share/gnome/wm-properties
 
 %define                _gcc_ver        %(%{__cc} -dumpversion | cut -b 1)
 %if %{_gcc_ver} == 2
@@ -48,24 +53,34 @@ simple menus. Fast built-in graphics code that can render solids,
 gradients and bevels is used to draw window decorations. Remaining
 small in size, blackbox preserves memory and CPU.
 
-%description -l pl
-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,
-gradientowe lub trójwymiarowe. Blackbox oszczêdza pamiêæ i czas CPU.
+%description -l pl.UTF-8
+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,
+gradientowe lub trójwymiarowe. Blackbox oszczędza pamięć i czas CPU.
+
+%description -l de.UTF-8
+Blackbox ist ein Windowmanager für offene Betriebssystem wie z.B.
+Linux oder freie BSD-Varianten. Er erfreut sich einer großen
+Fangemeinde, da er sehr ressourcenschonend und voll konfigurierbar
+ist.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%{?_with_epistrophy:%patch3 -p1}
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+#%patch0 -p1
+#%patch1 -p1
+%{?with_epistrophy:%patch3 -p1}
+#%patch4 -p1
+#%patch5 -p1
+#%patch6 -p1
+%ifarch %{x8664}
+%patch7 -p0
+%endif
 
 %build
 rm -f missing
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -97,37 +112,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}
 %dir %{_datadir}/blackbox
 %{_datadir}/blackbox/styles
-%dir %{_datadir}/blackbox/nls
-%{_datadir}/blackbox/nls/C
-%{_datadir}/blackbox/nls/POSIX
-%{_datadir}/blackbox/nls/US_ASCII
-%{_datadir}/blackbox/nls/en*
-%lang(da) %{_datadir}/blackbox/nls/da*
-%lang(de) %{_datadir}/blackbox/nls/de*
-%lang(es) %{_datadir}/blackbox/nls/es
-%lang(es_AR) %{_datadir}/blackbox/nls/es_AR
-%lang(es) %{_datadir}/blackbox/nls/es_ES
-%lang(es) %{_datadir}/blackbox/nls/es_MX
-%lang(fr) %{_datadir}/blackbox/nls/fr*
-%lang(hu) %{_datadir}/blackbox/nls/hu*
-%lang(it) %{_datadir}/blackbox/nls/it*
-%lang(ja) %{_datadir}/blackbox/nls/ja*
-%lang(ko) %{_datadir}/blackbox/nls/ko*
-%lang(lv) %{_datadir}/blackbox/nls/lv*
-%lang(nl) %{_datadir}/blackbox/nls/nl*
-%lang(no) %{_datadir}/blackbox/nls/no*
-%lang(pl) %{_datadir}/blackbox/nls/pl*
-%lang(pt_BR) %{_datadir}/blackbox/nls/pt_BR
-%lang(ro) %{_datadir}/blackbox/nls/ro*
-%lang(ru) %{_datadir}/blackbox/nls/ru*
-%lang(sk) %{_datadir}/blackbox/nls/sk*
-%lang(sl) %{_datadir}/blackbox/nls/sl*
-%lang(sv) %{_datadir}/blackbox/nls/sv*
-%lang(uk) %{_datadir}/blackbox/nls/uk*
-%lang(zh_CN) %{_datadir}/blackbox/nls/zh_CN
-%lang(zh_TW) %{_datadir}/blackbox/nls/zh_TW
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/blackbox.desktop
 %{_mandir}/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
-%{_sysconfdir}/menu
+%{_datadir}/blackbox/menu