parent
947b6bcdb0
commit
cbf92f3639
|
@ -1 +1 @@
|
||||||
conky-1.5.1.tar.bz2
|
conky-1.6.0.tar.bz2
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
diff -up conky-1.6.0/src/linux.c.rdtsc conky-1.6.0/src/linux.c
|
||||||
|
--- conky-1.6.0/src/linux.c.rdtsc 2008-07-15 03:02:37.000000000 +0200
|
||||||
|
+++ conky-1.6.0/src/linux.c 2008-07-22 13:56:04.000000000 +0200
|
||||||
|
@@ -1061,9 +1061,11 @@ void get_adt746x_cpu(char *p_client_buff
|
||||||
|
unsigned long long int rdtsc(void)
|
||||||
|
{
|
||||||
|
unsigned long long int x;
|
||||||
|
+ unsigned int a, d;
|
||||||
|
|
||||||
|
- __asm__ volatile(".byte 0x0f, 0x31":"=A" (x));
|
||||||
|
- return x;
|
||||||
|
+ __asm__ volatile(".byte 0x0f, 0x31":"=a" (a),"=d" (d));
|
||||||
|
+ x = d;
|
||||||
|
+ return x << 32 | a;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
40
conky.spec
40
conky.spec
|
@ -1,11 +1,12 @@
|
||||||
%bcond_without audacious
|
%bcond_without audacious
|
||||||
%bcond_without mpd
|
%bcond_without mpd
|
||||||
|
%bcond_with nvidia
|
||||||
%bcond_without rss
|
%bcond_without rss
|
||||||
%bcond_without smapi
|
%bcond_without smapi
|
||||||
%bcond_without wlan
|
%bcond_without wlan
|
||||||
|
|
||||||
Name: conky
|
Name: conky
|
||||||
Version: 1.5.1
|
Version: 1.6.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A system monitor for X
|
Summary: A system monitor for X
|
||||||
|
|
||||||
|
@ -13,6 +14,7 @@ Group: User Interface/X
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://conky.sf.net/
|
URL: http://conky.sf.net/
|
||||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
||||||
|
Patch0: conky-1.6.0-rdtsc.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: libXft-devel
|
BuildRequires: libXft-devel
|
||||||
|
@ -23,13 +25,9 @@ BuildRequires: libXext-devel
|
||||||
BuildRequires: audacious-devel
|
BuildRequires: audacious-devel
|
||||||
BuildRequires: dbus-glib-devel
|
BuildRequires: dbus-glib-devel
|
||||||
%endif
|
%endif
|
||||||
%if %{with rss}
|
%{?with_nvidia:BuildRequires: libXNVCtrl-devel}
|
||||||
BuildRequires: curl-devel
|
%{?with_rss:BuildRequires: curl-devel}
|
||||||
%endif
|
%{?with_wlan:BuildRequires: wireless-tools-devel}
|
||||||
%if %{with wlan}
|
|
||||||
BuildRequires: wireless-tools-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A system monitor for X originally based on the torsmo code. but more kickass.
|
A system monitor for X originally based on the torsmo code. but more kickass.
|
||||||
|
@ -37,6 +35,7 @@ It just keeps on given'er. Yeah.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1 -b .rdtsc
|
||||||
|
|
||||||
for i in AUTHORS ChangeLog; do
|
for i in AUTHORS ChangeLog; do
|
||||||
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
|
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
|
||||||
|
@ -44,21 +43,12 @@ done
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
%if %{with audacious}
|
%{?with_audacious: --enable-audacious=yes} \
|
||||||
--enable-audacious=yes \
|
%{!?with_mpd: --disable-mpd} \
|
||||||
%endif
|
%{?with_nvidia: --enable-nvidia} \
|
||||||
%if ! %{with mpd}
|
%{?with_rss: --enable-rss} \
|
||||||
--disable-mpd \
|
%{?with_smapi: --enable-smapi} \
|
||||||
%endif
|
%{?with_wlan: --enable-wlan} \
|
||||||
%if %{with rss}
|
|
||||||
--enable-rss \
|
|
||||||
%endif
|
|
||||||
%if %{with smapi}
|
|
||||||
--enable-smapi \
|
|
||||||
%endif
|
|
||||||
%if %{with wlan}
|
|
||||||
--enable-wlan \
|
|
||||||
%endif
|
|
||||||
;
|
;
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
@ -82,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 22 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.6.0-1
|
||||||
|
- Update to 1.6.0
|
||||||
|
- Fix freq_dyn on x86_64
|
||||||
|
|
||||||
* Tue Apr 01 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.5.1-1
|
* Tue Apr 01 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.5.1-1
|
||||||
- Update to 1.5.1
|
- Update to 1.5.1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue