rpms/conky/F-7 conky-1.5.0-includes.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 conky.spec, 1.5, 1.6 sources, 1.4, 1.5
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Sun Mar 23 12:18:00 UTC 2008
- Previous message (by thread): rpms/conky/F-8 conky-1.5.0-includes.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 conky.spec, 1.6, 1.7 sources, 1.4, 1.5
- Next message (by thread): rpms/kernel/devel linux-2.6-imac-transparent-bridge.patch, NONE, 1.1 linux-2.6-windfarm-pm121-fix.patch, NONE, 1.1 linux-2.6-windfarm-pm121.patch, NONE, 1.1 config-powerpc64, 1.12, 1.13 kernel.spec, 1.523, 1.524
- 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-serv18675
Modified Files:
.cvsignore conky.spec sources
Added Files:
conky-1.5.0-includes.patch
Log Message:
- Update to 1.5.0
- Convert doc files to UTF-8
conky-1.5.0-includes.patch:
--- NEW FILE conky-1.5.0-includes.patch ---
diff -up conky-1.5.0/src/linux.c.includes conky-1.5.0/src/linux.c
--- conky-1.5.0/src/linux.c.includes 2008-03-23 00:02:32.000000000 +0100
+++ conky-1.5.0/src/linux.c 2008-03-23 12:27:33.000000000 +0100
@@ -52,7 +52,7 @@
#include <linux/sockios.h>
#include <net/if.h>
#include <arpa/inet.h>
-#include <linux/route.h>
+#include <net/route.h>
#include <math.h>
#ifdef HAVE_IWLIB
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 27 Nov 2007 11:42:10 -0000 1.4
+++ .cvsignore 23 Mar 2008 12:17:17 -0000 1.5
@@ -1 +1 @@
-conky-1.4.9.tar.bz2
+conky-1.5.0.tar.bz2
Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-7/conky.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- conky.spec 27 Nov 2007 11:42:10 -0000 1.5
+++ conky.spec 23 Mar 2008 12:17:17 -0000 1.6
@@ -1,10 +1,11 @@
%bcond_without audacious
%bcond_without mpd
%bcond_without rss
+%bcond_without smapi
%bcond_without wlan
Name: conky
-Version: 1.4.9
+Version: 1.5.0
Release: 1%{?dist}
Summary: A system monitor for X
@@ -14,6 +15,8 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: conky-1.5.0-includes.patch
+
BuildRequires: libXft-devel
BuildRequires: libXt-devel
BuildRequires: libXdamage-devel
@@ -35,6 +38,11 @@
%prep
%setup -q
+%patch0 -p1 -b .includes
+
+for i in AUTHORS ChangeLog; do
+ iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
+done
%build
%configure \
@@ -47,6 +55,9 @@
%if %{with rss}
--enable-rss \
%endif
+%if %{with smapi}
+ --enable-smapi \
+%endif
%if %{with wlan}
--enable-wlan \
%endif
@@ -65,7 +76,7 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO README NEWS extras/* doc/docs.html doc/conkyrc.sample
+%doc AUTHORS ChangeLog COPYING TODO README NEWS extras/* doc/docs.html doc/conky.conf
%dir %{_sysconfdir}/conky
%config %{_sysconfdir}/conky/conky.conf
%{_bindir}/*
@@ -73,6 +84,10 @@
%changelog
+* Sun Mar 23 2008 Miroslav Lichvar <mlichvar at redhat.com> - 1.5.0-1
+- Update to 1.5.0
+- Convert doc files to UTF-8
+
* Tue Nov 27 2007 Miroslav Lichvar <mlichvar at redhat.com> - 1.4.9-1
- Update to 1.4.9
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 27 Nov 2007 11:42:10 -0000 1.4
+++ sources 23 Mar 2008 12:17:17 -0000 1.5
@@ -1 +1 @@
-42d966fce5aa5c5a326575ec214bff07 conky-1.4.9.tar.bz2
+07fa339276289ddc31303a8081c85214 conky-1.5.0.tar.bz2
- Previous message (by thread): rpms/conky/F-8 conky-1.5.0-includes.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 conky.spec, 1.6, 1.7 sources, 1.4, 1.5
- Next message (by thread): rpms/kernel/devel linux-2.6-imac-transparent-bridge.patch, NONE, 1.1 linux-2.6-windfarm-pm121-fix.patch, NONE, 1.1 linux-2.6-windfarm-pm121.patch, NONE, 1.1 config-powerpc64, 1.12, 1.13 kernel.spec, 1.523, 1.524
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list