Author: draenog Date: Sun Feb 14 00:58:23 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.3.4 - remove getline.patch (fixed upstream)
---- Files affected: packages/gkrellm: gkrellm.spec (1.129 -> 1.130) , gkrellm-pl.po-update.patch (1.4 -> 1.5) , gkrellm-lm_sensors.patch (1.3 -> 1.4) , gkrellm-opt.patch (1.2 -> 1.3) , gkrellm-getline.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/gkrellm/gkrellm.spec diff -u packages/gkrellm/gkrellm.spec:1.129 packages/gkrellm/gkrellm.spec:1.130 --- packages/gkrellm/gkrellm.spec:1.129 Sun Jul 5 12:54:48 2009 +++ packages/gkrellm/gkrellm.spec Sun Feb 14 01:58:17 2010 @@ -10,12 +10,12 @@ Summary(ru.UTF-8): GKrellM - это стек системных мониторов в рамках одного процесса Summary(uk.UTF-8): GKrellM - це стек системних моніторів у рамках одного процесу Name: gkrellm -Version: 2.3.2 -Release: 2 +Version: 2.3.4 +Release: 0.01 License: GPL v3+ Group: X11/Applications Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.gz -# Source0-md5: db8a983a60577a6b4886db96d6def011 +# Source0-md5: 600f4daa395112ed19a3633deb0829ff Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}d.init @@ -25,7 +25,6 @@ Patch2: %{name}-pl.po-update.patch Patch3: %{name}-lm_sensors.patch Patch4: %{name}-ldflags.patch -Patch5: %{name}-getline.patch URL: http://www.gkrellm.net/ BuildRequires: gettext-devel BuildRequires: glib2-devel >= 2.2.0 @@ -136,7 +135,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build %{__make} \ @@ -213,6 +211,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.130 2010/02/14 00:58:17 draenog +- up to 2.3.4 +- remove getline.patch (fixed upstream) + Revision 1.129 2009/07/05 10:54:48 gzohop - getline patch from gentoo ================================================================ Index: packages/gkrellm/gkrellm-pl.po-update.patch diff -u packages/gkrellm/gkrellm-pl.po-update.patch:1.4 packages/gkrellm/gkrellm-pl.po-update.patch:1.5 --- packages/gkrellm/gkrellm-pl.po-update.patch:1.4 Tue Jan 20 03:36:45 2009 +++ packages/gkrellm/gkrellm-pl.po-update.patch Sun Feb 14 01:58:17 2010 @@ -1,5 +1,5 @@ ---- gkrellm-2.3.2/po/pl.po.orig 2008-10-04 00:27:05.000000000 +0100 -+++ gkrellm-2.3.2/po/pl.po 2009-01-19 18:17:29.000000000 +0000 +--- gkrellm-2.3.2/po/pl.po.orig 2009-12-21 01:56:48.000000000 +0000 ++++ gkrellm-2.3.2/po/pl.po 2010-02-14 00:28:39.233137768 +0000 @@ -1,11 +1,11 @@ # translation of pl.po to Polish -# Polish Translation of GKrellM. Copyright Przemys�aw Su�ek @@ -8,22 +8,22 @@ +# Polish Translation of GKrellM. Released under the GPL. +# Copyright Przemys�aw Su�ek <[email protected]>, 2001-2003. +# Jakub Bogusz <[email protected]>, 2006 - # Micha� Smoczyk <[email protected]>, 2007, 2008. + # Micha� Smoczyk <[email protected]>, 2009, 2008. msgid "" msgstr "" -"Project-Id-Version: pl\n" +"Project-Id-Version: GKrellM 2.2.10\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-10-03 18:27-0500\n" + "POT-Creation-Date: 2009-12-20 19:56-0600\n" "PO-Revision-Date: 2008-01-26 16:27+0100\n" @@ -2065,7 +2065,7 @@ - #: ../src/main.c:1984 + #: ../src/main.c:1999 msgid "segmentation fault" -msgstr "" +msgstr "naruszenie ochrony pami�ci" - #: ../src/main.c:1986 + #: ../src/main.c:2001 msgid "floating point exception" @@ -2193,6 +2193,9 @@ "The free and used variables may have a 'r' qualifier for printing\n" @@ -33,5 +33,5 @@ +"Prosz� sprawdzi� numer portu mbmon i opcj� '-r'.\n" +"Aby uzyska� wyj�cie diagnostyczne, mo�na uruchomi� gkrellmd -d 0x80.\n" - #: ../src/mem.c:1274 + #: ../src/mem.c:1286 msgid "" ================================================================ Index: packages/gkrellm/gkrellm-lm_sensors.patch diff -u packages/gkrellm/gkrellm-lm_sensors.patch:1.3 packages/gkrellm/gkrellm-lm_sensors.patch:1.4 --- packages/gkrellm/gkrellm-lm_sensors.patch:1.3 Tue Jan 20 03:35:27 2009 +++ packages/gkrellm/gkrellm-lm_sensors.patch Sun Feb 14 01:58:17 2010 @@ -1,7 +1,7 @@ diff -u -r gkrellm-2.3.0.orig/server/configure gkrellm-2.3.0/server/configure --- gkrellm-2.3.0.orig/server/configure 2006-10-25 01:39:43.000000000 +0200 +++ gkrellm-2.3.0/server/configure 2007-10-26 02:02:20.000000000 +0200 -@@ -29,19 +29,10 @@ +@@ -29,28 +29,11 @@ echo "Checking for libsensors... " 1>& 5 cat << EOF > test.c @@ -12,15 +12,24 @@ { - FILE *f; - +-#if SENSORS_API_VERSION < 0x400 /* libsensors 3 code */ +- FILE *f; +- - f = fopen("/etc/sensors.conf", "r"); - if (!f) - return 1; - if (sensors_init(f) != 0) - return 1; - fclose(f); +- return 0; +-#else /* libsensors 4 code */ +- if (sensors_init(NULL) != 0) +- return 1; return 0; +-#endif } EOF + --- gkrellm-2.3.2/src/configure.orig 2008-10-03 23:44:08.000000000 +0100 +++ gkrellm-2.3.2/src/configure 2009-01-19 18:57:39.000000000 +0000 @@ -158,26 +158,11 @@ ================================================================ Index: packages/gkrellm/gkrellm-opt.patch diff -u packages/gkrellm/gkrellm-opt.patch:1.2 packages/gkrellm/gkrellm-opt.patch:1.3 --- packages/gkrellm/gkrellm-opt.patch:1.2 Tue Jan 20 03:33:38 2009 +++ packages/gkrellm/gkrellm-opt.patch Sun Feb 14 01:58:17 2010 @@ -1,12 +1,12 @@ --- gkrelkm-2.3.2/src/Makefile.orig 2009-01-19 17:59:24.000000000 +0000 +++ gkrellm-2.3.2/src/Makefile 2009-01-19 17:59:40.000000000 +0000 -@@ -78,7 +78,8 @@ +@@ -87,7 +87,8 @@ PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` -FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC) \ +OPTFLAGS = -O2 +FLAGS = $(OPTFLAGS) -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC) \ - -DGKRELLM_CLIENT + ${NTLM_INCLUDES} -DGKRELLM_CLIENT - LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(NTLM_LIBS) $(SENSORS_LIBS) + LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS) \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gkrellm/gkrellm.spec?r1=1.129&r2=1.130&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gkrellm/gkrellm-pl.po-update.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gkrellm/gkrellm-lm_sensors.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gkrellm/gkrellm-opt.patch?r1=1.2&r2=1.3&f=u
_______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
