X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffbpanel.git;a=blobdiff_plain;f=fbpanel.spec;h=7a1ed8c1849d352cdcfe5c114e604ee7e88780de;hp=1bf6efecba5b14f6999779fd611ec51b55260736;hb=134384bdad8f7fd9d48bfbe7c06d5e9d391e206d;hpb=55531ad24aea9c14e1fe9009273f7f30bfda8161

diff --git a/fbpanel.spec b/fbpanel.spec
index 1bf6efe..7a1ed8c 100644
--- a/fbpanel.spec
+++ b/fbpanel.spec
@@ -1,14 +1,16 @@
 Summary:	Lightweight and NETWM compliant desktop panel
 Summary(pl):	Lekki i zgodny z NETWM panel
 Name:		fbpanel
-Version:	3.16
-Release:	1
+Version:	4.1
+Release:	3
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/fbpanel/%{name}-%{version}.tgz
-# Source0-md5:	447292dbb0ccb5bb2e266d98e11536bc
+# Source0-md5:	70c1b3f9682a0cce0d6b5477b2bc83e4
 Source1:	%{name}.menu.readme
 Patch0:		%{name}-build_fixes.patch
+Patch1:		%{name}-cleanup.patch
+Patch2:		%{name}-file_watcher.patch
 URL:		http://fbpanel.sourceforge.net/
 BuildRequires:	gtk+2-devel >= 1:2.4.0
 BuildRequires:	pkgconfig
@@ -24,6 +26,12 @@ fbpanel to lekki i zgodny ze specyfikacj
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%ifarch amd64
+    sed -i -e 's|/lib/fbpanel|/lib64/fbpanel|' plugin.c
+%endif
 
 %build
 # no auto* tools here
@@ -32,12 +40,13 @@ fbpanel to lekki i zgodny ze specyfikacj
 
 %{__make} \
 	OPTFLAGS="%{rpmcflags}"
-
+	
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIBDIR="%{_libdir}"
 
 install %{SOURCE1} .
 
@@ -48,5 +57,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGELOG CREDITS README fbpanel.menu.readme
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/%{name}/plugins
 %{_datadir}/%{name}
 %{_mandir}/man1/fbpanel*