rpms/conky/devel .cvsignore, 1.3, 1.4 conky.spec, 1.4, 1.5 sources, 1.3, 1.4

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

Update of /cvs/pkgs/rpms/conky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6025

Modified Files:
	.cvsignore conky.spec sources 
Log Message:
- Update to 1.4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Oct 2007 10:24:57 -0000	1.3
+++ .cvsignore	27 Nov 2007 11:14:34 -0000	1.4
@@ -1 +1 @@
-conky-1.4.8.tar.bz2
+conky-1.4.9.tar.bz2


Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/conky.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- conky.spec	21 Oct 2007 10:24:57 -0000	1.4
+++ conky.spec	27 Nov 2007 11:14:34 -0000	1.5
@@ -1,10 +1,10 @@
-%{?!with_audacious: %define with_audacious 1}
-%{?!with_mpd: %define with_mpd 1}
-%{?!with_rss: %define with_rss 1}
-%{?!with_wlan: %define with_wlan 1}
+%bcond_without audacious
+%bcond_without mpd
+%bcond_without rss
+%bcond_without wlan
 
 Name:           conky 
-Version:        1.4.8
+Version:        1.4.9
 Release:        1%{?dist}
 Summary:        A system monitor for X 
 
@@ -18,13 +18,13 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXext-devel
-%if %{with_audacious}
+%if %{with audacious}
 BuildRequires:  audacious-devel
 %endif
-%if %{with_rss}
+%if %{with rss}
 BuildRequires:  curl-devel
 %endif
-%if %{with_wlan}
+%if %{with wlan}
 BuildRequires:  wireless-tools-devel
 %endif
 
@@ -38,16 +38,16 @@
 
 %build
 %configure \
-%if %{with_audacious}
-    --enable-audacious \
+%if %{with audacious}
+    --enable-audacious=legacy \
 %endif
-%if ! %{with_mpd}
+%if ! %{with mpd}
     --disable-mpd \
 %endif
-%if %{with_rss}
+%if %{with rss}
     --enable-rss \
 %endif
-%if %{with_wlan}
+%if %{with wlan}
     --enable-wlan \
 %endif
     ;
@@ -66,11 +66,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING TODO README NEWS extras/* doc/docs.html  doc/conkyrc.sample
+%dir %{_sysconfdir}/conky
+%config %{_sysconfdir}/conky/conky.conf
 %{_bindir}/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 27 2007 Miroslav Lichvar <mlichvar at redhat.com> - 1.4.9-1
+- Update to 1.4.9
+
 * Sun Oct 21 2007 Miroslav Lichvar <mlichvar at redhat.com> - 1.4.8-1
 - Update to 1.4.8
 - Enable mpd, rss and wireless support


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2007 10:24:57 -0000	1.3
+++ sources	27 Nov 2007 11:14:34 -0000	1.4
@@ -1 +1 @@
-234e798da57864060928fc7097300b01  conky-1.4.8.tar.bz2
+42d966fce5aa5c5a326575ec214bff07  conky-1.4.9.tar.bz2