rpms/conky/F-7 .cvsignore, 1.2, 1.3 conky.spec, 1.3, 1.4 sources, 1.2, 1.3 conky-news.diff, 1.1, NONE conky-timed_c.diff, 1.1, NONE conky-timed_h.diff, 1.1, NONE
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Sun Oct 21 10:47:02 UTC 2007
- Previous message (by thread): rpms/conky/F-8 .cvsignore, 1.2, 1.3 conky.spec, 1.3, 1.4 sources, 1.2, 1.3 conky-news.diff, 1.1, NONE conky-timed_c.diff, 1.1, NONE conky-timed_h.diff, 1.1, NONE
- Next message (by thread): rpms/pinot/devel configure-ssl-curl-libs.patch, NONE, 1.1 pinot.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mlichvar
Update of /cvs/pkgs/rpms/conky/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13369
Modified Files:
.cvsignore conky.spec sources
Removed Files:
conky-news.diff conky-timed_c.diff conky-timed_h.diff
Log Message:
Update to 1.4.8
Enable mpd, rss and wireless support
Update license tag
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 14 Dec 2006 15:33:59 -0000 1.2
+++ .cvsignore 21 Oct 2007 10:46:28 -0000 1.3
@@ -1 +1 @@
-conky-1.4.5.tar.bz2
+conky-1.4.8.tar.bz2
Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-7/conky.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- conky.spec 19 Apr 2007 04:02:33 -0000 1.3
+++ conky.spec 21 Oct 2007 10:46:28 -0000 1.4
@@ -1,22 +1,32 @@
+%{?!with_audacious: %define with_audacious 1}
+%{?!with_mpd: %define with_mpd 1}
+%{?!with_rss: %define with_rss 1}
+%{?!with_wlan: %define with_wlan 1}
+
Name: conky
-Version: 1.4.5
-Release: 4%{?dist}
+Version: 1.4.8
+Release: 1%{?dist}
Summary: A system monitor for X
Group: User Interface/X
-License: GPL
+License: GPLv3+
URL: http://conky.sf.net/
-Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: conky-news.diff
-Patch1: conky-timed_c.diff
-Patch2: conky-timed_h.diff
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXft-devel
BuildRequires: libXt-devel
BuildRequires: libXdamage-devel
BuildRequires: libXext-devel
+%if %{with_audacious}
BuildRequires: audacious-devel
+%endif
+%if %{with_rss}
+BuildRequires: curl-devel
+%endif
+%if %{with_wlan}
+BuildRequires: wireless-tools-devel
+%endif
%description
@@ -25,24 +35,22 @@
%prep
%setup -q
-%patch0
-%patch1
-%patch2
%build
-%configure --enable-audacious \
- --enable-hddtemp \
- --enable-own-window \
- --enable-proc-uptime \
- --enable-portmon \
- --enable-double-buffer \
- --enable-xft \
- --enable-xdamage \
- --enable-x11 \
- --disable-bmpx \
- --disable-xmms2 \
- --disable-mpd \
- --with-x
+%configure \
+%if %{with_audacious}
+ --enable-audacious \
+%endif
+%if ! %{with_mpd}
+ --disable-mpd \
+%endif
+%if %{with_rss}
+ --enable-rss \
+%endif
+%if %{with_wlan}
+ --enable-wlan \
+%endif
+ ;
make %{?_smp_mflags}
@@ -63,6 +71,11 @@
%changelog
+* 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
+- Update license tag
+
* Wed Apr 18 2007 Michael Rice <errr[AT]errr-online.com> - 1.4.5-4
- Rebuild to match audacious lib in fc6 bug: 236989
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 14 Dec 2006 15:33:59 -0000 1.2
+++ sources 21 Oct 2007 10:46:28 -0000 1.3
@@ -1 +1 @@
-4625c052852f2919a5e7ce2eb7c31189 conky-1.4.5.tar.bz2
+234e798da57864060928fc7097300b01 conky-1.4.8.tar.bz2
--- conky-news.diff DELETED ---
--- conky-timed_c.diff DELETED ---
--- conky-timed_h.diff DELETED ---
- Previous message (by thread): rpms/conky/F-8 .cvsignore, 1.2, 1.3 conky.spec, 1.3, 1.4 sources, 1.2, 1.3 conky-news.diff, 1.1, NONE conky-timed_c.diff, 1.1, NONE conky-timed_h.diff, 1.1, NONE
- Next message (by thread): rpms/pinot/devel configure-ssl-curl-libs.patch, NONE, 1.1 pinot.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list