rpms/conky/devel .cvsignore, 1.10, 1.11 conky.spec, 1.17, 1.18 sources, 1.10, 1.11 conky-1.7.1.1-nonxft.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/conky/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24439

Modified Files:
	.cvsignore conky.spec sources 
Removed Files:
	conky-1.7.1.1-nonxft.patch 
Log Message:
- Update to 1.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Jun 2009 11:56:55 -0000	1.10
+++ .cvsignore	25 Aug 2009 14:28:32 -0000	1.11
@@ -1 +1 @@
-conky-1.7.1.1.tar.bz2
+conky-1.7.2.tar.bz2


Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/conky.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- conky.spec	24 Jul 2009 19:25:53 -0000	1.17
+++ conky.spec	25 Aug 2009 14:28:32 -0000	1.18
@@ -2,6 +2,8 @@
 %bcond_without audacious
 %bcond_with imlib
 %bcond_without lua
+%bcond_without lua_cairo
+%bcond_with lua_imlib
 %bcond_with moc
 %bcond_without mpd
 %bcond_with nvidia
@@ -10,8 +12,8 @@
 %bcond_without wlan
 
 Name:           conky 
-Version:        1.7.1.1
-Release:        3%{?dist}
+Version:        1.7.2
+Release:        1%{?dist}
 Summary:        A system monitor for X 
 
 Group:          User Interface/X
@@ -19,7 +21,6 @@ License:        GPLv3+
 URL:            http://conky.sf.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:         conky-1.7.1.1-nonxft.patch
 
 BuildRequires:  libXft-devel
 BuildRequires:  libXt-devel
@@ -32,6 +33,8 @@ BuildRequires:  dbus-glib-devel
 %{?with_alsa:BuildRequires: alsa-lib-devel}
 %{?with_imlib:BuildRequires: imlib2-devel}
 %{?with_lua:BuildRequires: lua-devel}
+%{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel}
+%{?with_lua_imlib:BuildRequires: imlib2-devel tolua++-devel}
 %{?with_nvidia:BuildRequires: libXNVCtrl-devel}
 %{?with_rss:BuildRequires: curl-devel libxml2-devel}
 %{?with_wlan:BuildRequires: wireless-tools-devel}
@@ -42,7 +45,6 @@ It just keeps on given'er. Yeah.
 
 %prep
 %setup -q
-%patch0 -p1 -b .nonxft
 
 for i in AUTHORS; do
     iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@@ -54,6 +56,8 @@ done
 %{?with_audacious: --enable-audacious=yes} \
 %{?with_imlib:     --enable-imlib2} \
 %{!?with_lua:      --disable-lua} \
+%{?with_lua_cairo: --enable-lua-cairo} \
+%{?with_lua_imlib: --enable-lua-imlib2} \
 %{!?with_moc:      --disable-moc} \
 %{!?with_mpd:      --disable-mpd} \
 %{?with_nvidia:    --enable-nvidia} \
@@ -69,6 +73,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conky/conky_no_x11.conf
+rm -f $RPM_BUILD_ROOT%{_libdir}/conky/*.{la,a}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,10 +86,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/conky
 %config %{_sysconfdir}/conky/conky.conf
 %{_bindir}/*
+%if %{with lua_cairo} || %{with lua_imlib}
+%{_libdir}/conky
+%endif
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Aug 25 2009 Miroslav Lichvar <mlichvar at redhat.com> - 1.7.2-1
+- Update to 1.7.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Jun 2009 11:56:56 -0000	1.10
+++ sources	25 Aug 2009 14:28:32 -0000	1.11
@@ -1 +1 @@
-153a661e78a466c95b1b332e7cd599cb  conky-1.7.1.1.tar.bz2
+cf6f5d45d42ad68c618c00271813b80d  conky-1.7.2.tar.bz2


--- conky-1.7.1.1-nonxft.patch DELETED ---