X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fbpanel.spec;h=8a684f130e5986fc60d0dfd4cd16cfda80cbfa08;hb=a7f5b252c338b1d877e253bcc46add89fa70b80b;hp=578bcb6f822ec188ba5d8a13aebe5535a0613796;hpb=c60c1082acadb1e1f8eb0463ae10864d12fc5fe9;p=packages%2Ffbpanel.git

diff --git a/fbpanel.spec b/fbpanel.spec
index 578bcb6..8a684f1 100644
--- a/fbpanel.spec
+++ b/fbpanel.spec
@@ -1,17 +1,20 @@
 Summary:	Lightweight and NETWM compliant desktop panel
 Summary(pl):	Lekki i zgodny z NETWM panel
 Name:		fbpanel
-Version:	3.8
+Version:	4.3
 Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/fbpanel/%{name}-%{version}.tgz
-# Source0-md5:	95e43a2c201feb5e272bbd9a4f78ad6e
+# Source0-md5:	2d2f3713cf3c17b71997064f39d4c888
+Source1:	%{name}.menu.readme
 Patch0:		%{name}-build_fixes.patch
+Patch1:		%{name}-file_watcher.patch
 URL:		http://fbpanel.sourceforge.net/
-BuildRequires:	gtk+2-devel >= 1:2.4.0
+BuildRequires:	gtk+2-devel >= 2:2.4.0
 BuildRequires:	pkgconfig
-Requires:	gtk+2 >= 1:2.4.0
+BuildRequires:	sed >= 4.0
+Requires:	gtk+2 >= 2:2.4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -23,26 +26,36 @@ fbpanel to lekki i zgodny ze specyfikacj
 %prep
 %setup -q
 %patch0 -p1
+#%patch1 -p1
+
+sed -i -e 's|/lib/fbpanel|/%{_lib}/fbpanel|' plugin.c
 
 %build
 # no auto* tools here
 ./configure \
 	--prefix=%{_prefix}
 
-%{__make}
+%{__make} \
+	OPTFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIBDIR="%{_libdir}"
+
+install %{SOURCE1} .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG CREDITS README
+%doc CHANGELOG CREDITS README fbpanel.menu.readme
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fbpanel
 %attr(755,root,root) %{_bindir}/*
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/plugins
 %{_datadir}/%{name}
 %{_mandir}/man1/fbpanel*