update to 20121101gitbfaa84

This commit is contained in:
Miroslav Lichvar 2013-04-09 12:05:50 +02:00
parent c75def2c81
commit 2bbcc95a5c
4 changed files with 15 additions and 25 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/conky-1.9.0.tar.bz2
/conky-1.9.0-20121101gitbfaa84.tar.xz

View File

@ -1,18 +0,0 @@
diff -up conky-1.9.0/src/conky.c.nobool conky-1.9.0/src/conky.c
--- conky-1.9.0/src/conky.c.nobool 2012-05-03 23:22:21.000000000 +0200
+++ conky-1.9.0/src/conky.c 2012-05-07 15:56:40.000000000 +0200
@@ -882,12 +882,12 @@ void generate_text_internal(char *p, int
OBJ(cpu) {
if (cur->cpu_usage) {
if (obj->data.i > info.cpu_count) {
- static bool warned = false;
+ static int warned = 0;
if(!warned) {
NORM_ERR("obj->data.i %i info.cpu_count %i",
obj->data.i, info.cpu_count);
NORM_ERR("attempting to use more CPUs than you have!");
- warned = true;
+ warned = 1;
}
} else {
percent_print(p, p_max_size,

View File

@ -1,3 +1,6 @@
%global gitdate 20121101
%global gitrev bfaa84
%bcond_without alsa
%bcond_without audacious
%bcond_without curl
@ -15,15 +18,16 @@
Name: conky
Version: 1.9.0
Release: 3%{?dist}
Release: 3.%{gitdate}git%{gitrev}%{?dist}
Summary: A system monitor for X
Group: User Interface/X
License: GPLv3+
URL: http://conky.sf.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch1: conky-1.9.0-nobool.patch
# git clone git://git.omp.am/conky.git; cd conky
# git archive --prefix=conky/ %{gitrev} | xz > %{name}-%{version}-%{gitdate}git%{gitrev}.tar.xz
Source0: %{name}-%{version}-%{gitdate}git%{gitrev}.tar.xz
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRequires: libXft-devel
BuildRequires: libXt-devel
@ -40,20 +44,23 @@ BuildRequires: libXext-devel
%{?with_ncurses:BuildRequires: ncurses-devel}
%{?with_rss:BuildRequires: curl-devel libxml2-devel}
%{?with_wlan:BuildRequires: wireless-tools-devel}
# needed to generate documentation in the git snapshot
BuildRequires: libtool docbook2X docbook-style-xsl man
%description
A system monitor for X originally based on the torsmo code. but more kickass.
It just keeps on given'er. Yeah.
%prep
%setup -q
%patch1 -p1 -b .nobool
%setup -q -n %{name}
for i in AUTHORS; do
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
done
%build
# needed also to use recent config.guess and config.sub for aarch64
./autogen.sh
%configure \
%{!?with_alsa: --disable-alsa} \
%{?with_audacious: --enable-audacious=yes} \

View File

@ -1 +1 @@
d3de615f43aadc98d555e05ad9e902c2 conky-1.9.0.tar.bz2
3d429d16674757c2134821669f59e371 conky-1.9.0-20121101gitbfaa84.tar.xz