packages: conky/conky.spec - lua_imlib2 bcond

lisu lisu at pld-linux.org
Tue Nov 9 14:09:20 CET 2010


Author: lisu                         Date: Tue Nov  9 13:09:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- lua_imlib2 bcond

---- Files affected:
packages/conky:
   conky.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: packages/conky/conky.spec
diff -u packages/conky/conky.spec:1.42 packages/conky/conky.spec:1.43
--- packages/conky/conky.spec:1.42	Tue Nov  9 13:24:54 2010
+++ packages/conky/conky.spec	Tue Nov  9 14:09:14 2010
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	lua_cairo	# without lua cairo bindings
+%bcond_without	lua_imlib2	# without lua imlib2 bindings
 #
 Summary:	A light-weight system monitor
 Summary(pl.UTF-8):	Monitor systemu dla środowiska graficznego
@@ -28,7 +29,9 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	sed >= 4.0
-%{?with_lua_cairo:BuildRequires:	tolua++-devel >= 1.0.90}
+%if %{with lua_cairo} || %{with lua_imlib2}
+BuildRequires:	tolua++-devel >= 1.0.90
+%endif
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel
@@ -87,7 +90,7 @@
 	--enable-curl \
 	--enable-imlib2 \
 	%{?with_lua_cairo:--enable-lua-cairo} \
-	--enable-lua-imlib2
+	%{?with_lua_imlib2:--enable-lua-imlib2}
 
 %{__make}
 
@@ -118,10 +121,12 @@
 %{_libdir}/conky/libcairo.so
 %endif
 
+%if %{with lua_imlib2}
 %files lua-imlib2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/conky/libimlib2.so.*.*.*
 %{_libdir}/conky/libimlib2.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -129,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2010/11/09 13:09:14  lisu
+- lua_imlib2 bcond
+
 Revision 1.42  2010/11/09 12:24:54  sparky
 - enabled curl and imlib2
 - BR: alsa-lib-devel, curl-devel, imlib2-devel
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/conky/conky.spec?r1=1.42&r2=1.43&f=u



More information about the pld-cvs-commit mailing list