- types patch by qboosh

[packages/fbdesk.git] / fbdesk.spec

diff --git a/fbdesk.spec b/fbdesk.spec
index 6d612cb1d4a3967e3d195894c3ae3e081fd6ad4a..8d3ca06eeea9cc340a224af7f9ffc92281ead0c5 100644 (file)
--- a/fbdesk.spec
+++ b/fbdesk.spec
@@ -1,18 +1,21 @@
 Summary:       Application to create and manage icons on fluxbox desktop
 Summary(pl):   Aplikacja do tworzenia i zarz±dzania ikonami w fluxboksie
 Name:          fbdesk
-Version:       1.1.4
-Release:       1
-License:       GPL
+Version:       1.1.5
+Release:       3
+License:       BSD-like
 Group:         X11/Window Managers/Tools
 Source0:       http://fluxbox.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 328d3bd475c41dff6bb5b4faf62eb7b6
-Patch0:                %{name}-XFT.patch
+# Source0-md5: c41319c9a2a03cf4d7d5e0586e57cba6
+Source1:       xft.m4
+Patch0:                %{name}-event.patch
+Patch1:                %{name}-types.patch
 BuildRequires: XFree86-devel
-BuildRequires: XFree86-xft-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libpng-devel
+BuildRequires: libstdc++-devel
+BuildRequires: xft-devel
 Requires:      fluxbox
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,11 +32,13 @@ jak i PNG. Tekst mo
 albo z prawej strony. Obs³uguje UTF-8.
 
 %prep
-%setup  -q
-%patch0 -p0
+%setup -q
+%patch0 -p1
+%patch1 -p1
+install %{SOURCE1} .
 
 %build
-%{__aclocal}
+%{__aclocal} -I .
 %{__autoconf}
 %{__automake}
 %configure