Compare commits
7 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | 4255c3cc9e | |
Bill Nottingham | 0c466b7105 | |
Miroslav Lichvar | 9b7db8dd7f | |
Miroslav Lichvar | f53a35e238 | |
Miroslav Lichvar | 96b52e2c86 | |
Miroslav Lichvar | c9d50c243d | |
Bill Nottingham | cce5a87cff |
|
@ -1 +0,0 @@
|
|||
conky-1.4.5.tar.bz2
|
|
@ -0,0 +1 @@
|
|||
conky-1.5.1.tar.bz2
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: conky
|
||||
# $Id$
|
||||
NAME := conky
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
|
@ -1,37 +0,0 @@
|
|||
--- /home/errr/src/conky-1.4.5/NEWS 2006-11-21 14:08:08.000000000 -0600
|
||||
+++ NEWS 2006-12-14 00:29:27.000000000 -0600
|
||||
@@ -1,3 +1,34 @@
|
||||
+Summary of changes for Conky release 1.4.5:
|
||||
+-------------------------------------------
|
||||
+Added config items:
|
||||
+- max_specials
|
||||
+- max_port_monitor_connections
|
||||
+
|
||||
+Removed config items:
|
||||
+- min_port_monitors
|
||||
+- min_port_monitor_connections
|
||||
+
|
||||
+Added variables:
|
||||
+- entropy_avail
|
||||
+- entropy_poolsize
|
||||
+- entropy_bar
|
||||
+
|
||||
+Added length specifier to audacious_title.
|
||||
+
|
||||
+Split battery var into:
|
||||
+- battery and battery_time
|
||||
+
|
||||
+Fixed broken texeci variable.
|
||||
+Fixed build error with --disable-x11.
|
||||
+Fixed build error with --disable-xdamage.
|
||||
+Fixed acpi battery issues.
|
||||
+Fixed mem var overflows when >= 4GB.
|
||||
+Close pop3/imap sockets properly.
|
||||
+Improved internal thread handling.
|
||||
+Converted tcp_portmon internal hash to GLib
|
||||
+for GPL compatibility.
|
||||
+
|
||||
+
|
||||
Summary of changes for Conky release 1.4.4:
|
||||
-------------------------------------------
|
||||
* fix build error for freebsd.
|
|
@ -1,34 +0,0 @@
|
|||
--- /home/errr/src/conky-1.4.5/src/timed_thread.c 2006-12-02 17:07:47.000000000 -0600
|
||||
+++ src/timed_thread.c 2006-12-14 00:29:24.000000000 -0600
|
||||
@@ -1,10 +1,26 @@
|
||||
-/* $Id: timed_thread.c 803 2006-12-02 23:07:21Z pkovacs $ */
|
||||
+/* $Id: timed_thread.c 817 2006-12-13 16:54:59Z pkovacs $ */
|
||||
|
||||
-/* timed_thread.c
|
||||
- * Author: Philip Kovacs
|
||||
+/*
|
||||
+ * timed_thread.c: Abstraction layer for timed threads
|
||||
*
|
||||
- * Abstraction layer for timed threads
|
||||
- * */
|
||||
+ * Copyright (C) 2006 Philip Kovacs pkovacs@users.sourceforge.net
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
|
||||
+ * USA.
|
||||
+ *
|
||||
+ */
|
||||
|
||||
#include <pthread.h>
|
||||
#include <assert.h>
|
|
@ -1,34 +0,0 @@
|
|||
--- /home/errr/src/conky-1.4.5/src/timed_thread.h 2006-11-21 14:08:07.000000000 -0600
|
||||
+++ src/timed_thread.h 2006-12-14 00:29:24.000000000 -0600
|
||||
@@ -1,10 +1,26 @@
|
||||
-/* $Id: timed_thread.h 772 2006-11-15 01:20:49Z pkovacs $ */
|
||||
+/* $Id: timed_thread.h 817 2006-12-13 16:54:59Z pkovacs $ */
|
||||
|
||||
-/* timed_thread.h
|
||||
- * Author: Philip Kovacs
|
||||
+/*
|
||||
+ * timed_thread.h: Abstraction layer for timed threads
|
||||
*
|
||||
- * Abstraction layer for timed threads
|
||||
- * */
|
||||
+ * Copyright (C) 2006 Philip Kovacs pkovacs@users.sourceforge.net
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
|
||||
+ * USA.
|
||||
+ *
|
||||
+ */
|
||||
|
||||
#ifndef _TIMED_THREAD_H_
|
||||
#define _TIMED_THREAD_H_
|
81
conky.spec
81
conky.spec
|
@ -1,22 +1,33 @@
|
|||
%bcond_without audacious
|
||||
%bcond_without mpd
|
||||
%bcond_without rss
|
||||
%bcond_without smapi
|
||||
%bcond_without wlan
|
||||
|
||||
Name: conky
|
||||
Version: 1.4.5
|
||||
Release: 4%{?dist}
|
||||
Version: 1.5.1
|
||||
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 +36,29 @@ It just keeps on given'er. Yeah.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
|
||||
for i in AUTHORS ChangeLog; do
|
||||
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
|
||||
done
|
||||
|
||||
%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=legacy \
|
||||
%endif
|
||||
%if ! %{with mpd}
|
||||
--disable-mpd \
|
||||
%endif
|
||||
%if %{with rss}
|
||||
--enable-rss \
|
||||
%endif
|
||||
%if %{with smapi}
|
||||
--enable-smapi \
|
||||
%endif
|
||||
%if %{with wlan}
|
||||
--enable-wlan \
|
||||
%endif
|
||||
;
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
@ -57,12 +73,29 @@ 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}/*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Apr 01 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.5.1-1
|
||||
- Update to 1.5.1
|
||||
|
||||
* Sun Mar 23 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.5.0-1
|
||||
- Update to 1.5.0
|
||||
- Convert doc files to UTF-8
|
||||
|
||||
* Tue Nov 27 2007 Miroslav Lichvar <mlichvar@redhat.com> - 1.4.9-1
|
||||
- Update to 1.4.9
|
||||
|
||||
* Sun Oct 21 2007 Miroslav Lichvar <mlichvar@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
|
||||
|
||||
|
|
Loading…
Reference in New Issue