rpms/gkrellm/EL-5 .cvsignore, 1.2, 1.3 gkrellm-2.1.28-config.patch, 1.1, 1.2 gkrellm.spec, 1.4, 1.5 sources, 1.2, 1.3 gkrellm-2.1.24-libdir.patch, 1.1, NONE gkrellm-2.2.9-gkrellmd.conf.patch, 1.1, NONE gkrellm-2.2.9-hwmon.patch, 1.1, NONE gkrellm-2.2.9-libsensors.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Sep 3 20:51:48 UTC 2007
Author: scop
Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4871
Modified Files:
.cvsignore gkrellm-2.1.28-config.patch gkrellm.spec sources
Removed Files:
gkrellm-2.1.24-libdir.patch gkrellm-2.2.9-gkrellmd.conf.patch
gkrellm-2.2.9-hwmon.patch gkrellm-2.2.9-libsensors.patch
Log Message:
Sync with devel to prepare for first EPEL build
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jul 2006 18:35:32 -0000 1.2
+++ .cvsignore 3 Sep 2007 20:51:14 -0000 1.3
@@ -1 +1 @@
-gkrellm-2.2.9.tar.bz2
+gkrellm-2.3.0.tar.bz2
gkrellm-2.1.28-config.patch:
Index: gkrellm-2.1.28-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/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 3 Sep 2007 20:51:14 -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/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm.spec 4 Oct 2006 22:26:33 -0000 1.4
+++ gkrellm.spec 3 Sep 2007 20:51:14 -0000 1.5
@@ -1,26 +1,20 @@
Name: gkrellm
-Version: 2.2.9
-Release: 10%{?dist}
+Version: 2.3.0
+Release: 2%{?dist}
Summary: Multiple stacked system monitors in one process
Group: Applications/System
-License: GPL
+License: GPLv3+
URL: http://www.gkrellm.net/
Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.bz2
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-hwmon.patch
-Patch6: gkrellm-2.2.9-libsensors.patch
-Patch7: gkrellm-2.2.9-gkrellmd.conf.patch
BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
-%ifarch %{ix86} x86_64
BuildRequires: lm_sensors-devel
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -63,14 +57,10 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch1 -p1 -z .config
+%patch2 -p1 -z .sansfont
+%patch3 -p1 -z .width
+%patch4 -p1 -z .libdir2
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
@@ -83,15 +73,8 @@
%build
-%ifarch %{ix86} x86_64
-CFLAGS="$RPM_OPT_FLAGS -DHAVE_LIBSENSORS"
-SYS_LIBS="-lsensors"
-%else
-CFLAGS="$RPM_OPT_FLAGS"
-SYS_LIBS=
-%endif
make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
- INCLUDEDIR=%{_includedir} CFLAGS="$CFLAGS" SYS_LIBS="$SYS_LIBS"
+ INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS"
%install
@@ -116,7 +99,6 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor gnome \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
%{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE3} \
@@ -184,6 +166,23 @@
%changelog
+* Tue Aug 7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-2
+- Update License tag for new Licensing Guidelines compliance
+
+* 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.
+
+* Wed Nov 8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-2
+- Add special case for via 686 volt sensors <sigh> (bug 213304)
+
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-1
+- New upstream release 2.2.10
+- Drop integrated lmsensors and sysfs sensors patches
+
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.9-10
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jul 2006 18:35:32 -0000 1.2
+++ sources 3 Sep 2007 20:51:14 -0000 1.3
@@ -1 +1 @@
-5334155797901724f4eb46a82ad72395 gkrellm-2.2.9.tar.bz2
+8ced6843f4681ad8501fd04285ecff1f gkrellm-2.3.0.tar.bz2
--- gkrellm-2.1.24-libdir.patch DELETED ---
--- gkrellm-2.2.9-gkrellmd.conf.patch DELETED ---
--- gkrellm-2.2.9-hwmon.patch DELETED ---
--- gkrellm-2.2.9-libsensors.patch DELETED ---
More information about the fedora-extras-commits
mailing list