Author: lisu                         Date: Mon Nov  8 14:25:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add lua_cairo bcond which enables lua cairo bindings for conky
- release 2

---- Files affected:
packages/conky:
   conky.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: packages/conky/conky.spec
diff -u packages/conky/conky.spec:1.33 packages/conky/conky.spec:1.34
--- packages/conky/conky.spec:1.33      Wed Oct 13 11:20:23 2010
+++ packages/conky/conky.spec   Mon Nov  8 15:25:21 2010
@@ -1,9 +1,10 @@
 # $Revision$, $Date$
+%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.8.1
-Release:       1
+Release:       2
 License:       Distributable (see COPYING doc)
 Group:         X11/Applications
 Source0:       
http://downloads.sourceforge.net/conky/%{name}-%{version}.tar.bz2
@@ -20,6 +21,7 @@
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: sed >= 4.0
+%{?with_lua_cairo:BuildRequires:       tolua++-libs >= 1.0.90}
 BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXft-devel
@@ -50,7 +52,8 @@
 %{__automake}
 %configure \
        CFLAGS="%{rpmcflags} `pkg-config ncurses --cflags`" \
-       LIBS="-ltinfo"
+       LIBS="-ltinfo" \
+       %{?with_lua_cairo:--enable-lua-cairo}
 %{__make}
 
 %install
@@ -66,10 +69,15 @@
 %defattr(644,root,root,755)
 # COPYING must be added (see COPYING file)
 %doc AUTHORS ChangeLog COPYING README TODO
+%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
-%attr(755,root,root) %{_bindir}/%{name}
+%dir %{_libdir}/conky
+%if %{with lua_cairo}
+%{_libdir}/conky/libcairo.so.*.*.*
+%ghost %{_libdir}/conky/libcairo.so.0
+%endif
 %{_mandir}/man1/%{name}.1*
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -78,6 +86,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2010/11/08 14:25:21  lisu
+- add lua_cairo bcond which enables lua cairo bindings for conky
+- release 2
+
 Revision 1.33  2010/10/13 09:20:23  lisu
 - don't drop our cflags
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to