parent
794385b4a4
commit
f6188cdad4
|
@ -1 +1 @@
|
|||
conky-1.4.9.tar.bz2
|
||||
conky-1.5.0.tar.bz2
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
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
|
21
conky.spec
21
conky.spec
|
@ -1,11 +1,12 @@
|
|||
%bcond_without audacious
|
||||
%bcond_without mpd
|
||||
%bcond_without rss
|
||||
%bcond_without smapi
|
||||
%bcond_without wlan
|
||||
|
||||
Name: conky
|
||||
Version: 1.4.9
|
||||
Release: 2%{?dist}
|
||||
Version: 1.5.0
|
||||
Release: 1%{?dist}
|
||||
Summary: A system monitor for X
|
||||
|
||||
Group: User Interface/X
|
||||
|
@ -14,6 +15,8 @@ URL: http://conky.sf.net/
|
|||
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
|
||||
|
@ -36,6 +39,11 @@ It just keeps on given'er. Yeah.
|
|||
|
||||
%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 \
|
||||
|
@ -48,6 +56,9 @@ It just keeps on given'er. Yeah.
|
|||
%if %{with rss}
|
||||
--enable-rss \
|
||||
%endif
|
||||
%if %{with smapi}
|
||||
--enable-smapi \
|
||||
%endif
|
||||
%if %{with wlan}
|
||||
--enable-wlan \
|
||||
%endif
|
||||
|
@ -66,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
%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}/*
|
||||
|
@ -74,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Mar 23 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.5.0-1
|
||||
- Update to 1.5.0
|
||||
- Convert doc files to UTF-8
|
||||
|
||||
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.4.9-2
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
|
|
Loading…
Reference in New Issue