rpms/gkrellm/devel .cvsignore, 1.3, 1.4 gkrellm-2.1.28-config.patch, 1.1, 1.2 gkrellm.spec, 1.7, 1.8 sources, 1.3, 1.4 gkrellm-2.1.24-libdir.patch, 1.1, NONE gkrellm-2.2.10-via686.patch, 1.1, NONE gkrellm-2.2.9-gkrellmd.conf.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Jul 22 14:10:44 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12076
Modified Files:
.cvsignore gkrellm-2.1.28-config.patch gkrellm.spec sources
Removed Files:
gkrellm-2.1.24-libdir.patch gkrellm-2.2.10-via686.patch
gkrellm-2.2.9-gkrellmd.conf.patch
Log Message:
* Sun Jul 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-1
- New upstream release 2.3.0
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 31 Oct 2006 16:29:31 -0000 1.3
+++ .cvsignore 22 Jul 2007 14:10:11 -0000 1.4
@@ -1 +1 @@
-gkrellm-2.2.10.tar.bz2
+gkrellm-2.3.0.tar.bz2
gkrellm-2.1.28-config.patch:
Index: gkrellm-2.1.28-config.patch
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm-2.1.28-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellm-2.1.28-config.patch 19 Jul 2006 18:35:32 -0000 1.1
+++ gkrellm-2.1.28-config.patch 22 Jul 2007 14:10:11 -0000 1.2
@@ -1,6 +1,7 @@
---- gkrellm-2.1.28/server/gkrellmd.conf.rh1 2004-03-10 14:06:21.883901449 +0100
-+++ gkrellm-2.1.28/server/gkrellmd.conf 2004-03-10 14:12:20.712149159 +0100
-@@ -17,18 +17,19 @@
+diff -up gkrellm-2.3.0/server/gkrellmd.conf.config gkrellm-2.3.0/server/gkrellmd.conf
+--- gkrellm-2.3.0/server/gkrellmd.conf.config 2006-11-28 20:34:37.000000000 +0100
++++ gkrellm-2.3.0/server/gkrellmd.conf 2007-07-22 14:00:54.000000000 +0200
+@@ -17,21 +17,22 @@ port 19150
# List of hosts allowed to connect. If no hosts are specified in a
# gkrellmd.conf file or on the command line, all hosts will be allowed.
#
@@ -17,7 +18,11 @@
-#user nobody
-#group proc
+user gkrellmd
-+group proc
++group gkrellmd
+
+ # Create a PID file for the running gkrellmd. Default is no PID file.
+-#pidfile /var/run/gkrellmd.pid
++pidfile /var/run/gkrellmd.pid
# Run in background and detach from the controlling terminal
-#detach
@@ -25,7 +30,7 @@
# Time interval between checks for various monitors. If nfs-interval
# is <= 0 then gkrellmd will not read data for nfs file system types.
-@@ -51,7 +52,7 @@
+@@ -61,7 +62,7 @@ port 19150
# Minimum is 2 (less than 2 for no I/O disconnecting and is the default).
# Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
#
@@ -34,7 +39,7 @@
# Configure gkrellm clients to attempt automatic reconnects to a
# gkrellmd server every reconnect-timeout seconds after a disconnected
-@@ -60,7 +61,7 @@
+@@ -70,7 +71,7 @@ port 19150
# Minimum is 2 (less than 2 for no automatic reconnecting and is the default).
# Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
#
Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gkrellm.spec 20 Jul 2007 17:07:04 -0000 1.7
+++ gkrellm.spec 22 Jul 2007 14:10:11 -0000 1.8
@@ -1,6 +1,6 @@
Name: gkrellm
-Version: 2.2.10
-Release: 3%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
Summary: Multiple stacked system monitors in one process
Group: Applications/System
License: GPL
@@ -9,13 +9,10 @@
Source1: gkrellmd.init
Source2: gkrellm.desktop
Source3: gkrellm.png
-Patch0: gkrellm-2.1.24-libdir.patch
Patch1: gkrellm-2.1.28-config.patch
Patch2: gkrellm-2.2.4-sansfont.patch
Patch3: gkrellm-2.2.7-width.patch
Patch4: gkrellm-2.2.9-libdir.patch
-Patch5: gkrellm-2.2.9-gkrellmd.conf.patch
-Patch6: gkrellm-2.2.10-via686.patch
BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
BuildRequires: lm_sensors-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,13 +57,10 @@
%prep
%setup -q
-%patch0 -p1 -z .libdir
%patch1 -p1 -z .config
%patch2 -p1 -z .sansfont
%patch3 -p1 -z .width
%patch4 -p1 -z .libdir2
-%patch5 -p1 -z .conf-patch
-%patch6 -p1 -z .via686
for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -173,6 +167,9 @@
%changelog
+* Sun Jul 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-1
+- New upstream release 2.3.0
+
* Fri Jul 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-3
- Rebuild, including libsensors support on ppc and ppc64 as lm_sensors is
available there now.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 Oct 2006 16:29:31 -0000 1.3
+++ sources 22 Jul 2007 14:10:11 -0000 1.4
@@ -1 +1 @@
-57ef0525c0997ac2e7720712811f5a84 gkrellm-2.2.10.tar.bz2
+8ced6843f4681ad8501fd04285ecff1f gkrellm-2.3.0.tar.bz2
--- gkrellm-2.1.24-libdir.patch DELETED ---
--- gkrellm-2.2.10-via686.patch DELETED ---
--- gkrellm-2.2.9-gkrellmd.conf.patch DELETED ---
More information about the scm-commits
mailing list