rpms/gkrellm/EL-5 gkrellm-2.3.0-gnutls.patch, NONE, 1.1 gkrellm.spec, 1.5, 1.6
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue Sep 4 18:25:16 UTC 2007
Author: scop
Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23986
Modified Files:
gkrellm.spec
Added Files:
gkrellm-2.3.0-gnutls.patch
Log Message:
Resync with devel
gkrellm-2.3.0-gnutls.patch:
--- NEW FILE gkrellm-2.3.0-gnutls.patch ---
diff -up gkrellm-2.3.0/src/configure~ gkrellm-2.3.0/src/configure
--- gkrellm-2.3.0/src/configure~ 2007-05-07 02:45:55.000000000 +0300
+++ gkrellm-2.3.0/src/configure 2007-09-04 00:10:36.000000000 +0300
@@ -41,6 +41,7 @@ echo "Checking for gnutls... " 1>& 5
cat << EOF > test.c
#include <gnutls/openssl.h>
+#include <gcrypt.h>
#include <errno.h>
#include <pthread.h>
diff -up gkrellm-2.3.0/src/mail.c~ gkrellm-2.3.0/src/mail.c
--- gkrellm-2.3.0/src/mail.c~ 2007-07-07 02:45:25.000000000 +0300
+++ gkrellm-2.3.0/src/mail.c 2007-09-04 00:10:49.000000000 +0300
@@ -34,6 +34,7 @@
#if defined(HAVE_GNUTLS)
#include <gnutls/openssl.h>
+#include <gcrypt.h>
#include <pthread.h>
#define MD5Init MD5_Init
#define MD5Update MD5_Update
Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm.spec 3 Sep 2007 20:51:14 -0000 1.5
+++ gkrellm.spec 4 Sep 2007 18:24:44 -0000 1.6
@@ -1,6 +1,6 @@
Name: gkrellm
Version: 2.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Multiple stacked system monitors in one process
Group: Applications/System
License: GPLv3+
@@ -9,11 +9,12 @@
Source1: gkrellmd.init
Source2: gkrellm.desktop
Source3: gkrellm.png
+Patch0: gkrellm-2.3.0-gnutls.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
-BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
+BuildRequires: gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
BuildRequires: lm_sensors-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +35,7 @@
%package daemon
Summary: The GNU Krell Monitors Server
Group: System Environment/Daemons
-Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
+Requires(pre): shadow-utils
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
@@ -57,6 +58,7 @@
%prep
%setup -q
+%patch0 -p1 -z .gnutls
%patch1 -p1 -z .config
%patch2 -p1 -z .sansfont
%patch3 -p1 -z .width
@@ -119,9 +121,10 @@
%pre daemon
-# the daemon shouldn't run as nobody
-/usr/sbin/groupadd -r gkrellmd 2> /dev/null || :
-/usr/sbin/useradd -s /sbin/nologin -M -d / -c "GNU Krell daemon" -r -g gkrellmd gkrellmd 2> /dev/null || :
+getent group gkrellmd >/dev/null || groupadd -r gkrellmd
+getent passwd gkrellmd >/dev/null || \
+useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd
+:
%post daemon
/sbin/chkconfig --add gkrellmd || :
@@ -166,6 +169,10 @@
%changelog
+* Tue Sep 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-3
+- Fix gnutls detection/build and use it instead of openssl.
+- Sync user and group creation with current Fedora guidelines.
+
* 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
More information about the fedora-extras-commits
mailing list