X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=conky.spec;h=523fa8caea9085a31e40f507b3678b7b7cf4257a;hb=ab08a6864396519613fe19039fb249b3079f60b8;hp=c96803811b51f1c10e823a19f1ff535805190293;hpb=1638ff52b129e21d194b462369479696b4860caf;p=packages%2Fconky.git

diff --git a/conky.spec b/conky.spec
index c968038..523fa8c 100644
--- a/conky.spec
+++ b/conky.spec
@@ -1,24 +1,27 @@
+%bcond_without	lua_cairo	# without lua cairo bindings
+#
 Summary:	A light-weight system monitor
 Summary(pl.UTF-8):	Monitor systemu dla środowiska graficznego
 Name:		conky
-Version:	1.7.1.1
-Release:	1
+Version:	1.8.1
+Release:	3
 License:	Distributable (see COPYING doc)
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/conky/%{name}-%{version}.tar.bz2
-# Source0-md5:	153a661e78a466c95b1b332e7cd599cb
-Patch0:		%{name}-configdir.patch
+Source0:	http://downloads.sourceforge.net/conky/%{name}-%{version}.tar.bz2
+# Source0-md5:	366dc6a5c2ebebfbe6f53da25061b5d6
 URL:		http://conky.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
 BuildRequires:	freetype-devel
-BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	libtool
-BuildRequires:	lua51-devel
+BuildRequires:	lua51-devel >= 5.1
+BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	sed >= 4.0
+%{?with_lua_cairo:BuildRequires:	tolua++-devel >= 1.0.90}
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel
@@ -31,15 +34,14 @@ from i2c, MPD info, and anything else you desire) to the root window
 in X11.
 
 %description -l pl.UTF-8
-Conky jest niewielkim monitorem systemu opartym na kodzie torsmo.
-Może wyświetlać takie informacje, jak:
+Conky jest niewielkim monitorem systemu opartym na kodzie torsmo. Może
+wyświetlać takie informacje, jak:
 - data
 - temperatura CPU
 - ilość miejsca na dysku itp.
 
 %prep
 %setup -q
-%patch0 -p1
 %{__sed} -i 's,lua5.1,lua51,' configure.ac
 
 %build
@@ -48,7 +50,10 @@ Może wyświetlać takie informacje, jak:
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	CFLAGS="%{rpmcflags} `pkg-config ncurses --cflags`" \
+	LIBS="-ltinfo" \
+	%{?with_lua_cairo:--enable-lua-cairo}
 %{__make}
 
 %install
@@ -62,8 +67,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 # COPYING must be added (see COPYING file)
 %doc AUTHORS ChangeLog COPYING README TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/%{name}
+%dir %{_sysconfdir}/conky
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conky/%{name}.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conky/%{name}_no_x11.conf
+%dir %{_libdir}/conky
+%if %{with lua_cairo}
+%{_libdir}/conky/libcairo.so.*.*.*
+%ghost %{_libdir}/conky/libcairo.so.0
+%endif
 %{_mandir}/man1/%{name}.1*