From 75ab6ddeae13fce7bc9f493a48cb545983f5e918 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 19 Jul 2006 18:35:32 +0000 Subject: [PATCH 001/100] auto-import gkrellm-2.2.9-7 on branch devel from gkrellm-2.2.9-7.src.rpm --- .cvsignore | 1 + gkrellm-2.1.24-libdir.patch | 11 + gkrellm-2.1.28-config.patch | 45 +++ gkrellm-2.2.4-sansfont.patch | 17 ++ gkrellm-2.2.7-width.patch | 11 + gkrellm-2.2.9-gkrellmd.conf.patch | 11 + gkrellm-2.2.9-hwmon.patch | 38 +++ gkrellm-2.2.9-libdir.patch | 42 +++ gkrellm-2.2.9-libsensors.patch | 326 +++++++++++++++++++++ gkrellm.desktop | 9 + gkrellm.png | Bin 0 -> 3149 bytes gkrellm.spec | 469 ++++++++++++++++++++++++++++++ gkrellmd.init | 58 ++++ sources | 1 + 14 files changed, 1039 insertions(+) create mode 100644 gkrellm-2.1.24-libdir.patch create mode 100644 gkrellm-2.1.28-config.patch create mode 100644 gkrellm-2.2.4-sansfont.patch create mode 100644 gkrellm-2.2.7-width.patch create mode 100644 gkrellm-2.2.9-gkrellmd.conf.patch create mode 100644 gkrellm-2.2.9-hwmon.patch create mode 100644 gkrellm-2.2.9-libdir.patch create mode 100644 gkrellm-2.2.9-libsensors.patch create mode 100644 gkrellm.desktop create mode 100644 gkrellm.png create mode 100644 gkrellm.spec create mode 100644 gkrellmd.init diff --git a/.cvsignore b/.cvsignore index e69de29..476a8c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +gkrellm-2.2.9.tar.bz2 diff --git a/gkrellm-2.1.24-libdir.patch b/gkrellm-2.1.24-libdir.patch new file mode 100644 index 0000000..459b7cd --- /dev/null +++ b/gkrellm-2.1.24-libdir.patch @@ -0,0 +1,11 @@ +--- gkrellm-2.1.24/src/Makefile.lib64 2004-01-09 13:32:02.000000000 +0100 ++++ gkrellm-2.1.24/src/Makefile 2004-01-09 13:32:23.000000000 +0100 +@@ -17,7 +17,7 @@ + MANDIRMODE ?= 755 + INSTALL ?= install + LINK_FLAGS ?= -Wl,-E +-SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE ++SMC_LIBS ?= -lSM -lICE + + ifeq ($(without-ssl),1) + CONFIGURE_ARGS += --without-ssl diff --git a/gkrellm-2.1.28-config.patch b/gkrellm-2.1.28-config.patch new file mode 100644 index 0000000..019aa3a --- /dev/null +++ b/gkrellm-2.1.28-config.patch @@ -0,0 +1,45 @@ +--- 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 @@ + # 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. + # +-#allow-host localhost +-#allow-host 127.0.0.1 ++allow-host localhost ++allow-host 127.0.0.1 ++allow-host ::ffff:127.0.0.1 + #allow-host ::1 + #allow-host 192.168.0.* + + # Drop privileges after startup (you must start gkrellmd as root to do it). + # +-#user nobody +-#group proc ++user gkrellmd ++group proc + + # Run in background and detach from the controlling terminal +-#detach ++detach + + # 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 @@ + # 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. + # +-#io-timeout 5 ++io-timeout 5 + + # Configure gkrellm clients to attempt automatic reconnects to a + # gkrellmd server every reconnect-timeout seconds after a disconnected +@@ -60,7 +61,7 @@ + # 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. + # +-#reconnect-timeout 5 ++reconnect-timeout 5 + + # Server side local mailbox counts can be sent to gkrellm clients. List here + # paths to mbox, MH mail, or Maildir style mailboxes. diff --git a/gkrellm-2.2.4-sansfont.patch b/gkrellm-2.2.4-sansfont.patch new file mode 100644 index 0000000..460eb5e --- /dev/null +++ b/gkrellm-2.2.4-sansfont.patch @@ -0,0 +1,17 @@ +--- gkrellm-2.2.4/src/gui.c.font 2005-05-17 15:37:16.000000000 +0200 ++++ gkrellm-2.2.4/src/gui.c 2005-05-17 15:37:46.000000000 +0200 +@@ -1575,11 +1575,11 @@ + if (!_GK.theme_path || !g_file_test(_GK.theme_path, G_FILE_TEST_IS_DIR)) + gkrellm_dup_string(&_GK.theme_path, ""); + if (!large_font.string) +- gkrellm_dup_string(&large_font.string, "Serif 11"); ++ gkrellm_dup_string(&large_font.string, "Sans 11"); + if (!normal_font.string) +- gkrellm_dup_string(&normal_font.string, "Serif 9"); ++ gkrellm_dup_string(&normal_font.string, "Sans 9"); + if (!small_font.string) +- gkrellm_dup_string(&small_font.string, "Serif 8"); ++ gkrellm_dup_string(&small_font.string, "Sans 8"); + } + + diff --git a/gkrellm-2.2.7-width.patch b/gkrellm-2.2.7-width.patch new file mode 100644 index 0000000..c7fc220 --- /dev/null +++ b/gkrellm-2.2.7-width.patch @@ -0,0 +1,11 @@ +--- gkrellm-2.2.7/src/gkrellm.h.width 2005-06-09 12:48:34.000000000 +0200 ++++ gkrellm-2.2.7/src/gkrellm.h 2005-06-09 12:48:37.000000000 +0200 +@@ -518,7 +518,7 @@ + GkrellmCallback; + + +-#define CHART_WIDTH_MAX 1000 ++#define CHART_WIDTH_MAX 1600 + #define CHART_WIDTH_MIN 25 + + /* Each chart must have a GkrellmChartconfig struct associated with it. diff --git a/gkrellm-2.2.9-gkrellmd.conf.patch b/gkrellm-2.2.9-gkrellmd.conf.patch new file mode 100644 index 0000000..c78ec06 --- /dev/null +++ b/gkrellm-2.2.9-gkrellmd.conf.patch @@ -0,0 +1,11 @@ +--- gkrellm-2.2.9/server/gkrellmd.conf~ 2006-07-16 20:44:23.000000000 +0200 ++++ gkrellm-2.2.9/server/gkrellmd.conf 2006-07-16 20:44:23.000000000 +0200 +@@ -26,7 +26,7 @@ + # Drop privileges after startup (you must start gkrellmd as root to do it). + # + user gkrellmd +-group proc ++group gkrellmd + + # Run in background and detach from the controlling terminal + detach diff --git a/gkrellm-2.2.9-hwmon.patch b/gkrellm-2.2.9-hwmon.patch new file mode 100644 index 0000000..3c16d5a --- /dev/null +++ b/gkrellm-2.2.9-hwmon.patch @@ -0,0 +1,38 @@ +--- gkrellm-2.2.9/src/sysdeps/linux.c~ 2006-07-05 21:44:55.000000000 +0200 ++++ gkrellm-2.2.9/src/sysdeps/linux.c 2006-07-05 21:55:48.000000000 +0200 +@@ -1888,6 +1888,7 @@ + #define THERMAL_DIR "/proc/acpi/thermal" + #define SENSORS_DIR "/proc/sys/dev/sensors" + #define SYSFS_I2C_DIR "/sys/bus/i2c/devices" ++#define SYSFS_CLASS_DIR "/sys/class/hwmon" + #define UNINORTH_DIR "/sys/devices/temperatures" + + /* mbmon and hddtemp sensor interfaces are handled in sensors-common.c +@@ -2351,15 +2352,24 @@ + gchar *name, *bus_name, *default_label, *vref, + *id_name, *chip_name, *s, *d, *sensor_path; + gchar path[256], buf[256]; ++ gboolean using_i2c_dir = FALSE; + + if (!have_sysfs) + return; + +- if ((dir = g_dir_open(SYSFS_I2C_DIR, 0, NULL)) == NULL) +- return; ++ if ((dir = g_dir_open(SYSFS_CLASS_DIR, 0, NULL)) == NULL) ++ { ++ /* try again with the sysfs i2c dir for older 2.6 kernels */ ++ if ((dir = g_dir_open(SYSFS_I2C_DIR, 0, NULL)) == NULL) ++ return; ++ using_i2c_dir = TRUE; ++ } + while ((bus_name = (gchar *) g_dir_read_name(dir)) != NULL) + { +- snprintf(path, sizeof(path), "%s/%s", SYSFS_I2C_DIR, bus_name); ++ if (using_i2c_dir) ++ snprintf(path, sizeof(path), "%s/%s", SYSFS_I2C_DIR, bus_name); ++ else ++ snprintf(path, sizeof(path), "%s/%s/device", SYSFS_CLASS_DIR, bus_name); + if ((chip_dir = g_dir_open(path, 0, NULL)) == NULL) + continue; + if ((chip_name = sysfs_get_chip_name(path)) == NULL) diff --git a/gkrellm-2.2.9-libdir.patch b/gkrellm-2.2.9-libdir.patch new file mode 100644 index 0000000..81c5a75 --- /dev/null +++ b/gkrellm-2.2.9-libdir.patch @@ -0,0 +1,42 @@ +--- gkrellm-2.2.9/server/gkrellmd.h.libdir 2006-05-15 14:32:02.000000000 +0200 ++++ gkrellm-2.2.9/server/gkrellmd.h 2006-05-15 14:35:02.000000000 +0200 +@@ -105,9 +105,16 @@ + #define GKRELLMD_CONFIG "gkrellmd.conf" + + #define GKRELLMD_PLUGINS_DIR ".gkrellm2/plugins-gkrellmd" +-#define GKRELLMD_LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins-gkrellmd" ++ ++#if defined (__x86_64__) || defined (__s390x__) || defined (__ppc64__) || defined(__powerpc64__) ++#define LIBDIREXT "lib64" ++#else ++#define LIBDIREXT "lib" ++#endif ++ ++#define GKRELLMD_LOCAL_PLUGINS_DIR "/usr/local/"LIBDIREXT"/gkrellm2/plugins-gkrellmd" + #if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR) +-#define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd" ++#define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/"LIBDIREXT"/gkrellm2/plugins-gkrellmd" + #endif + + #if !defined(WIN32) +--- gkrellm-2.2.9/src/gkrellm.h.libdir 2006-05-15 14:09:01.000000000 +0200 ++++ gkrellm-2.2.9/src/gkrellm.h 2006-05-15 14:36:39.000000000 +0200 +@@ -118,9 +118,16 @@ + #if !defined(SYSTEM_THEMES_DIR) + #define SYSTEM_THEMES_DIR "/usr/share/gkrellm2/themes" + #endif +-#define LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins" ++ ++#if defined (__x86_64__) || defined (__s390x__) || defined (__ppc64__) || defined(__powerpc64__) ++#define LIBDIREXT "lib64" ++#else ++#define LIBDIREXT "lib" ++#endif ++ ++#define LOCAL_PLUGINS_DIR "/usr/local/"LIBDIREXT"/gkrellm2/plugins" + #if !defined(SYSTEM_PLUGINS_DIR) +-#define SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins" ++#define SYSTEM_PLUGINS_DIR "/usr/"LIBDIREXT"/gkrellm2/plugins" + #endif + + #else diff --git a/gkrellm-2.2.9-libsensors.patch b/gkrellm-2.2.9-libsensors.patch new file mode 100644 index 0000000..258ffb0 --- /dev/null +++ b/gkrellm-2.2.9-libsensors.patch @@ -0,0 +1,326 @@ +--- gkrellm-2.2.9/src/sysdeps/linux.c.libsensors 2006-07-07 15:13:14.000000000 +0200 ++++ gkrellm-2.2.9/src/sysdeps/linux.c 2006-07-07 15:13:23.000000000 +0200 +@@ -29,8 +29,11 @@ + have_diskstats, + have_partition_stats, + have_sysfs, +- have_sysfs_stats, +- have_sysfs_sensors; ++ have_sysfs_stats; ++#ifndef HAVE_LIBSENSORS ++static gboolean have_sysfs_sensors; ++#endif ++ + static gchar locale_decimal_point; + + +@@ -1912,6 +1915,158 @@ + #define IBM_ACPI_NA2_TEMP 7 + #define IBM_ACPI_FAN 8 + ++#ifdef HAVE_LIBSENSORS ++#include ++ ++static void libsensors_init(void) ++{ ++ int nr, nr1, nr2, len; ++ const sensors_chip_name *name; ++ const sensors_feature_data *feature; ++ char *label; ++ FILE *f; ++ char id_name[512], sensor_path[512]; ++ int type; ++ ++ f = fopen("/etc/sensors.conf", "r"); ++ if (!f) { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors error could not open /etc/sensors.conf\n"); ++ return; ++ } ++ ++ if (sensors_init(f) != 0) { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors init failed!\n"); ++ return; ++ } ++ fclose(f); ++ ++ nr = 0; ++ while ((name = sensors_get_detected_chips(&nr))) { ++ nr1 = 0, nr2 = 0; ++ while ((feature = sensors_get_all_features(*name, &nr1, &nr2))) { ++ if (sensors_get_ignored(*name, feature->number) && ++ feature->mapping == SENSORS_NO_MAPPING) { ++ if (name->bus >= 0) ++ snprintf(id_name, sizeof(id_name), "%s@%d:%x/%s", name->prefix, ++ name->bus, name->addr, feature->name); ++ else ++ snprintf(id_name, sizeof(id_name), "%s@%x/%s", name->prefix, ++ name->addr, feature->name); ++ /* we need to store both the prefix and the busname, but we only ++ have one string, so concat them together seperated by a : */ ++ snprintf(sensor_path, sizeof(sensor_path), "%s:%s", name->prefix, ++ name->busname? name->busname:"NULL"); ++ ++ if (!strncmp(feature->name, "temp", 4)) ++ type = SENSOR_TEMPERATURE; ++ else if (!strncmp(feature->name, "fan", 3)) ++ type = SENSOR_FAN; ++ else if (!strncmp(feature->name, "in", 2)) ++ type = SENSOR_VOLTAGE; ++ else { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors error determining type for: %s\n", id_name); ++ continue; ++ } ++ ++ /* failsafe tests, check if bus and addr fit in 16 bits (signed) */ ++ if (name->bus != ((name->bus<<16)>>16)) { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors error cannot represent bus in 16 bits: %s\n", ++ id_name); ++ continue; ++ } ++ if (name->addr != ((name->addr<<16)>>16)) { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors error cannot represent addr in 16 bits: %s\n", ++ id_name); ++ continue; ++ } ++ ++ if (sensors_get_label(*name, feature->number, &label) != 0) { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors error getting label for: %s\n", id_name); ++ label = NULL; ++ } ++ ++ /* Strip some common post and prefixes to get smaller default labels */ ++ len = strlen(label); ++ switch(type) { ++ case SENSOR_TEMPERATURE: ++ if (len > 5 && !strcasecmp(label+len-5, " Temp")) ++ label[len-5] = 0; ++ if (len > 12 && !strcasecmp(label+len-12, " Temperature")) ++ label[len-12] = 0; ++ break; ++ case SENSOR_FAN: ++ if (len > 4 && !strcasecmp(label+len-4, " Fan")) ++ label[len-4] = 0; ++ if (len > 10 && !strcasecmp(label+len-10, " FAN Speed")) ++ label[len-10] = 0; ++ break; ++ case SENSOR_VOLTAGE: ++ if (len > 8 && !strcasecmp(label+len-8, " Voltage")) ++ label[len-8] = 0; ++ if (!strncmp(label, "ATX ", 4)) ++ memmove(label, label+4, strlen(label+4)+1); ++ break; ++ } ++ /* notice that we store the bus and addr both in iodev as 2 _signed_ ++ 16 bit ints */ ++ gkrellm_sensors_add_sensor(type, sensor_path, id_name, feature->number, ++ (name->bus&0xFFFF) | (name->addr<<16), LM_SENSOR_INTERFACE, 1.0, 0.0, ++ NULL, label); ++ if (label) ++ free(label); ++ } ++ } ++ } ++} ++ ++gboolean libsensors_get_value(char *sensor_path, ++ int id, int iodev, float *value) ++{ ++ char *p; ++ sensors_chip_name name; ++ double val; ++ int result; ++ ++ /* fill name */ ++ p = strchr(sensor_path, ':'); ++ if (!p) { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors error parsing sensor_path: %s\n", sensor_path); ++ return FALSE; ++ } ++ *p = 0; /* We must undo this !! (or make a copy) */ ++ name.prefix = sensor_path; ++ name.bus = (iodev << 16) >> 16; /* sign extend the low 16 bits */ ++ name.addr = iodev >> 16; ++ name.busname = p + 1; ++ if (!strcmp(name.busname, "NULL")) ++ name.busname = NULL; ++ ++ result = sensors_get_feature(name, id, &val) == 0; ++ ++ if (!result && (_GK.debug_level & DEBUG_SENSORS)) { ++ if (name.bus >= 0) ++ printf("libsensors error getting value for: %s@%d:%x feature: %d\n", ++ name.prefix, name.bus, name.addr, id); ++ else ++ printf("libsensors error getting value for: %s@%x feature: %d\n", ++ name.prefix, name.addr, id); ++ } ++ ++ if (value) ++ *value = val; ++ ++ *p = ':'; /* !!! */ ++ return result; ++} ++ ++#else + typedef struct + { + gchar *name; +@@ -2037,7 +2192,7 @@ + { "+3.3V", 1.0, 0, NULL } + }; + +- ++#endif + + gboolean + gkrellm_sys_sensors_get_temperature(gchar *sensor_path, gint id, +@@ -2046,8 +2201,11 @@ + FILE *f; + gchar buf[128], units[32]; + gint n; +- gfloat T, t[5], ibm_acpi_temp[8]; ++ gfloat T, ibm_acpi_temp[8]; + gboolean result = FALSE; ++#ifndef HAVE_LIBSENSORS ++ gfloat t[5]; ++#endif + + if ( interface == THERMAL_INTERFACE + || interface == THERMAL_ZONE_INTERFACE +@@ -2142,6 +2300,9 @@ + } + } + ++#ifdef HAVE_LIBSENSORS ++ return libsensors_get_value(sensor_path, id, iodev, temp); ++#else + if ((f = fopen(sensor_path, "r")) == NULL) + return FALSE; + fgets(buf, sizeof(buf), f); +@@ -2162,6 +2323,7 @@ + if (temp) + *temp = T; + return TRUE; ++#endif + } + + gboolean +@@ -2170,9 +2332,12 @@ + { + FILE *f; + gchar buf[64]; +- gint n; +- gfloat t[4], T; ++ gfloat T; + gboolean result = FALSE; ++#ifndef HAVE_LIBSENSORS ++ gint n; ++ gfloat t[4]; ++#endif + + if (interface == IBM_ACPI_INTERFACE) + { +@@ -2196,6 +2361,9 @@ + return gkrellm_sys_sensors_mbmon_get_value(sensor_path, fan); + } + ++#ifdef HAVE_LIBSENSORS ++ return libsensors_get_value(sensor_path, id, iodev, fan); ++#else + if ((f = fopen(sensor_path, "r")) == NULL) + return FALSE; + fgets(buf, sizeof(buf), f); +@@ -2210,16 +2378,19 @@ + if (fan) + *fan = t[n - 1]; + return TRUE; ++#endif + } + + gboolean + gkrellm_sys_sensors_get_voltage(gchar *sensor_path, gint id, + gint iodev, gint interface, gfloat *volt) + { ++#ifndef HAVE_LIBSENSORS + FILE *f; + gchar buf[64]; + gfloat V, t[3]; + gint n; ++#endif + + if (interface == MBMON_INTERFACE) + { +@@ -2227,6 +2398,9 @@ + return gkrellm_sys_sensors_mbmon_get_value(sensor_path, volt); + } + ++#ifdef HAVE_LIBSENSORS ++ return libsensors_get_value(sensor_path, id, iodev, volt); ++#else + if ((f = fopen(sensor_path, "r")) == NULL) + return FALSE; + fgets(buf, sizeof(buf), f); +@@ -2247,8 +2421,10 @@ + if (volt) + *volt = V; + return TRUE; ++#endif + } + ++#ifndef HAVE_LIBSENSORS + static void + get_volt_default(gchar *chip_name, VoltDefault **vdf, gint *vdfsize) + { +@@ -2453,17 +2629,22 @@ + | "isa", and besides, probably sysfs will eventually be more common + | so I'll just make its names the standard now (gkrellm 2.1.20). + */ ++#endif ++ + gboolean + gkrellm_sys_sensors_init(void) + { + FILE *f; +- GDir *dir, *chip_dir; +- VoltDefault *voltdefault; ++ GDir *dir; + gint id = 0; ++ gchar *name, *path, *sensor_path, *sensor_name, id_name[128]; ++#ifndef HAVE_LIBSENSORS ++ GDir *chip_dir; ++ VoltDefault *voltdefault; + gint type, voltdefaultsize; + gfloat factor, offset; +- gchar *name, *chip_name, *fixed_chip_name, *path, *default_label; +- gchar *vref, *sensor_path, *sensor_name, id_name[128]; ++ gchar *vref, *chip_name, *fixed_chip_name, *default_label; ++#endif + struct lconv *lc; + + lc = localeconv(); +@@ -2607,7 +2788,9 @@ + g_dir_close(dir); + } + +- ++#ifdef HAVE_LIBSENSORS ++ libsensors_init(); ++#else + if ((dir = g_dir_open(SENSORS_DIR, 0, NULL)) == NULL) + { + sysfs_sensors_init(); +@@ -2690,5 +2873,6 @@ + g_free(fixed_chip_name); + } + g_dir_close(dir); ++#endif + return TRUE; + } diff --git a/gkrellm.desktop b/gkrellm.desktop new file mode 100644 index 0000000..dbd4807 --- /dev/null +++ b/gkrellm.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GKrellM System Monitor +Comment=Monitor for CPU, memory, disks, network, mail +Exec=gkrellm +Icon=gkrellm.png +Terminal=false +Type=Application +Categories=Application;System;Monitor; diff --git a/gkrellm.png b/gkrellm.png new file mode 100644 index 0000000000000000000000000000000000000000..373ad6045b657b57f3e8cce5605c42e3af752cea GIT binary patch literal 3149 zcmV-T46^fyP)K_ zpLf^0#&%LeaUm%`;zGe#R82zCCaMbvRVir$CW>2J$)ru%giu`7h##e?Ql-dJh+-1A zGzBEvl$f+Y9YR|>O^{nJgdZmUfo;6@u6MnDyKml`J2Q7?`p3MT_lCFh->A|aX|?yB zcka38d(V%1?!Y1~(jqO=A}!MYW76KuxZ;Y-)1S9d{};Xb>Q4(c7be$Sb4>~`HZ}&p z$Uv1}T76MLfr?d8V-$3L2vJF<&X+L&Y3$}=N!$iTQ8YAty`A@95`?w6TV=C*MD}LlW(2nz=3BwMta$Q=^>EWILNk7WSc-b znE|a9QLrT6SjuX~kDQ$6g=NxsigwsN!*&>-l{vp?W@2xa9!HFeqDsie=$i znSr`cxcV@I?lKHpqg<+B8xFMrfng7!+XIx%2~zX@*tG#H$HcZRbSJ@fP0H>7nj2x; zl5%+&!YN^uOWgL65P(^4f>%zRWn@s#LFXgOaS%du{z`oQ-mmiTBis7i7#i&?aykd+ z1p%Rwpj>P!IMxN7a5&RBj9PI$E78m@Ps;glIolOV1`BIql`>czrecrwg_r1^C{>K_ zr=H$}ZCl*EaXokZ$pgqxLfb=1iSGx*Eg$JgLfIgcHp){d39WD$LE{)n=psXC&nYHn zj{|VNHI0fiyl8?j(NR*;kh1_Z zDD{Afx$=@V?0f1P434g5X7X?$-T~rtxVttPCS?}G9wInL-hhB=JE5JH`0Ufe z96Hrt?8pSirziWuEd!gW6RCsJd_>yy()?U$KH&7NRVqY?B3N51qmmXf4!gh!fO0>8 zOi5;xBI)zM-1#XQo@B_$K+Rpdv3pxSV!swZ6M5%$641sddO3k9%-gOdbJXPQ)QPL;d z_PQbAM%BLGW!MHO&^tL%RdwEHucl@%N9g5(tmvBvQ3xRbKXkL3RlJ2BFJ0IJLZBjz z(a~Qf3Vp&bp(R`BhR)gPvk)01JtaJ9P3Ggk&j6*eYmTp`_}acN0418D!3D`ms;Z8a zI0Uim_dvz2pvdx|H*5eLv*R-5BHtr?lv2EW;yM0v><65he4CbR0dU?s15xHtmBi@E zL?tm+rxaS6jpdkB(>gV)f+HN9#A5e}ZxlRW%kJf7mbwKbhb*MXC%qvA5VwZVjTWXD zq#{fjorO9UAps^9iHMnMoa1eAn3if#7WEztCx}&wn+z26YVutrww=u_8>}QtR23*} zX(0z^uxBhx)1>z<&H>oUMs*myB~r0KcP#`;DSEe8O3{)nj!utptdU@|q_D(@O~SOh zwI(!DmFYG$E9aM@?l=(%mX(>9d0>iCWTBV47i|up;%nH#K#}6uR*yi|^nCF8bsQa^ z;#V&EbuMhq5v9%ik_uHTmk&GPr>X8HfeJu?L8dnf0*J|b;WSLpOr0kshYU4PBGwIAk+R#pWPIZH?l z+3qA@XS0@vq-GM7hO zs=7-w7*Kc11ZH+H$9HCLkn&QS*`woNC6uf#fV>KMt$G2=p6%QD?A9&3e|S~SGlfg2 zW)NCYHc<(&>gGzAdYID14Tt*DXFy-p$FrRbL~M1dU)gY(_^HQ@n?K2~mOp|zG)+UD zMFqtYpL?LC&g2QJRK(7gU*fkCF$P8`AScn<=)@Kslxmz-WU`_odcHOg=HA`=#~Bdklab2X+(`KK$f19@zc}0Cqi7Us5KD z;sZz%S$=F<{}4y^zC%Kbk}?@TG{L7=Z)MBAcfyjX;kdY+aJ zRbu7mhjQo54{_|x2~Hk4$?aF)M?lEZYcqKh2NQ=Uu6l(HZ{ETx>w}0=7eGErR7lx% zuu>hpRAJkmoqX$yJNSdYy)zex5xq=-BcJ!V2!NxNLglI;Vlvhby;^PhM-*?8SU{O;BF zVqtQy@eHEV#C`APpYXLG-_4LSz_2sKuv5Go3-zmB2_c#PFtrrhgePA3K97I-yG-te zP$vAv#BcC7A9@LnFL;1_<<`xJ%IA4t`y=>M0T15uCDMAtmb*J1dUOlziI6XE{VHK2 z;z)B#{!AjWs+5h3ye}AP9=<}Cmx%R}aXZpWR&(lRC?@Q-j z{b4NfjkKOm;_pSNFmOwt8(FV1XpImWZG>H>E@G5j$0kBIZ7jzj@O><&n9PpoUQLPN n_I+^cHGYv6X^|G`=TH9&w1jF#pCk4<00000NkvXXu0mjflUn>p literal 0 HcmV?d00001 diff --git a/gkrellm.spec b/gkrellm.spec new file mode 100644 index 0000000..5563a0d --- /dev/null +++ b/gkrellm.spec @@ -0,0 +1,469 @@ +Name: gkrellm +Version: 2.2.9 +Release: 7%{?dist} +Summary: Multiple stacked system monitors in one process +Group: Applications/System +License: GPL +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 +GKrellM charts CPU, load, Disk, and all active net interfaces +automatically. An on/off button and online timer for the PPP +interface is provided, as well as monitors for memory and swap usage, +file system, internet connections, APM laptop battery, mbox style +mailboxes, and temperature sensors on supported systems. Also +included is an uptime monitor, a hostname label, and a clock/calendar. +Additional features are: + + * Autoscaling grid lines with configurable grid line resolution. + * LED indicators for the net interfaces. + * A gui popup for configuration of chart sizes and resolutions. + + +%package daemon +Summary: The GNU Krell Monitors Server +Group: System Environment/Daemons +Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(postun): /sbin/service + +%description daemon +gkrellmd listens for connections from gkrellm clients. When a gkrellm +client connects to a gkrellmd server all builtin monitors collect their +data from the server. + + +%package devel +Summary: Development files for the GNU Krell Monitors +Group: Development/System +Requires: gtk2-devel + +%description devel +Development files for the GNU Krell Monitors. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 + +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 + sed -i -e "s@/usr/lib/gkrellm/plugins@%{_libdir}/gkrellm2/plugins@" $i +done +for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do + sed -i -e "s@/usr/local/lib/gkrellm2/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i + sed -i -e "s@/usr/local/lib/gkrellm/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i +done + + +%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" + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gkrellm2/themes +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins + +make install \ + LOCALEDIR=$RPM_BUILD_ROOT%{_datadir}/locale \ + INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} \ + SINSTALLDIR=$RPM_BUILD_ROOT%{_sbindir} \ + MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \ + PKGCONFIGDIR=$RPM_BUILD_ROOT%{_libdir}/pkgconfig \ + INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} \ + STRIP="" +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/gkrellmd +install -m 644 server/gkrellmd.conf $RPM_BUILD_ROOT%{_sysconfdir}/gkrellmd.conf +%find_lang %name + +# below is the desktop file and icon stuff. +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} \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + + +%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 || : + +%post daemon +/sbin/chkconfig --add gkrellmd || : + +%preun daemon +if [ "$1" = "0" ]; then + /sbin/service gkrellmd stop > /dev/null 2>&1 || : + /sbin/chkconfig --del gkrellmd || : +fi + +%postun daemon +if [ "$1" -ge "1" ]; then + /sbin/service gkrellmd condrestart > /dev/null 2>&1 || : +fi + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYRIGHT Changelog README Themes.html +%{_bindir}/%{name} +%{_libdir}/gkrellm2 +%{_datadir}/gkrellm2 +%{_mandir}/man1/%{name}.1* +%{_datadir}/applications/gnome-%{name}.desktop +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png + +%files devel +%defattr(-,root,root,-) +%{_includedir}/gkrellm2 +%{_libdir}/pkgconfig/%{name}.pc + +%files daemon +%defattr(-,root,root,-) +%{_initrddir}/gkrellmd +%{_sbindir}/gkrellmd +%{_mandir}/man1/gkrellmd.* +%config(noreplace) %{_sysconfdir}/gkrellmd.conf + + +%changelog +* Sun Jul 16 2006 Hans de Goede 2.2.9-7 +- Add -r to groupadd +- Add || : to the gkrellmd service related scripts (deviation from the wiki). +- Don't make -devel package require the main one as it doesn't need it +- Install .desktop file with --vendor gnome to not break existing kde panel + buttons, etc. +- Drop "StartupNotify=false" from .desktop to not interfere with kde's + internal startup notification +- use gkrellmd as group in default gkrellmd.conf + +* Sat Jul 15 2006 Hans de Goede 2.2.9-6 +- Various specfile improvements by Ville Skyttä (ville.skytta@iki.fi) +- Make the daemon package scripts match the ScriptletSnippets wiki page +- Add LSB aliases (try-restart, force-reload) to the -daemon initscript +- Add %%{?dist} to the release for consistency with other packages I maintain + +* Sat Jul 15 2006 Hans de Goede 2.2.9-5 +- Remove Obsoletes/Provides gkrellm-server +- Don't remove user on uninstall +- Only build with lm_sensors support on x86 / x86_64 since lm_sensors is not + available on other archs. +- Use %%{_sysconfdir} instead of /etc in %%install + +* Fri Jul 7 2006 Hans de Goede 2.2.9-4 +- Moving to Fedora Extras, initial FE submission +- Various specfile improvements / cleanups +- Remove gkrellm-wireless (will be submitted as a seperate package) +- Use libsensors instead of DIY code to read lm_sensors sensors +- Don't strip the binaries when installing so we get a usable -debuginfo rpm + +* Mon May 22 2006 Karsten Hopp 2.2.9-3 +- fix libdir patch + +* Mon May 15 2006 Karsten Hopp 2.2.9-2 +- fix header file conflict between 32bit and 64bit archs + +* Mon Apr 03 2006 Karsten Hopp 2.2.9-1 +- update to 2.2.9 +- remove explicit UID/GUIs from useradd/groupadd (#186974) + +* Tue Feb 28 2006 Karsten Hopp 2.2.7-7 +- BuildRequires: libSM-devel + +* Wed Feb 15 2006 Karsten Hopp 2.2.7-6 +- fix chkconfig requires + +* Fri Feb 10 2006 Jesse Keating - 2.2.7-5.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.2.7-5.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Nov 18 2005 Bill Nottingham 2.2.7-5 +- Fix references to obsolete /usr/X11R6 path + +* Wed Nov 9 2005 Tomas Mraz 2.2.7-4 +- rebuilt with new openssl + +* Thu Sep 06 2005 Karsten Hopp 2.2.7-3 +- fix path to gkrellm2 plugins on 64bit archs (#164066) + +* Thu Aug 18 2005 Florian La Roche +- the the kernel dep form a Requires: into a Conflicts: + +* Thu Jun 09 2005 Karsten Hopp 2.2.7-1 +- update to 2.2.7 +- add Requires: /sbin/chkconfig for -daemon subpackage +- allow gkrellm width up to 1600 pixel +- change spec file to valid UTF-8 (#159578) + +* Tue May 17 2005 Karsten Hopp 2.2.4-5 +- use Sans fonts (Ville Skytta, #157899) + +* Fri Apr 01 2005 Karsten Hopp 2.2.4-4 +- Include gkrellm2/plugins directories (Michael Schwendt) + #153073 + +* Wed Mar 02 2005 Karsten Hopp 2.2.4-3 +- build with gcc-4 + +* Thu Feb 03 2005 Karsten Hopp 2.2.4-2 +- BuildRequires openssl-devel (#137548) + +* Tue Nov 16 2004 Karsten Hopp 2.2.4-1 +- update + +* Mon Sep 06 2004 Karsten Hopp 2.2.2-2 +- change group of wireless subpackage (#131699) +- add icon + +* Tue Aug 03 2004 Karsten Hopp 2.2.2-1 +- update to 2.2.2 to fix pixbuf memory leak + +* Wed Jun 23 2004 Karsten Hopp 2.2.1-1 +- update to latest stable release + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon May 31 2004 Warren Togami 2.2.0-1 +- upgrade to 2.2.0 +- #123846 bogus dep +- Cleanup deps, build deps, and docs + +* Mon Mar 15 2004 Karsten Hopp 2.1.28-3 +- remove Provides: gkrellm-devel from main package (#117105) + +* Thu Mar 11 2004 Karsten Hopp 2.1.28-2 +- don't run gkrellmd as nobody, use a unique UID (#116314) +- fix chkconfig at package removal + +* Wed Mar 10 2004 Karsten Hopp 2.1.28-1 +- update +- add runlevel links with chkconfig (#107481) +- use slightly patched config file from the tarball for gkrellmd +- add wireless plugin + +* Wed Mar 03 2004 Karsten Hopp 2.1.26-2 +- fix -devel provision (#117105) +- remove stringfreeze hack + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 25 2004 Karsten Hopp 2.1.26-1 +- update to 2.1.26, which fixes sensor data being 10x to high (#115850) +- requires kernel >= 2.6.2 + +* Sat Feb 21 2004 Florian La Roche +- mv /etc/init.d -> /etc/rc.d/init.d + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 09 2004 Karsten Hopp 2.1.24-1 +- update to 2.1.24 + +* Mon Oct 13 2003 Karsten Hopp 2.1.21-1 +- update: +- fix temperature reads from /proc/acpi +- Use username instead of userid in session management userid property. + Fixes no session restarts in KDE 3.1.4. +- de.po update + +* Thu Oct 09 2003 Karsten Hopp 2.1.20-3 +- make it compatible with 3d party packages + +* Thu Oct 09 2003 Karsten Hopp 2.1.20-2 +- added patches from Ville Skyttä : + - Add icon for desktop entry + - Install daemon in %%{_sbindir} + - Include themes and plugins dirs in main package + - Make -daemon obsolete -server + - devel subpackage (disabled because of string freeze) + + +* Wed Oct 08 2003 Karsten Hopp 2.1.20-1 +- update to make it work with kernel 2.6 + +* Wed Oct 01 2003 Karsten Hopp 2.1.19-1 +- Update to 2.1.19, includes fix for #106073 + +* Tue Jul 08 2003 Karsten Hopp 2.1.14-3 +- run as user nobody +- fix file ownership + +* Mon Jul 07 2003 Karsten Hopp 2.1.14-2 +- add init script and config file for gkrellmd +- daemon subpackage +- fix pkgconfig file + +* Thu Jun 26 2003 Karsten Hopp 2.1.14-1 +- update to fix buffer overflow in gkrellmd_client_read + +* Wed Jun 18 2003 Karsten Hopp 2.1.13-1 +- update + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon May 05 2003 Karsten Hopp 2.1.9-2 +- rebuild + +* Thu Apr 10 2003 Karsten Hopp 2.1.9-1 +- update to 2.1.9 +- daily/weekly/monthly transfer stats + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 14 2003 Karsten Hopp 2.1.5-2 +- rename menu entry (#81876) + +* Sun Jan 12 2003 Karsten Hopp 2.1.5-1 +- update (#81620) + +* Mon Dec 16 2002 Tim Powers 2.1.3-2 +- rebuild + +* Wed Dec 11 2002 Karsten Hopp +- 2.1.3-1 +- Battery monitor can display multiple batteries +- Net timer lost the minutes display with large connect times +- use disk stats from /proc/partitions if available + +* Tue Dec 03 2002 Karsten Hopp 2.1.2-1 +- updated translations +- .desktop file (#78562) +- minor bugfixes + +* Mon Nov 11 2002 Karsten Hopp +- update to 2.1 (glib2, gtk2) + +* Wed Jul 17 2002 Karsten Hopp +- update +- own /usr/include/gkrellm directory + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Tue Jun 11 2002 Karsten Hopp +- Update to 1.2.11 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Feb 27 2002 Karsten Hopp +- Update to 1.2.9 + +* Wed Jan 23 2002 Karsten Hopp +- Update to 1.2.6 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Thu Dec 13 2001 Karsten Hopp +- update to 1.2.5-1 +- nls patch not required anymore + +* Mon Nov 26 2001 Karsten Hopp +- enable nls + +* Mon Nov 26 2001 Karsten Hopp +- update to 1.2.4 + +* Fri Jul 6 2001 Trond Eivind Glomsrød +- s/Copyright/License/ +- Add %%defattr +- langify +- Don't define name, ver and rel at the top of the spec file + +* Wed Jun 27 2001 Karsten Hopp +- fix _mandir +- fix BuildRequires + +* Wed Jun 27 2001 SATO Satoru +- clean up (use system-defined macros) +- enable NLS + +* Wed Mar 14 2001 Rob Lineweaver +- fixed new manpage inclusion for newer RPM versions +- source is 1.0.7 +- compiled for PPC and i386 + +* Fri Jan 19 2001 Kevin Ford +- general cleanup of spec file + +* Thu Jan 18 2001 Kevin Ford +- Updated spec file to work with both v3 & v4 rpm +- moved changelog to bottom of spec file +- added defines for common items + +* Thu Apr 6 2000 Bill Wilson +- added INCLUDEDIR to the make install + +* Fri Oct 29 1999 Gary Thomas +- .spec file still broken + +* Thu Oct 7 1999 David Mihm +- fixed spec. diff --git a/gkrellmd.init b/gkrellmd.init new file mode 100644 index 0000000..a28fcf8 --- /dev/null +++ b/gkrellmd.init @@ -0,0 +1,58 @@ +#!/bin/bash +# +# chkconfig: - 85 15 +# description: GNU Krell Monitors Server +# +# processname: gkrellmd +# config: /etc/gkrellmd.conf + +# source function library +. /etc/rc.d/init.d/functions + +# Check that networking is up. +[ "${NETWORKING}" = "no" ] && exit 0 + +# The process must be configured first. +[ -f /etc/gkrellmd.conf ] || exit 0 + +RETVAL=0 + +prog="gkrellmd" + +case "$1" in + start) + echo -n $"Starting $prog: " + daemon --user gkrellmd /usr/sbin/gkrellmd -d + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gkrellmd + echo + ;; + stop) + echo -n $"Shutting down $prog: " + killproc gkrellmd + RETVAL=$? + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gkrellmd + echo + ;; + restart|reload|force-reload) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart|try-restart) + if [ -f /var/lock/subsys/gkrellmd ]; then + $0 stop + $0 start + fi + RETVAL=$? + ;; + status) + status gkrellmd + RETVAL=$? + ;; + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL diff --git a/sources b/sources index e69de29..3f03973 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +5334155797901724f4eb46a82ad72395 gkrellm-2.2.9.tar.bz2 From 096e78537adc9e32068c562de5ed3454f5763a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:26:33 +0000 Subject: [PATCH 002/100] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 2ed91335e62e9841423b61342b79f8fbe71f0938 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 28 Aug 2006 11:27:48 +0000 Subject: [PATCH 003/100] - FE6 Rebuild --- gkrellm.spec | 5 ++++- needs.rebuild | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 needs.rebuild diff --git a/gkrellm.spec b/gkrellm.spec index 5563a0d..1dd03ce 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.2.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPL @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 28 2006 Hans de Goede 2.2.9-8 +- FE6 Rebuild + * Sun Jul 16 2006 Hans de Goede 2.2.9-7 - Add -r to groupadd - Add || : to the gkrellmd service related scripts (deviation from the wiki). diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From aac6b5fde11847828e6e8a3acb81c19334d52802 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 22 Sep 2006 20:21:07 +0000 Subject: [PATCH 004/100] - Fixup .desktop so that gkrellm actually gets shown in the menu (bz 206775) --- gkrellm.desktop | 2 +- gkrellm.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gkrellm.desktop b/gkrellm.desktop index dbd4807..4c9e5da 100644 --- a/gkrellm.desktop +++ b/gkrellm.desktop @@ -6,4 +6,4 @@ Exec=gkrellm Icon=gkrellm.png Terminal=false Type=Application -Categories=Application;System;Monitor; +Categories=Application;System; diff --git a/gkrellm.spec b/gkrellm.spec index 1dd03ce..67faa22 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.2.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPL @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 22 2006 Hans de Goede 2.2.9-9 +- Fixup .desktop so that gkrellm actually gets shown in the menu (bz 206775) + * Mon Aug 28 2006 Hans de Goede 2.2.9-8 - FE6 Rebuild From 30613231b4949b1120c5e8ed1db0eaa51fcd385b Mon Sep 17 00:00:00 2001 From: Christian Iseli Date: Wed, 4 Oct 2006 22:26:33 +0000 Subject: [PATCH 005/100] automated bump and rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 67faa22..0cf3b58 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.2.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPL @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 05 2006 Christian Iseli 2.2.9-10 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + * Fri Sep 22 2006 Hans de Goede 2.2.9-9 - Fixup .desktop so that gkrellm actually gets shown in the menu (bz 206775) From 62dd6a3ccca116cfd53110f9b30be318393a8fc8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 31 Oct 2006 16:29:31 +0000 Subject: [PATCH 006/100] - New upstream release 2.2.10 - Drop integrated lmsensors and sysfs sensors patches --- .cvsignore | 2 +- gkrellm-2.2.9-hwmon.patch | 38 ---- gkrellm-2.2.9-libsensors.patch | 326 --------------------------------- gkrellm.spec | 26 +-- sources | 2 +- 5 files changed, 15 insertions(+), 379 deletions(-) delete mode 100644 gkrellm-2.2.9-hwmon.patch delete mode 100644 gkrellm-2.2.9-libsensors.patch diff --git a/.cvsignore b/.cvsignore index 476a8c7..8ad11ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gkrellm-2.2.9.tar.bz2 +gkrellm-2.2.10.tar.bz2 diff --git a/gkrellm-2.2.9-hwmon.patch b/gkrellm-2.2.9-hwmon.patch deleted file mode 100644 index 3c16d5a..0000000 --- a/gkrellm-2.2.9-hwmon.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- gkrellm-2.2.9/src/sysdeps/linux.c~ 2006-07-05 21:44:55.000000000 +0200 -+++ gkrellm-2.2.9/src/sysdeps/linux.c 2006-07-05 21:55:48.000000000 +0200 -@@ -1888,6 +1888,7 @@ - #define THERMAL_DIR "/proc/acpi/thermal" - #define SENSORS_DIR "/proc/sys/dev/sensors" - #define SYSFS_I2C_DIR "/sys/bus/i2c/devices" -+#define SYSFS_CLASS_DIR "/sys/class/hwmon" - #define UNINORTH_DIR "/sys/devices/temperatures" - - /* mbmon and hddtemp sensor interfaces are handled in sensors-common.c -@@ -2351,15 +2352,24 @@ - gchar *name, *bus_name, *default_label, *vref, - *id_name, *chip_name, *s, *d, *sensor_path; - gchar path[256], buf[256]; -+ gboolean using_i2c_dir = FALSE; - - if (!have_sysfs) - return; - -- if ((dir = g_dir_open(SYSFS_I2C_DIR, 0, NULL)) == NULL) -- return; -+ if ((dir = g_dir_open(SYSFS_CLASS_DIR, 0, NULL)) == NULL) -+ { -+ /* try again with the sysfs i2c dir for older 2.6 kernels */ -+ if ((dir = g_dir_open(SYSFS_I2C_DIR, 0, NULL)) == NULL) -+ return; -+ using_i2c_dir = TRUE; -+ } - while ((bus_name = (gchar *) g_dir_read_name(dir)) != NULL) - { -- snprintf(path, sizeof(path), "%s/%s", SYSFS_I2C_DIR, bus_name); -+ if (using_i2c_dir) -+ snprintf(path, sizeof(path), "%s/%s", SYSFS_I2C_DIR, bus_name); -+ else -+ snprintf(path, sizeof(path), "%s/%s/device", SYSFS_CLASS_DIR, bus_name); - if ((chip_dir = g_dir_open(path, 0, NULL)) == NULL) - continue; - if ((chip_name = sysfs_get_chip_name(path)) == NULL) diff --git a/gkrellm-2.2.9-libsensors.patch b/gkrellm-2.2.9-libsensors.patch deleted file mode 100644 index 258ffb0..0000000 --- a/gkrellm-2.2.9-libsensors.patch +++ /dev/null @@ -1,326 +0,0 @@ ---- gkrellm-2.2.9/src/sysdeps/linux.c.libsensors 2006-07-07 15:13:14.000000000 +0200 -+++ gkrellm-2.2.9/src/sysdeps/linux.c 2006-07-07 15:13:23.000000000 +0200 -@@ -29,8 +29,11 @@ - have_diskstats, - have_partition_stats, - have_sysfs, -- have_sysfs_stats, -- have_sysfs_sensors; -+ have_sysfs_stats; -+#ifndef HAVE_LIBSENSORS -+static gboolean have_sysfs_sensors; -+#endif -+ - static gchar locale_decimal_point; - - -@@ -1912,6 +1915,158 @@ - #define IBM_ACPI_NA2_TEMP 7 - #define IBM_ACPI_FAN 8 - -+#ifdef HAVE_LIBSENSORS -+#include -+ -+static void libsensors_init(void) -+{ -+ int nr, nr1, nr2, len; -+ const sensors_chip_name *name; -+ const sensors_feature_data *feature; -+ char *label; -+ FILE *f; -+ char id_name[512], sensor_path[512]; -+ int type; -+ -+ f = fopen("/etc/sensors.conf", "r"); -+ if (!f) { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors error could not open /etc/sensors.conf\n"); -+ return; -+ } -+ -+ if (sensors_init(f) != 0) { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors init failed!\n"); -+ return; -+ } -+ fclose(f); -+ -+ nr = 0; -+ while ((name = sensors_get_detected_chips(&nr))) { -+ nr1 = 0, nr2 = 0; -+ while ((feature = sensors_get_all_features(*name, &nr1, &nr2))) { -+ if (sensors_get_ignored(*name, feature->number) && -+ feature->mapping == SENSORS_NO_MAPPING) { -+ if (name->bus >= 0) -+ snprintf(id_name, sizeof(id_name), "%s@%d:%x/%s", name->prefix, -+ name->bus, name->addr, feature->name); -+ else -+ snprintf(id_name, sizeof(id_name), "%s@%x/%s", name->prefix, -+ name->addr, feature->name); -+ /* we need to store both the prefix and the busname, but we only -+ have one string, so concat them together seperated by a : */ -+ snprintf(sensor_path, sizeof(sensor_path), "%s:%s", name->prefix, -+ name->busname? name->busname:"NULL"); -+ -+ if (!strncmp(feature->name, "temp", 4)) -+ type = SENSOR_TEMPERATURE; -+ else if (!strncmp(feature->name, "fan", 3)) -+ type = SENSOR_FAN; -+ else if (!strncmp(feature->name, "in", 2)) -+ type = SENSOR_VOLTAGE; -+ else { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors error determining type for: %s\n", id_name); -+ continue; -+ } -+ -+ /* failsafe tests, check if bus and addr fit in 16 bits (signed) */ -+ if (name->bus != ((name->bus<<16)>>16)) { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors error cannot represent bus in 16 bits: %s\n", -+ id_name); -+ continue; -+ } -+ if (name->addr != ((name->addr<<16)>>16)) { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors error cannot represent addr in 16 bits: %s\n", -+ id_name); -+ continue; -+ } -+ -+ if (sensors_get_label(*name, feature->number, &label) != 0) { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors error getting label for: %s\n", id_name); -+ label = NULL; -+ } -+ -+ /* Strip some common post and prefixes to get smaller default labels */ -+ len = strlen(label); -+ switch(type) { -+ case SENSOR_TEMPERATURE: -+ if (len > 5 && !strcasecmp(label+len-5, " Temp")) -+ label[len-5] = 0; -+ if (len > 12 && !strcasecmp(label+len-12, " Temperature")) -+ label[len-12] = 0; -+ break; -+ case SENSOR_FAN: -+ if (len > 4 && !strcasecmp(label+len-4, " Fan")) -+ label[len-4] = 0; -+ if (len > 10 && !strcasecmp(label+len-10, " FAN Speed")) -+ label[len-10] = 0; -+ break; -+ case SENSOR_VOLTAGE: -+ if (len > 8 && !strcasecmp(label+len-8, " Voltage")) -+ label[len-8] = 0; -+ if (!strncmp(label, "ATX ", 4)) -+ memmove(label, label+4, strlen(label+4)+1); -+ break; -+ } -+ /* notice that we store the bus and addr both in iodev as 2 _signed_ -+ 16 bit ints */ -+ gkrellm_sensors_add_sensor(type, sensor_path, id_name, feature->number, -+ (name->bus&0xFFFF) | (name->addr<<16), LM_SENSOR_INTERFACE, 1.0, 0.0, -+ NULL, label); -+ if (label) -+ free(label); -+ } -+ } -+ } -+} -+ -+gboolean libsensors_get_value(char *sensor_path, -+ int id, int iodev, float *value) -+{ -+ char *p; -+ sensors_chip_name name; -+ double val; -+ int result; -+ -+ /* fill name */ -+ p = strchr(sensor_path, ':'); -+ if (!p) { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors error parsing sensor_path: %s\n", sensor_path); -+ return FALSE; -+ } -+ *p = 0; /* We must undo this !! (or make a copy) */ -+ name.prefix = sensor_path; -+ name.bus = (iodev << 16) >> 16; /* sign extend the low 16 bits */ -+ name.addr = iodev >> 16; -+ name.busname = p + 1; -+ if (!strcmp(name.busname, "NULL")) -+ name.busname = NULL; -+ -+ result = sensors_get_feature(name, id, &val) == 0; -+ -+ if (!result && (_GK.debug_level & DEBUG_SENSORS)) { -+ if (name.bus >= 0) -+ printf("libsensors error getting value for: %s@%d:%x feature: %d\n", -+ name.prefix, name.bus, name.addr, id); -+ else -+ printf("libsensors error getting value for: %s@%x feature: %d\n", -+ name.prefix, name.addr, id); -+ } -+ -+ if (value) -+ *value = val; -+ -+ *p = ':'; /* !!! */ -+ return result; -+} -+ -+#else - typedef struct - { - gchar *name; -@@ -2037,7 +2192,7 @@ - { "+3.3V", 1.0, 0, NULL } - }; - -- -+#endif - - gboolean - gkrellm_sys_sensors_get_temperature(gchar *sensor_path, gint id, -@@ -2046,8 +2201,11 @@ - FILE *f; - gchar buf[128], units[32]; - gint n; -- gfloat T, t[5], ibm_acpi_temp[8]; -+ gfloat T, ibm_acpi_temp[8]; - gboolean result = FALSE; -+#ifndef HAVE_LIBSENSORS -+ gfloat t[5]; -+#endif - - if ( interface == THERMAL_INTERFACE - || interface == THERMAL_ZONE_INTERFACE -@@ -2142,6 +2300,9 @@ - } - } - -+#ifdef HAVE_LIBSENSORS -+ return libsensors_get_value(sensor_path, id, iodev, temp); -+#else - if ((f = fopen(sensor_path, "r")) == NULL) - return FALSE; - fgets(buf, sizeof(buf), f); -@@ -2162,6 +2323,7 @@ - if (temp) - *temp = T; - return TRUE; -+#endif - } - - gboolean -@@ -2170,9 +2332,12 @@ - { - FILE *f; - gchar buf[64]; -- gint n; -- gfloat t[4], T; -+ gfloat T; - gboolean result = FALSE; -+#ifndef HAVE_LIBSENSORS -+ gint n; -+ gfloat t[4]; -+#endif - - if (interface == IBM_ACPI_INTERFACE) - { -@@ -2196,6 +2361,9 @@ - return gkrellm_sys_sensors_mbmon_get_value(sensor_path, fan); - } - -+#ifdef HAVE_LIBSENSORS -+ return libsensors_get_value(sensor_path, id, iodev, fan); -+#else - if ((f = fopen(sensor_path, "r")) == NULL) - return FALSE; - fgets(buf, sizeof(buf), f); -@@ -2210,16 +2378,19 @@ - if (fan) - *fan = t[n - 1]; - return TRUE; -+#endif - } - - gboolean - gkrellm_sys_sensors_get_voltage(gchar *sensor_path, gint id, - gint iodev, gint interface, gfloat *volt) - { -+#ifndef HAVE_LIBSENSORS - FILE *f; - gchar buf[64]; - gfloat V, t[3]; - gint n; -+#endif - - if (interface == MBMON_INTERFACE) - { -@@ -2227,6 +2398,9 @@ - return gkrellm_sys_sensors_mbmon_get_value(sensor_path, volt); - } - -+#ifdef HAVE_LIBSENSORS -+ return libsensors_get_value(sensor_path, id, iodev, volt); -+#else - if ((f = fopen(sensor_path, "r")) == NULL) - return FALSE; - fgets(buf, sizeof(buf), f); -@@ -2247,8 +2421,10 @@ - if (volt) - *volt = V; - return TRUE; -+#endif - } - -+#ifndef HAVE_LIBSENSORS - static void - get_volt_default(gchar *chip_name, VoltDefault **vdf, gint *vdfsize) - { -@@ -2453,17 +2629,22 @@ - | "isa", and besides, probably sysfs will eventually be more common - | so I'll just make its names the standard now (gkrellm 2.1.20). - */ -+#endif -+ - gboolean - gkrellm_sys_sensors_init(void) - { - FILE *f; -- GDir *dir, *chip_dir; -- VoltDefault *voltdefault; -+ GDir *dir; - gint id = 0; -+ gchar *name, *path, *sensor_path, *sensor_name, id_name[128]; -+#ifndef HAVE_LIBSENSORS -+ GDir *chip_dir; -+ VoltDefault *voltdefault; - gint type, voltdefaultsize; - gfloat factor, offset; -- gchar *name, *chip_name, *fixed_chip_name, *path, *default_label; -- gchar *vref, *sensor_path, *sensor_name, id_name[128]; -+ gchar *vref, *chip_name, *fixed_chip_name, *default_label; -+#endif - struct lconv *lc; - - lc = localeconv(); -@@ -2607,7 +2788,9 @@ - g_dir_close(dir); - } - -- -+#ifdef HAVE_LIBSENSORS -+ libsensors_init(); -+#else - if ((dir = g_dir_open(SENSORS_DIR, 0, NULL)) == NULL) - { - sysfs_sensors_init(); -@@ -2690,5 +2873,6 @@ - g_free(fixed_chip_name); - } - g_dir_close(dir); -+#endif - return TRUE; - } diff --git a/gkrellm.spec b/gkrellm.spec index 0cf3b58..4588f14 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm -Version: 2.2.9 -Release: 10%{?dist} +Version: 2.2.10 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPL @@ -14,9 +14,7 @@ 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 +Patch5: 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 @@ -63,14 +61,12 @@ Development files for the GNU Krell Monitors. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%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 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 @@ -184,6 +180,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 31 2006 Hans de Goede 2.2.10-1 +- New upstream release 2.2.10 +- Drop integrated lmsensors and sysfs sensors patches + * Thu Oct 05 2006 Christian Iseli 2.2.9-10 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 diff --git a/sources b/sources index 3f03973..19fdcac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5334155797901724f4eb46a82ad72395 gkrellm-2.2.9.tar.bz2 +57ef0525c0997ac2e7720712811f5a84 gkrellm-2.2.10.tar.bz2 From 44a4b51d8199ad2304b7f1f21ff59967cc84bac3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 8 Nov 2006 18:35:24 +0000 Subject: [PATCH 007/100] - Add special case for via 686 volt sensors (bug 213304) --- gkrellm-2.2.10-via686.patch | 43 +++++++++++++++++++++++++++++++++++++ gkrellm.spec | 7 +++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 gkrellm-2.2.10-via686.patch diff --git a/gkrellm-2.2.10-via686.patch b/gkrellm-2.2.10-via686.patch new file mode 100644 index 0000000..c993b30 --- /dev/null +++ b/gkrellm-2.2.10-via686.patch @@ -0,0 +1,43 @@ +diff -ur gkrellm-2.2.10/src/sysdeps/linux.c gkrellm-2.2.10.new/src/sysdeps/linux.c +--- gkrellm-2.2.10/src/sysdeps/linux.c 2006-10-27 00:06:07.000000000 +0200 ++++ gkrellm-2.2.10.new/src/sysdeps/linux.c 2006-11-08 17:00:26.000000000 +0100 +@@ -2016,6 +2016,7 @@ + + #ifdef HAVE_LIBSENSORS + #include ++#include + + static gboolean + libsensors_init(void) +@@ -2028,6 +2029,7 @@ + gchar id_name[512], sensor_path[512]; + gint type, n_sensors_added; + ConfigMap *config_map; ++ char *endptr; + + f = fopen("/etc/sensors.conf", "r"); + if (!f) +@@ -2070,6 +2072,9 @@ + */ + snprintf(sensor_path, sizeof (sensor_path), "%s:%s", + name->prefix, name->busname ? name->busname : "NULL"); ++ ++ /* For VIA 686 volt sensors special case */ ++ strtol(feature->name, &endptr, 10); + + if (!strncmp(feature->name, "temp", 4)) + type = SENSOR_TEMPERATURE; +@@ -2077,6 +2082,12 @@ + type = SENSOR_FAN; + else if (!strncmp(feature->name, "in", 2)) + type = SENSOR_VOLTAGE; ++ /* HURRAY! special case for VIA 686 volt sensors, ++ which genius made up those feature names? */ ++ else if ((endptr[0] == 'V' && endptr[1] == 0) || ++ (endptr[0] == '.' && isdigit(endptr[1]) && ++ endptr[2] == 'V' && endptr[3] == 0)) ++ type = SENSOR_VOLTAGE; + else + { + if (_GK.debug_level & DEBUG_SENSORS) +Only in gkrellm-2.2.10.new/src/sysdeps: linux.c~ diff --git a/gkrellm.spec b/gkrellm.spec index 4588f14..4c0e9bc 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.2.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPL @@ -15,6 +15,7 @@ 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 %ifarch %{ix86} x86_64 BuildRequires: lm_sensors-devel @@ -67,6 +68,7 @@ Development files for the GNU Krell Monitors. %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 @@ -180,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 8 2006 Hans de Goede 2.2.10-2 +- Add special case for via 686 volt sensors (bug 213304) + * Tue Oct 31 2006 Hans de Goede 2.2.10-1 - New upstream release 2.2.10 - Drop integrated lmsensors and sysfs sensors patches From 4c8b9265546f093d4c68c321b413dcafaa47cf5d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Jul 2007 17:07:04 +0000 Subject: [PATCH 008/100] - Rebuild, including libsensors support on ppc and ppc64 as lm_sensors is available there now. --- gkrellm.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 4c0e9bc..e018622 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.2.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPL @@ -17,9 +17,7 @@ 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 -%ifarch %{ix86} x86_64 BuildRequires: lm_sensors-devel -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -81,15 +79,8 @@ done %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 @@ -182,6 +173,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 20 2007 Hans de Goede 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 2.2.10-2 - Add special case for via 686 volt sensors (bug 213304) From 9efdf7c377fdfd2f1e008c6dfc022811b7071065 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 22 Jul 2007 14:10:11 +0000 Subject: [PATCH 009/100] - New upstream release 2.3.0 --- .cvsignore | 2 +- gkrellm-2.1.24-libdir.patch | 11 -------- gkrellm-2.1.28-config.patch | 17 +++++++----- gkrellm-2.2.10-via686.patch | 43 ------------------------------- gkrellm-2.2.9-gkrellmd.conf.patch | 11 -------- gkrellm.spec | 13 ++++------ sources | 2 +- 7 files changed, 18 insertions(+), 81 deletions(-) delete mode 100644 gkrellm-2.1.24-libdir.patch delete mode 100644 gkrellm-2.2.10-via686.patch delete mode 100644 gkrellm-2.2.9-gkrellmd.conf.patch diff --git a/.cvsignore b/.cvsignore index 8ad11ff..a4e3bf4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gkrellm-2.2.10.tar.bz2 +gkrellm-2.3.0.tar.bz2 diff --git a/gkrellm-2.1.24-libdir.patch b/gkrellm-2.1.24-libdir.patch deleted file mode 100644 index 459b7cd..0000000 --- a/gkrellm-2.1.24-libdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gkrellm-2.1.24/src/Makefile.lib64 2004-01-09 13:32:02.000000000 +0100 -+++ gkrellm-2.1.24/src/Makefile 2004-01-09 13:32:23.000000000 +0100 -@@ -17,7 +17,7 @@ - MANDIRMODE ?= 755 - INSTALL ?= install - LINK_FLAGS ?= -Wl,-E --SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE -+SMC_LIBS ?= -lSM -lICE - - ifeq ($(without-ssl),1) - CONFIGURE_ARGS += --without-ssl diff --git a/gkrellm-2.1.28-config.patch b/gkrellm-2.1.28-config.patch index 019aa3a..13e0a05 100644 --- a/gkrellm-2.1.28-config.patch +++ b/gkrellm-2.1.28-config.patch @@ -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. # diff --git a/gkrellm-2.2.10-via686.patch b/gkrellm-2.2.10-via686.patch deleted file mode 100644 index c993b30..0000000 --- a/gkrellm-2.2.10-via686.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur gkrellm-2.2.10/src/sysdeps/linux.c gkrellm-2.2.10.new/src/sysdeps/linux.c ---- gkrellm-2.2.10/src/sysdeps/linux.c 2006-10-27 00:06:07.000000000 +0200 -+++ gkrellm-2.2.10.new/src/sysdeps/linux.c 2006-11-08 17:00:26.000000000 +0100 -@@ -2016,6 +2016,7 @@ - - #ifdef HAVE_LIBSENSORS - #include -+#include - - static gboolean - libsensors_init(void) -@@ -2028,6 +2029,7 @@ - gchar id_name[512], sensor_path[512]; - gint type, n_sensors_added; - ConfigMap *config_map; -+ char *endptr; - - f = fopen("/etc/sensors.conf", "r"); - if (!f) -@@ -2070,6 +2072,9 @@ - */ - snprintf(sensor_path, sizeof (sensor_path), "%s:%s", - name->prefix, name->busname ? name->busname : "NULL"); -+ -+ /* For VIA 686 volt sensors special case */ -+ strtol(feature->name, &endptr, 10); - - if (!strncmp(feature->name, "temp", 4)) - type = SENSOR_TEMPERATURE; -@@ -2077,6 +2082,12 @@ - type = SENSOR_FAN; - else if (!strncmp(feature->name, "in", 2)) - type = SENSOR_VOLTAGE; -+ /* HURRAY! special case for VIA 686 volt sensors, -+ which genius made up those feature names? */ -+ else if ((endptr[0] == 'V' && endptr[1] == 0) || -+ (endptr[0] == '.' && isdigit(endptr[1]) && -+ endptr[2] == 'V' && endptr[3] == 0)) -+ type = SENSOR_VOLTAGE; - else - { - if (_GK.debug_level & DEBUG_SENSORS) -Only in gkrellm-2.2.10.new/src/sysdeps: linux.c~ diff --git a/gkrellm-2.2.9-gkrellmd.conf.patch b/gkrellm-2.2.9-gkrellmd.conf.patch deleted file mode 100644 index c78ec06..0000000 --- a/gkrellm-2.2.9-gkrellmd.conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gkrellm-2.2.9/server/gkrellmd.conf~ 2006-07-16 20:44:23.000000000 +0200 -+++ gkrellm-2.2.9/server/gkrellmd.conf 2006-07-16 20:44:23.000000000 +0200 -@@ -26,7 +26,7 @@ - # Drop privileges after startup (you must start gkrellmd as root to do it). - # - user gkrellmd --group proc -+group gkrellmd - - # Run in background and detach from the controlling terminal - detach diff --git a/gkrellm.spec b/gkrellm.spec index e018622..3d9cc01 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -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 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers 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 @@ Development files for the GNU Krell Monitors. %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 22 2007 Hans de Goede 2.3.0-1 +- New upstream release 2.3.0 + * Fri Jul 20 2007 Hans de Goede 2.2.10-3 - Rebuild, including libsensors support on ppc and ppc64 as lm_sensors is available there now. diff --git a/sources b/sources index 19fdcac..3b67321 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -57ef0525c0997ac2e7720712811f5a84 gkrellm-2.2.10.tar.bz2 +8ced6843f4681ad8501fd04285ecff1f gkrellm-2.3.0.tar.bz2 From 7e1e519d77b4ea3e2880696611bf5966aa40f20b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 7 Aug 2007 20:52:50 +0000 Subject: [PATCH 010/100] - Update License tag for new Licensing Guidelines compliance --- gkrellm.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 3d9cc01..d17abbf 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,9 +1,9 @@ Name: gkrellm Version: 2.3.0 -Release: 1%{?dist} +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 @@ -99,7 +99,6 @@ install -m 644 server/gkrellmd.conf $RPM_BUILD_ROOT%{_sysconfdir}/gkrellmd.conf 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} \ @@ -167,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 7 2007 Hans de Goede 2.3.0-2 +- Update License tag for new Licensing Guidelines compliance + * Sun Jul 22 2007 Hans de Goede 2.3.0-1 - New upstream release 2.3.0 From 9090bb72f23715ea9d289b3b62a5f6fcf7bfc55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 4 Sep 2007 16:57:14 +0000 Subject: [PATCH 011/100] - Fix gnutls detection/build and use it instead of openssl. - Sync user and group creation with current Fedora guidelines. --- gkrellm-2.3.0-gnutls.patch | 22 ++++++++++++++++++++++ gkrellm.spec | 19 +++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 gkrellm-2.3.0-gnutls.patch diff --git a/gkrellm-2.3.0-gnutls.patch b/gkrellm-2.3.0-gnutls.patch new file mode 100644 index 0000000..380ca87 --- /dev/null +++ b/gkrellm-2.3.0-gnutls.patch @@ -0,0 +1,22 @@ +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 ++#include + #include + #include + +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 ++#include + #include + #define MD5Init MD5_Init + #define MD5Update MD5_Update diff --git a/gkrellm.spec b/gkrellm.spec index d17abbf..695bdf3 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -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 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers 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 @@ Additional features are: %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 @@ Development files for the GNU Krell Monitors. %prep %setup -q +%patch0 -p1 -z .gnutls %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width @@ -119,9 +121,10 @@ fi %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 4 2007 Ville Skyttä - 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 2.3.0-2 - Update License tag for new Licensing Guidelines compliance From 67b0b4ec1f42b13df63c97320132c61e7492da2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 5 Sep 2007 15:01:26 +0000 Subject: [PATCH 012/100] - Rewrite gkrellmd init script: better LSB compliance, hddtemp interoperability, avoidance of X error messages, general cleanup. --- gkrellm.spec | 6 +++- gkrellmd.init | 91 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 59 insertions(+), 38 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 695bdf3..87915c1 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -169,6 +169,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 5 2007 Ville Skyttä - 2.3.0-4 +- Rewrite gkrellmd init script: better LSB compliance, hddtemp + interoperability, avoidance of X error messages, general cleanup. + * Tue Sep 4 2007 Ville Skyttä - 2.3.0-3 - Fix gnutls detection/build and use it instead of openssl. - Sync user and group creation with current Fedora guidelines. diff --git a/gkrellmd.init b/gkrellmd.init index a28fcf8..051c140 100644 --- a/gkrellmd.init +++ b/gkrellmd.init @@ -6,53 +6,70 @@ # processname: gkrellmd # config: /etc/gkrellmd.conf +### BEGIN INIT INFO +# Provides: gkrellmd +# Required-Start: $network +# Required-Stop: $network +# Should-Start: hddtemp +# Should-Stop: hddtemp +# Short-Description: GNU Krell Monitors Server +### END INIT INFO + # source function library . /etc/rc.d/init.d/functions -# Check that networking is up. -[ "${NETWORKING}" = "no" ] && exit 0 +exec=/usr/sbin/gkrellmd +prog=${exec##*/} +lockfile=/var/lock/subsys/$prog -# The process must be configured first. -[ -f /etc/gkrellmd.conf ] || exit 0 +start() { + if [ -f /etc/gkrellmd.conf ] ; then + echo -n $"Starting GNU Krell Monitors server ($prog): " + DISPLAY= daemon --user gkrellmd $exec -d + rv=$? + echo + else + action $"Unconfigured: $prog, /etc/gkrellmd.conf not found" /bin/false + rv=6 + fi + [ $rv -eq 0 ] && touch $lockfile + return $rv +} -RETVAL=0 +stop() { + echo -n $"Stopping GNU Krell Monitors server ($prog): " + killproc $prog + rv=$? + [ $rv -eq 0 ] && rm -f $lockfile + echo + return $rv +} -prog="gkrellmd" +restart() { + stop + start +} case "$1" in - start) - echo -n $"Starting $prog: " - daemon --user gkrellmd /usr/sbin/gkrellmd -d - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gkrellmd - echo - ;; - stop) - echo -n $"Shutting down $prog: " - killproc gkrellmd - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gkrellmd - echo - ;; - restart|reload|force-reload) - $0 stop - $0 start - RETVAL=$? + start|stop|restart) + $1 ;; - condrestart|try-restart) - if [ -f /var/lock/subsys/gkrellmd ]; then - $0 stop - $0 start + force-reload) + restart + ;; + status) + status $prog + ;; + try-restart|condrestart) + if status $prog >/dev/null ; then + restart fi - RETVAL=$? ;; - status) - status gkrellmd - RETVAL=$? + reload) + action $"Service $prog does not support the reload action: " /bin/false + exit 3 ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" - exit 1 + *) + echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}" + exit 2 esac - -exit $RETVAL From 4a7127df75d1c296436cb0b3719c5210c1986461 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 28 Oct 2007 10:22:29 +0000 Subject: [PATCH 013/100] Add support for lm_sensors-3.0.0 (not building yet as lm_sensors-3.0.0 isn't in the repo yet) --- gkrellm-2.3.0-libsensors4.patch | 242 ++++++++++++++++++++++++++++++++ gkrellm.spec | 7 +- 2 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 gkrellm-2.3.0-libsensors4.patch diff --git a/gkrellm-2.3.0-libsensors4.patch b/gkrellm-2.3.0-libsensors4.patch new file mode 100644 index 0000000..2220bed --- /dev/null +++ b/gkrellm-2.3.0-libsensors4.patch @@ -0,0 +1,242 @@ +diff -up gkrellm-2.3.0/src/sysdeps/linux.c.libsensors4 gkrellm-2.3.0/src/sysdeps/linux.c +--- gkrellm-2.3.0/src/sysdeps/linux.c.libsensors4 2007-07-07 01:57:20.000000000 +0200 ++++ gkrellm-2.3.0/src/sysdeps/linux.c 2007-10-28 11:08:47.000000000 +0100 +@@ -2055,14 +2055,14 @@ check_voltage_name(const gchar *name, gi + static gboolean + libsensors_init(void) + { +- gint nr, nr1, nr2, len; +- const sensors_chip_name *name; +- const sensors_feature_data *feature; +- gchar *label, *s; +- FILE *f; ++ gint nr, len, iodev; ++ const sensors_chip_name *name; ++ gchar *label, *busname, *s; + gchar id_name[512], sensor_path[512]; + gint type, n_sensors_added; + ConfigMap *config_map; ++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */ ++ FILE *f; + + f = fopen("/etc/sensors.conf", "r"); + if (!f) +@@ -2087,7 +2087,8 @@ libsensors_init(void) + nr = 0; + while ((name = sensors_get_detected_chips(&nr))) + { +- nr1 = 0, nr2 = 0; ++ const sensors_feature_data *feature; ++ gint nr1 = 0, nr2 = 0; + while ((feature = sensors_get_all_features(*name, &nr1, &nr2))) + { + if ( sensors_get_ignored(*name, feature->number) +@@ -2137,6 +2138,11 @@ libsensors_init(void) + continue; + } + ++ /* notice that we store the bus and addr both in iodev as ++ | 2 _signed 16 bit ints. */ ++ iodev = (name->bus & 0xFFFF) | (name->addr << 16); ++ busname = name->busname; ++ + if (sensors_get_label(*name, feature->number, &label) != 0) + { + if (_GK.debug_level & DEBUG_SENSORS) +@@ -2144,7 +2150,119 @@ libsensors_init(void) + id_name); + label = NULL; + } ++#else /* libsensors4 code */ ++ if (sensors_init(NULL) != 0) ++ { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors: init failed!\n"); ++ return FALSE; ++ } ++ ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors: init OK\n"); ++ ++ n_sensors_added = 0; ++ nr = 0; ++ while ((name = sensors_get_detected_chips(NULL, &nr))) ++ { ++ const sensors_subfeature *feature; ++ const sensors_feature *main_feature; ++ gint nr1 = 0; ++ while ((main_feature = sensors_get_features(name, &nr1))) ++ { ++ switch (name->bus.type) ++ { ++ case SENSORS_BUS_TYPE_I2C: ++ case SENSORS_BUS_TYPE_SPI: ++ snprintf(id_name, sizeof(id_name), "%s@%d:%x/%s", ++ name->prefix, name->bus.nr, name->addr, main_feature->name); ++ break; ++ default: ++ snprintf(id_name, sizeof(id_name), "%s@%x/%s", ++ name->prefix, name->addr, main_feature->name); ++ ++ } ++ /* We need to store both the prefix and the path, but we ++ | only have one string, so concat them together separated by : ++ */ ++ snprintf(sensor_path, sizeof (sensor_path), "%s:%s", ++ name->prefix, name->path ? name->path : "NULL"); ++ ++ switch (main_feature->type) ++ { ++ case SENSORS_FEATURE_IN: ++ type = SENSOR_VOLTAGE; ++ feature = sensors_get_subfeature(name, ++ main_feature, SENSORS_SUBFEATURE_IN_INPUT); ++ break; ++ case SENSORS_FEATURE_FAN: ++ type = SENSOR_FAN; ++ feature = sensors_get_subfeature(name, ++ main_feature, SENSORS_SUBFEATURE_FAN_INPUT); ++ break; ++ case SENSORS_FEATURE_TEMP: ++ type = SENSOR_TEMPERATURE; ++ feature = sensors_get_subfeature(name, ++ main_feature, SENSORS_SUBFEATURE_TEMP_INPUT); ++ break; ++ default: ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors: error determining type for: %s\n", ++ id_name); ++ continue; ++ } ++ ++ if (!feature) ++ { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors: error could not get input subfeature for: %s\n", ++ id_name); ++ continue; ++ } ++ ++ /* failsafe tests, will bus type and nr fit in 8 bits ++ signed and addr fit in 16 bits signed ? ++ */ ++ if (name->bus.type != ((name->bus.type << 24) >> 24)) ++ { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors: bus-type bigger than 8 bits: %s\n", ++ id_name); ++ continue; ++ } ++ if (name->bus.nr != ((name->bus.nr << 24) >> 24)) ++ { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors: bus-nr bigger than 8 bits: %s\n", ++ id_name); ++ continue; ++ } ++ if (name->addr != ((name->addr << 16) >> 16)) ++ { ++ if (_GK.debug_level & DEBUG_SENSORS) ++ printf("libsensors: addr bigger than 16 bits: %s\n", ++ id_name); ++ continue; ++ } + ++ /* notice that we store the bus id, type and addr in ++ iodev as 2 signed 8 bit ints and one 16 bit int */ ++ iodev = (name->bus.type & 0xFF) | ++ ((name->bus.nr & 0xFF) << 8) | ++ (name->addr << 16); ++ busname = name->path; ++ ++ label = sensors_get_label(name, main_feature); ++ if (!label && (_GK.debug_level & DEBUG_SENSORS)) ++ printf("libsensors: error getting label for: %s\n", ++ id_name); ++ ++ /* additional { to match "if (get_ignored(..) {" ++ from libsensors3 code */ ++ { ++#endif ++ if (label) ++ { + /* Strip some common post/prefixes for smaller default labels + */ + len = strlen(label); +@@ -2171,14 +2289,13 @@ libsensors_init(void) + memmove(label, label + 4, strlen (label + 4) + 1); + break; + } +- /* notice that we store the bus and addr both in iodev as +- | 2 _signed 16 bit ints. Default factor of zero tells +- | sensor.c that sensor formula is handled, ie via ++ } ++ /* Default factor of zero tells sensor.c ++ | that sensor formula is handled, ie via + | /etc/sensors.conf. + */ + gkrellm_sensors_add_sensor(type, sensor_path, id_name, +- feature->number, +- (name->bus & 0xFFFF) | (name->addr << 16), ++ feature->number, iodev, + LIBSENSORS_INTERFACE, 0.0, 0.0, + NULL, label); + ++n_sensors_added; +@@ -2188,10 +2305,10 @@ libsensors_init(void) + if (_GK.debug_level & DEBUG_SENSORS) + printf("%s %s %x\n", + sensor_path, id_name, +- (name->bus & 0xFFFF) | (name->addr << 16)); ++ iodev); + +- if ( name->busname +- && (s = strrchr(name->busname, '/')) != NULL ++ if ( busname ++ && (s = strrchr(busname, '/')) != NULL + && *(s + 1) + ) + { +@@ -2229,8 +2346,9 @@ libsensors_get_value(char *sensor_path, + } + *p = 0; /* We must undo this !! (or make a copy) */ + name.prefix = sensor_path; +- name.bus = (iodev << 16) >> 16; /* sign extend the low 16 bits */ + name.addr = iodev >> 16; ++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */ ++ name.bus = (iodev << 16) >> 16; /* sign extend the low 16 bits */ + name.busname = p + 1; + if (!strcmp(name.busname, "NULL")) + name.busname = NULL; +@@ -2248,6 +2366,32 @@ libsensors_get_value(char *sensor_path, + name.prefix, name.addr, id); + } + ++#else /* libsensors4 code */ ++ name.bus.type = (iodev << 24) >> 24; /* sign extend the low 8 bits */ ++ name.bus.nr = (iodev << 16) >> 24; /* sign extend the 2nd byte */ ++ name.path = p + 1; ++ if (!strcmp(name.path, "NULL")) ++ name.path = NULL; ++ ++ result = sensors_get_value(&name, id, &val) == 0; ++ ++ if (!result && (_GK.debug_level & DEBUG_SENSORS)) ++ { ++ switch (name.bus.type) ++ { ++ case SENSORS_BUS_TYPE_I2C: ++ case SENSORS_BUS_TYPE_SPI: ++ printf( ++ "libsensors: error getting value for: %s@%d:%x feature: %d\n", ++ name.prefix, (int)name.bus.nr, name.addr, id); ++ break; ++ default: ++ printf("libsensors: error getting value for: %s@%x feature: %d\n", ++ name.prefix, name.addr, id); ++ } ++ } ++#endif ++ + if (value) + *value = val; + diff --git a/gkrellm.spec b/gkrellm.spec index 87915c1..eca7c18 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -14,6 +14,7 @@ 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.3.0-libsensors4.patch BuildRequires: gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +64,7 @@ Development files for the GNU Krell Monitors. %patch2 -p1 -z .sansfont %patch3 -p1 -z .width %patch4 -p1 -z .libdir2 +%patch5 -p1 -z .libsensors4 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 @@ -169,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 24 2007 Hans de Goede 2.3.0-5 +- Add support for lm_sensors-3.0.0 + * Wed Sep 5 2007 Ville Skyttä - 2.3.0-4 - Rewrite gkrellmd init script: better LSB compliance, hddtemp interoperability, avoidance of X error messages, general cleanup. From 7806e617056ee0da12587f0047511872e62fd01b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 3 Dec 2007 20:34:00 +0000 Subject: [PATCH 014/100] - New upstream release 2.3.1 - Drop upstreamed gnutls and lm_sensors-3.0.0 patches --- .cvsignore | 2 +- gkrellm-2.3.0-gnutls.patch | 22 --- gkrellm-2.3.0-libsensors4.patch | 242 -------------------------------- gkrellm.spec | 12 +- sources | 2 +- 5 files changed, 8 insertions(+), 272 deletions(-) delete mode 100644 gkrellm-2.3.0-gnutls.patch delete mode 100644 gkrellm-2.3.0-libsensors4.patch diff --git a/.cvsignore b/.cvsignore index a4e3bf4..54176dd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gkrellm-2.3.0.tar.bz2 +gkrellm-2.3.1.tar.bz2 diff --git a/gkrellm-2.3.0-gnutls.patch b/gkrellm-2.3.0-gnutls.patch deleted file mode 100644 index 380ca87..0000000 --- a/gkrellm-2.3.0-gnutls.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 -+#include - #include - #include - -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 -+#include - #include - #define MD5Init MD5_Init - #define MD5Update MD5_Update diff --git a/gkrellm-2.3.0-libsensors4.patch b/gkrellm-2.3.0-libsensors4.patch deleted file mode 100644 index 2220bed..0000000 --- a/gkrellm-2.3.0-libsensors4.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff -up gkrellm-2.3.0/src/sysdeps/linux.c.libsensors4 gkrellm-2.3.0/src/sysdeps/linux.c ---- gkrellm-2.3.0/src/sysdeps/linux.c.libsensors4 2007-07-07 01:57:20.000000000 +0200 -+++ gkrellm-2.3.0/src/sysdeps/linux.c 2007-10-28 11:08:47.000000000 +0100 -@@ -2055,14 +2055,14 @@ check_voltage_name(const gchar *name, gi - static gboolean - libsensors_init(void) - { -- gint nr, nr1, nr2, len; -- const sensors_chip_name *name; -- const sensors_feature_data *feature; -- gchar *label, *s; -- FILE *f; -+ gint nr, len, iodev; -+ const sensors_chip_name *name; -+ gchar *label, *busname, *s; - gchar id_name[512], sensor_path[512]; - gint type, n_sensors_added; - ConfigMap *config_map; -+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */ -+ FILE *f; - - f = fopen("/etc/sensors.conf", "r"); - if (!f) -@@ -2087,7 +2087,8 @@ libsensors_init(void) - nr = 0; - while ((name = sensors_get_detected_chips(&nr))) - { -- nr1 = 0, nr2 = 0; -+ const sensors_feature_data *feature; -+ gint nr1 = 0, nr2 = 0; - while ((feature = sensors_get_all_features(*name, &nr1, &nr2))) - { - if ( sensors_get_ignored(*name, feature->number) -@@ -2137,6 +2138,11 @@ libsensors_init(void) - continue; - } - -+ /* notice that we store the bus and addr both in iodev as -+ | 2 _signed 16 bit ints. */ -+ iodev = (name->bus & 0xFFFF) | (name->addr << 16); -+ busname = name->busname; -+ - if (sensors_get_label(*name, feature->number, &label) != 0) - { - if (_GK.debug_level & DEBUG_SENSORS) -@@ -2144,7 +2150,119 @@ libsensors_init(void) - id_name); - label = NULL; - } -+#else /* libsensors4 code */ -+ if (sensors_init(NULL) != 0) -+ { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors: init failed!\n"); -+ return FALSE; -+ } -+ -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors: init OK\n"); -+ -+ n_sensors_added = 0; -+ nr = 0; -+ while ((name = sensors_get_detected_chips(NULL, &nr))) -+ { -+ const sensors_subfeature *feature; -+ const sensors_feature *main_feature; -+ gint nr1 = 0; -+ while ((main_feature = sensors_get_features(name, &nr1))) -+ { -+ switch (name->bus.type) -+ { -+ case SENSORS_BUS_TYPE_I2C: -+ case SENSORS_BUS_TYPE_SPI: -+ snprintf(id_name, sizeof(id_name), "%s@%d:%x/%s", -+ name->prefix, name->bus.nr, name->addr, main_feature->name); -+ break; -+ default: -+ snprintf(id_name, sizeof(id_name), "%s@%x/%s", -+ name->prefix, name->addr, main_feature->name); -+ -+ } -+ /* We need to store both the prefix and the path, but we -+ | only have one string, so concat them together separated by : -+ */ -+ snprintf(sensor_path, sizeof (sensor_path), "%s:%s", -+ name->prefix, name->path ? name->path : "NULL"); -+ -+ switch (main_feature->type) -+ { -+ case SENSORS_FEATURE_IN: -+ type = SENSOR_VOLTAGE; -+ feature = sensors_get_subfeature(name, -+ main_feature, SENSORS_SUBFEATURE_IN_INPUT); -+ break; -+ case SENSORS_FEATURE_FAN: -+ type = SENSOR_FAN; -+ feature = sensors_get_subfeature(name, -+ main_feature, SENSORS_SUBFEATURE_FAN_INPUT); -+ break; -+ case SENSORS_FEATURE_TEMP: -+ type = SENSOR_TEMPERATURE; -+ feature = sensors_get_subfeature(name, -+ main_feature, SENSORS_SUBFEATURE_TEMP_INPUT); -+ break; -+ default: -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors: error determining type for: %s\n", -+ id_name); -+ continue; -+ } -+ -+ if (!feature) -+ { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors: error could not get input subfeature for: %s\n", -+ id_name); -+ continue; -+ } -+ -+ /* failsafe tests, will bus type and nr fit in 8 bits -+ signed and addr fit in 16 bits signed ? -+ */ -+ if (name->bus.type != ((name->bus.type << 24) >> 24)) -+ { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors: bus-type bigger than 8 bits: %s\n", -+ id_name); -+ continue; -+ } -+ if (name->bus.nr != ((name->bus.nr << 24) >> 24)) -+ { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors: bus-nr bigger than 8 bits: %s\n", -+ id_name); -+ continue; -+ } -+ if (name->addr != ((name->addr << 16) >> 16)) -+ { -+ if (_GK.debug_level & DEBUG_SENSORS) -+ printf("libsensors: addr bigger than 16 bits: %s\n", -+ id_name); -+ continue; -+ } - -+ /* notice that we store the bus id, type and addr in -+ iodev as 2 signed 8 bit ints and one 16 bit int */ -+ iodev = (name->bus.type & 0xFF) | -+ ((name->bus.nr & 0xFF) << 8) | -+ (name->addr << 16); -+ busname = name->path; -+ -+ label = sensors_get_label(name, main_feature); -+ if (!label && (_GK.debug_level & DEBUG_SENSORS)) -+ printf("libsensors: error getting label for: %s\n", -+ id_name); -+ -+ /* additional { to match "if (get_ignored(..) {" -+ from libsensors3 code */ -+ { -+#endif -+ if (label) -+ { - /* Strip some common post/prefixes for smaller default labels - */ - len = strlen(label); -@@ -2171,14 +2289,13 @@ libsensors_init(void) - memmove(label, label + 4, strlen (label + 4) + 1); - break; - } -- /* notice that we store the bus and addr both in iodev as -- | 2 _signed 16 bit ints. Default factor of zero tells -- | sensor.c that sensor formula is handled, ie via -+ } -+ /* Default factor of zero tells sensor.c -+ | that sensor formula is handled, ie via - | /etc/sensors.conf. - */ - gkrellm_sensors_add_sensor(type, sensor_path, id_name, -- feature->number, -- (name->bus & 0xFFFF) | (name->addr << 16), -+ feature->number, iodev, - LIBSENSORS_INTERFACE, 0.0, 0.0, - NULL, label); - ++n_sensors_added; -@@ -2188,10 +2305,10 @@ libsensors_init(void) - if (_GK.debug_level & DEBUG_SENSORS) - printf("%s %s %x\n", - sensor_path, id_name, -- (name->bus & 0xFFFF) | (name->addr << 16)); -+ iodev); - -- if ( name->busname -- && (s = strrchr(name->busname, '/')) != NULL -+ if ( busname -+ && (s = strrchr(busname, '/')) != NULL - && *(s + 1) - ) - { -@@ -2229,8 +2346,9 @@ libsensors_get_value(char *sensor_path, - } - *p = 0; /* We must undo this !! (or make a copy) */ - name.prefix = sensor_path; -- name.bus = (iodev << 16) >> 16; /* sign extend the low 16 bits */ - name.addr = iodev >> 16; -+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */ -+ name.bus = (iodev << 16) >> 16; /* sign extend the low 16 bits */ - name.busname = p + 1; - if (!strcmp(name.busname, "NULL")) - name.busname = NULL; -@@ -2248,6 +2366,32 @@ libsensors_get_value(char *sensor_path, - name.prefix, name.addr, id); - } - -+#else /* libsensors4 code */ -+ name.bus.type = (iodev << 24) >> 24; /* sign extend the low 8 bits */ -+ name.bus.nr = (iodev << 16) >> 24; /* sign extend the 2nd byte */ -+ name.path = p + 1; -+ if (!strcmp(name.path, "NULL")) -+ name.path = NULL; -+ -+ result = sensors_get_value(&name, id, &val) == 0; -+ -+ if (!result && (_GK.debug_level & DEBUG_SENSORS)) -+ { -+ switch (name.bus.type) -+ { -+ case SENSORS_BUS_TYPE_I2C: -+ case SENSORS_BUS_TYPE_SPI: -+ printf( -+ "libsensors: error getting value for: %s@%d:%x feature: %d\n", -+ name.prefix, (int)name.bus.nr, name.addr, id); -+ break; -+ default: -+ printf("libsensors: error getting value for: %s@%x feature: %d\n", -+ name.prefix, name.addr, id); -+ } -+ } -+#endif -+ - if (value) - *value = val; - diff --git a/gkrellm.spec b/gkrellm.spec index eca7c18..84c24e6 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm -Version: 2.3.0 -Release: 5%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -9,12 +9,10 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers 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 -Patch5: gkrellm-2.3.0-libsensors4.patch BuildRequires: gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,12 +57,10 @@ Development files for the GNU Krell Monitors. %prep %setup -q -%patch0 -p1 -z .gnutls %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width %patch4 -p1 -z .libdir2 -%patch5 -p1 -z .libsensors4 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 @@ -171,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 3 2007 Hans de Goede 2.3.1-1 +- New upstream release 2.3.1 +- Drop upstreamed gnutls and lm_sensors-3.0.0 patches + * Wed Oct 24 2007 Hans de Goede 2.3.0-5 - Add support for lm_sensors-3.0.0 diff --git a/sources b/sources index 3b67321..fa25ab1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ced6843f4681ad8501fd04285ecff1f gkrellm-2.3.0.tar.bz2 +009d8dddd3ce5cc83a4bb4d559ee922d gkrellm-2.3.1.tar.bz2 From 79b87f6636473d78b88848ee87e2c19ea992a260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 4 Dec 2007 21:23:18 +0000 Subject: [PATCH 015/100] - Clean up desktop-file-utils 0.14 warnings. --- gkrellm.desktop | 5 ++--- gkrellm.spec | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gkrellm.desktop b/gkrellm.desktop index 4c9e5da..9464db1 100644 --- a/gkrellm.desktop +++ b/gkrellm.desktop @@ -1,9 +1,8 @@ [Desktop Entry] -Encoding=UTF-8 Name=GKrellM System Monitor Comment=Monitor for CPU, memory, disks, network, mail Exec=gkrellm -Icon=gkrellm.png +Icon=gkrellm Terminal=false Type=Application -Categories=Application;System; +Categories=System; diff --git a/gkrellm.spec b/gkrellm.spec index 84c24e6..8c7a778 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 4 2007 Ville Skyttä - 2.3.1-2 +- Clean up desktop-file-utils 0.14 warnings. + * Mon Dec 3 2007 Hans de Goede 2.3.1-1 - New upstream release 2.3.1 - Drop upstreamed gnutls and lm_sensors-3.0.0 patches From 814edcabaae9dab818ad311d615e1024fca8a722 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 13 Feb 2008 19:26:02 +0000 Subject: [PATCH 016/100] - Fix building with latest glibc - Rebuild for gcc 4.3 --- gkrellm-2.3.1-netdb.patch | 29 +++++++++++++++++++++++++++++ gkrellm.spec | 10 ++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gkrellm-2.3.1-netdb.patch diff --git a/gkrellm-2.3.1-netdb.patch b/gkrellm-2.3.1-netdb.patch new file mode 100644 index 0000000..b5f4540 --- /dev/null +++ b/gkrellm-2.3.1-netdb.patch @@ -0,0 +1,29 @@ +--- gkrellm-2.3.1/src/client.c~ 2008-02-13 20:23:09.000000000 +0100 ++++ gkrellm-2.3.1/src/client.c 2008-02-13 20:23:09.000000000 +0100 +@@ -1606,7 +1607,7 @@ KeyTable update_table[] = + + + static gint +-getline(gint fd, gchar *buf, gint len) ++gkrellm_getline(gint fd, gchar *buf, gint len) + { + fd_set read_fds; + struct timeval tv; +@@ -1698,7 +1699,7 @@ read_server_setup(gint fd) + + while (1) + { +- getline(fd, buf, sizeof(buf)); ++ gkrellm_getline(fd, buf, sizeof(buf)); + if (!strcmp(buf, "")) + break; + process_server_line(&setup_table[0], table_size, buf); +@@ -1714,7 +1715,7 @@ read_server_setup(gint fd) + table_size = sizeof(update_table) / sizeof(KeyTable); + while (1) + { +- getline(fd, buf, sizeof(buf)); ++ gkrellm_getline(fd, buf, sizeof(buf)); + if (!strcmp(buf, "")) + break; + process_server_line(&update_table[0], table_size, buf); diff --git a/gkrellm.spec b/gkrellm.spec index 8c7a778..7401b5e 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -13,6 +13,7 @@ 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.3.1-netdb.patch BuildRequires: gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,6 +62,7 @@ Development files for the GNU Krell Monitors. %patch2 -p1 -z .sansfont %patch3 -p1 -z .width %patch4 -p1 -z .libdir2 +%patch5 -p1 -z .netdb 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 @@ -74,7 +76,7 @@ done %build make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS" + INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install @@ -167,6 +169,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 13 2008 Hans de Goede 2.3.1-3 +- Fix building with latest glibc +- Rebuild for gcc 4.3 + * Tue Dec 4 2007 Ville Skyttä - 2.3.1-2 - Clean up desktop-file-utils 0.14 warnings. From 4678c18f7b389b475a658cc83c12e4f3a1b4aaab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Wed, 25 Jun 2008 07:06:43 +0000 Subject: [PATCH 017/100] - rebuild with new gnutls --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 7401b5e..378bf75 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -169,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 25 2008 Tomas Mraz 2.3.1-4 +- rebuild with new gnutls + * Wed Feb 13 2008 Hans de Goede 2.3.1-3 - Fix building with latest glibc - Rebuild for gcc 4.3 From 24245fedcd08642287a2d6c0c80aca3007f0e768 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 10 Sep 2008 08:57:51 +0000 Subject: [PATCH 018/100] - Build against openssl instead of gnutls-openssl fixing symbol conflicts when using pam_ldap (which uses openssl), this fixes rh 446860 --- gkrellm-openssl-license-exception.eml | 91 +++++++++++++++++++++++++++ gkrellm.spec | 14 ++++- 2 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 gkrellm-openssl-license-exception.eml diff --git a/gkrellm-openssl-license-exception.eml b/gkrellm-openssl-license-exception.eml new file mode 100644 index 0000000..713bba6 --- /dev/null +++ b/gkrellm-openssl-license-exception.eml @@ -0,0 +1,91 @@ +Return-Path: +Received: from koko.hhs.nl ([145.52.2.16] verified) + by hhs.nl (CommuniGate Pro SMTP 4.3.6) + with ESMTP id 90744876 for j.w.r.degoede@hhs.nl; Tue, 09 Sep 2008 02:20:32 +0200 +Received: from exim (helo=koko) + by koko.hhs.nl with local-smtp (Exim 4.62) + (envelope-from ) + id 1Kcqy5-0006CE-C0 + for j.w.r.degoede@hhs.nl; Tue, 09 Sep 2008 02:20:29 +0200 +Received: from [194.171.167.218] (port=40317 helo=filter2-til.mf.surf.net) + by koko.hhs.nl with esmtp (Exim 4.62) + (envelope-from ) + id 1Kcqy5-0006C8-36 + for j.w.r.degoede@hhs.nl; Tue, 09 Sep 2008 02:20:29 +0200 +Received: from mail5.dslextreme.com (mail5.dslextreme.com [66.51.199.81]) + by filter2-til.mf.surf.net (8.13.8/8.13.8/Debian-3) with SMTP id m890KTBl001805 + for ; Tue, 9 Sep 2008 02:20:30 +0200 +Received: (qmail 10268 invoked from network); 9 Sep 2008 00:20:27 -0000 +Received: from unknown (HELO localhost) (billw@70.142.30.251) + by mail5.dslextreme.com with SMTP; Mon, 08 Sep 2008 17:20:27 -0700 +Date: Mon, 8 Sep 2008 19:20:26 -0500 +From: Bill Wilson +To: Hans de Goede +Subject: Re: gkrellm openssl license exception? +Message-Id: <20080908192026.d5aa51a5.billw@dslextreme.com> +In-Reply-To: <48B2F6B0.30505@hhs.nl> +References: <48B2F6B0.30505@hhs.nl> +X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i486-pc-linux-gnu) +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +X-Canit-CHI2: 0.00 +X-Bayes-Prob: 0.0001 (Score 0, tokens from: @@RPTN) +X-Spam-Score: 0.00 () [Tag at 8.00] +X-CanItPRO-Stream: hhs:j.w.r.degoede@hhs.nl (inherits from hhs:default,base:default) +X-Canit-Stats-ID: 110670270 - 6f51dcc34c3c +X-Scanned-By: CanIt (www . roaringpenguin . com) on 194.171.167.218 +X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 08092008 #1073355, status: clean + +On Mon, 25 Aug 2008 20:15:12 +0200 +Hans de Goede wrote: + +> Don't know if you remember me, we've had some contact in the past. I'm the +> Fedora gkrellm packahe maintainer, as well as the author of the lm_sensors-3.x +> support for gkrellm. + +Hi Hans, +Sure, I remember. + +> I recently got this bug reported against gkrellm: +> https://bugzilla.redhat.com/show_bug.cgi?id=446860 +> +> The problem is, or I believe it to be, that when an application uses +> libgnutls-openssl (such as gkrellm does) and then a library uses the real +> openssl (for example glibc through nss_ldap, see bug) then in the nss_ldap +> example, the later dlopen's nss_ldap starts using the openssl symbols from +> gnutls instead of those from openssl, but they are not ABI compatible -> boom. +> +> +> So I would like to build and distribute gkrellm against the real openssl. +> However as you probably know, according according to some the GPL and the +> openssl library are not compatible. This can be fixed by adding a special +> exception to the GPL such as the FSF for example has done for wget, quoting +> from the wget license: +> +> "In addition, as a special exception, the Free Software Foundation gives +> permission to link the code of its release of Wget with the OpenSSL project's +> "OpenSSL" library (or with modified versions of it that use the same license as +> the "OpenSSL" library), and distribute the linked executables. You must obey +> the GNU General Public License in all respects for all of the code used other +> than "OpenSSL". If you modify this file, you may extend this exception to your +> version of the file, but you are not obligated to do so. If you do not wish to +> do so, delete this exception statement from your version." +> +> This I wonder if you would be willing to add such an exception to the gkrellm +> license, fixing the openssl license issues. + +This is OK with me and I'll add a similar exception for linking OpenSSL to gkrellm +for the next release. + +If you want to do an OpenSSL linked against the current gkrellm 2.3.1 package +for Fedora in the meantime, you can consider this email permission to do so. + +Oh, and sorry for the delay in getting back to you. I've been doing a lot of +house remodeling lately :( + +Bill + +-- +http://gkrellm.net + diff --git a/gkrellm.spec b/gkrellm.spec index 378bf75..cc57d5a 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -9,12 +9,13 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers Source1: gkrellmd.init Source2: gkrellm.desktop Source3: gkrellm.png +Source4: gkrellm-openssl-license-exception.eml 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.3.1-netdb.patch -BuildRequires: gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext +BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +64,7 @@ Development files for the GNU Krell Monitors. %patch3 -p1 -z .width %patch4 -p1 -z .libdir2 %patch5 -p1 -z .netdb +cp -a %{SOURCE4} . 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 @@ -76,7 +78,8 @@ done %build make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" + INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ + without-gnutls=1 %install @@ -148,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYRIGHT Changelog README Themes.html +%doc gkrellm-openssl-license-exception.eml %{_bindir}/%{name} %{_libdir}/gkrellm2 %{_datadir}/gkrellm2 @@ -169,6 +173,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 10 2008 Hans de Goede 2.3.1-5 +- Build against openssl instead of gnutls-openssl fixing symbol conflicts when + using pam_ldap (which uses openssl), this fixes rh 446860 + * Wed Jun 25 2008 Tomas Mraz 2.3.1-4 - rebuild with new gnutls From 2e0fb8186396ef275f45b8b66b9826c63f39751f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 2 Oct 2008 20:10:23 +0000 Subject: [PATCH 019/100] - Fix a small memory leak (which would accumulate over time) thanks to Daniel Colascione for the patch (rh 464040) --- gkrellm-2.3.1-leak-fix.patch | 13 +++++++++++++ gkrellm.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gkrellm-2.3.1-leak-fix.patch diff --git a/gkrellm-2.3.1-leak-fix.patch b/gkrellm-2.3.1-leak-fix.patch new file mode 100644 index 0000000..36ebdf8 --- /dev/null +++ b/gkrellm-2.3.1-leak-fix.patch @@ -0,0 +1,13 @@ +diff -u /tmp/old-clock.c /net/home/danc/rpm/BUILD/gkrellm-2.3.1/src/clock.c +--- /src/clock.c 2008-09-25 20:03:55.000000000 -0400 ++++ /net/home/danc/rpm/BUILD/gkrellm-2.3.1/src/clock.c 2008-09-25 20:07:52.000000000 -0400 +@@ -396,6 +396,7 @@ + } + gkrellm_draw_decal_markup(pclock, d_clock, clock_string); + gkrellm_draw_panel_layers(pclock); ++ g_free(clock_string); + } + + + +Diff finished. Thu Sep 25 20:08:38 2008 diff --git a/gkrellm.spec b/gkrellm.spec index cc57d5a..236ddb5 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -15,6 +15,7 @@ Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch Patch4: gkrellm-2.2.9-libdir.patch Patch5: gkrellm-2.3.1-netdb.patch +Patch6: gkrellm-2.3.1-leak-fix.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) @@ -64,6 +65,7 @@ Development files for the GNU Krell Monitors. %patch3 -p1 -z .width %patch4 -p1 -z .libdir2 %patch5 -p1 -z .netdb +%patch6 -p1 -z .leakfix cp -a %{SOURCE4} . for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do @@ -173,6 +175,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 2 2008 Hans de Goede 2.3.1-6 +- Fix a small memory leak (which would accumulate over time) thanks to + Daniel Colascione for the patch (rh 464040) + * Wed Sep 10 2008 Hans de Goede 2.3.1-5 - Build against openssl instead of gnutls-openssl fixing symbol conflicts when using pam_ldap (which uses openssl), this fixes rh 446860 From 5632bee94820cb557f68d21eaa49e97161f71a6f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 23 Oct 2008 18:42:37 +0000 Subject: [PATCH 020/100] - New upstream release 2.3.2 - Drop upstreamed memleak patch --- .cvsignore | 2 +- gkrellm-2.1.28-config.patch | 21 ++++--- gkrellm-2.2.9-libdir.patch | 42 ------------- gkrellm-2.3.1-leak-fix.patch | 13 ---- gkrellm-2.3.1-netdb.patch | 27 ++++---- gkrellm-openssl-license-exception.eml | 91 --------------------------- gkrellm.spec | 23 +++---- gkrellmd.init | 1 + sources | 2 +- 9 files changed, 40 insertions(+), 182 deletions(-) delete mode 100644 gkrellm-2.2.9-libdir.patch delete mode 100644 gkrellm-2.3.1-leak-fix.patch delete mode 100644 gkrellm-openssl-license-exception.eml diff --git a/.cvsignore b/.cvsignore index 54176dd..7a5fb8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gkrellm-2.3.1.tar.bz2 +gkrellm-2.3.2.tar.bz2 diff --git a/gkrellm-2.1.28-config.patch b/gkrellm-2.1.28-config.patch index 13e0a05..eabd33a 100644 --- a/gkrellm-2.1.28-config.patch +++ b/gkrellm-2.1.28-config.patch @@ -1,7 +1,7 @@ -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 +diff -up gkrellm-2.3.2/server/gkrellmd.conf.config gkrellm-2.3.2/server/gkrellmd.conf +--- gkrellm-2.3.2/server/gkrellmd.conf.config 2008-10-04 03:40:30.000000000 +0200 ++++ gkrellm-2.3.2/server/gkrellmd.conf 2008-10-23 18:45:04.000000000 +0200 +@@ -22,26 +22,27 @@ 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. # @@ -14,6 +14,7 @@ diff -up gkrellm-2.3.0/server/gkrellmd.conf.config gkrellm-2.3.0/server/gkrellmd #allow-host 192.168.0.* # Drop privileges after startup (you must start gkrellmd as root to do it). + # NOTE: Option ignored on Windows # -#user nobody -#group proc @@ -21,16 +22,20 @@ diff -up gkrellm-2.3.0/server/gkrellmd.conf.config gkrellm-2.3.0/server/gkrellmd +group gkrellmd # Create a PID file for the running gkrellmd. Default is no PID file. + # NOTE: Option ignored on Windows + # -#pidfile /var/run/gkrellmd.pid +pidfile /var/run/gkrellmd.pid # Run in background and detach from the controlling terminal + # NOTE: Option ignored on Windows + # -#detach +detach - # Time interval between checks for various monitors. If nfs-interval - # is <= 0 then gkrellmd will not read data for nfs file system types. -@@ -61,7 +62,7 @@ port 19150 + # Enable writing logging message to the system syslog file + #syslog +@@ -74,7 +75,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. # @@ -39,7 +44,7 @@ diff -up gkrellm-2.3.0/server/gkrellmd.conf.config gkrellm-2.3.0/server/gkrellmd # Configure gkrellm clients to attempt automatic reconnects to a # gkrellmd server every reconnect-timeout seconds after a disconnected -@@ -70,7 +71,7 @@ port 19150 +@@ -83,7 +84,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. # diff --git a/gkrellm-2.2.9-libdir.patch b/gkrellm-2.2.9-libdir.patch deleted file mode 100644 index 81c5a75..0000000 --- a/gkrellm-2.2.9-libdir.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- gkrellm-2.2.9/server/gkrellmd.h.libdir 2006-05-15 14:32:02.000000000 +0200 -+++ gkrellm-2.2.9/server/gkrellmd.h 2006-05-15 14:35:02.000000000 +0200 -@@ -105,9 +105,16 @@ - #define GKRELLMD_CONFIG "gkrellmd.conf" - - #define GKRELLMD_PLUGINS_DIR ".gkrellm2/plugins-gkrellmd" --#define GKRELLMD_LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins-gkrellmd" -+ -+#if defined (__x86_64__) || defined (__s390x__) || defined (__ppc64__) || defined(__powerpc64__) -+#define LIBDIREXT "lib64" -+#else -+#define LIBDIREXT "lib" -+#endif -+ -+#define GKRELLMD_LOCAL_PLUGINS_DIR "/usr/local/"LIBDIREXT"/gkrellm2/plugins-gkrellmd" - #if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR) --#define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd" -+#define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/"LIBDIREXT"/gkrellm2/plugins-gkrellmd" - #endif - - #if !defined(WIN32) ---- gkrellm-2.2.9/src/gkrellm.h.libdir 2006-05-15 14:09:01.000000000 +0200 -+++ gkrellm-2.2.9/src/gkrellm.h 2006-05-15 14:36:39.000000000 +0200 -@@ -118,9 +118,16 @@ - #if !defined(SYSTEM_THEMES_DIR) - #define SYSTEM_THEMES_DIR "/usr/share/gkrellm2/themes" - #endif --#define LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins" -+ -+#if defined (__x86_64__) || defined (__s390x__) || defined (__ppc64__) || defined(__powerpc64__) -+#define LIBDIREXT "lib64" -+#else -+#define LIBDIREXT "lib" -+#endif -+ -+#define LOCAL_PLUGINS_DIR "/usr/local/"LIBDIREXT"/gkrellm2/plugins" - #if !defined(SYSTEM_PLUGINS_DIR) --#define SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins" -+#define SYSTEM_PLUGINS_DIR "/usr/"LIBDIREXT"/gkrellm2/plugins" - #endif - - #else diff --git a/gkrellm-2.3.1-leak-fix.patch b/gkrellm-2.3.1-leak-fix.patch deleted file mode 100644 index 36ebdf8..0000000 --- a/gkrellm-2.3.1-leak-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u /tmp/old-clock.c /net/home/danc/rpm/BUILD/gkrellm-2.3.1/src/clock.c ---- /src/clock.c 2008-09-25 20:03:55.000000000 -0400 -+++ /net/home/danc/rpm/BUILD/gkrellm-2.3.1/src/clock.c 2008-09-25 20:07:52.000000000 -0400 -@@ -396,6 +396,7 @@ - } - gkrellm_draw_decal_markup(pclock, d_clock, clock_string); - gkrellm_draw_panel_layers(pclock); -+ g_free(clock_string); - } - - - -Diff finished. Thu Sep 25 20:08:38 2008 diff --git a/gkrellm-2.3.1-netdb.patch b/gkrellm-2.3.1-netdb.patch index b5f4540..be65b1c 100644 --- a/gkrellm-2.3.1-netdb.patch +++ b/gkrellm-2.3.1-netdb.patch @@ -1,6 +1,7 @@ ---- gkrellm-2.3.1/src/client.c~ 2008-02-13 20:23:09.000000000 +0100 -+++ gkrellm-2.3.1/src/client.c 2008-02-13 20:23:09.000000000 +0100 -@@ -1606,7 +1607,7 @@ KeyTable update_table[] = +diff -up gkrellm-2.3.2/src/client.c.netdb gkrellm-2.3.2/src/client.c +--- gkrellm-2.3.2/src/client.c.netdb 2008-10-04 02:33:37.000000000 +0200 ++++ gkrellm-2.3.2/src/client.c 2008-10-23 18:48:02.000000000 +0200 +@@ -1620,7 +1620,7 @@ KeyTable update_table[] = static gint @@ -9,21 +10,21 @@ { fd_set read_fds; struct timeval tv; -@@ -1698,7 +1699,7 @@ read_server_setup(gint fd) +@@ -1714,7 +1714,7 @@ read_server_setup(gint fd) while (1) { -- getline(fd, buf, sizeof(buf)); -+ gkrellm_getline(fd, buf, sizeof(buf)); +- rs=getline(fd, buf, sizeof(buf)); ++ rs=gkrellm_getline(fd, buf, sizeof(buf)); + if(rs<0) + return FALSE; if (!strcmp(buf, "")) - break; - process_server_line(&setup_table[0], table_size, buf); -@@ -1714,7 +1715,7 @@ read_server_setup(gint fd) +@@ -1732,7 +1732,7 @@ read_server_setup(gint fd) table_size = sizeof(update_table) / sizeof(KeyTable); while (1) { -- getline(fd, buf, sizeof(buf)); -+ gkrellm_getline(fd, buf, sizeof(buf)); +- rs=getline(fd, buf, sizeof(buf)); ++ rs=gkrellm_getline(fd, buf, sizeof(buf)); + if(rs<0) + return FALSE; if (!strcmp(buf, "")) - break; - process_server_line(&update_table[0], table_size, buf); diff --git a/gkrellm-openssl-license-exception.eml b/gkrellm-openssl-license-exception.eml deleted file mode 100644 index 713bba6..0000000 --- a/gkrellm-openssl-license-exception.eml +++ /dev/null @@ -1,91 +0,0 @@ -Return-Path: -Received: from koko.hhs.nl ([145.52.2.16] verified) - by hhs.nl (CommuniGate Pro SMTP 4.3.6) - with ESMTP id 90744876 for j.w.r.degoede@hhs.nl; Tue, 09 Sep 2008 02:20:32 +0200 -Received: from exim (helo=koko) - by koko.hhs.nl with local-smtp (Exim 4.62) - (envelope-from ) - id 1Kcqy5-0006CE-C0 - for j.w.r.degoede@hhs.nl; Tue, 09 Sep 2008 02:20:29 +0200 -Received: from [194.171.167.218] (port=40317 helo=filter2-til.mf.surf.net) - by koko.hhs.nl with esmtp (Exim 4.62) - (envelope-from ) - id 1Kcqy5-0006C8-36 - for j.w.r.degoede@hhs.nl; Tue, 09 Sep 2008 02:20:29 +0200 -Received: from mail5.dslextreme.com (mail5.dslextreme.com [66.51.199.81]) - by filter2-til.mf.surf.net (8.13.8/8.13.8/Debian-3) with SMTP id m890KTBl001805 - for ; Tue, 9 Sep 2008 02:20:30 +0200 -Received: (qmail 10268 invoked from network); 9 Sep 2008 00:20:27 -0000 -Received: from unknown (HELO localhost) (billw@70.142.30.251) - by mail5.dslextreme.com with SMTP; Mon, 08 Sep 2008 17:20:27 -0700 -Date: Mon, 8 Sep 2008 19:20:26 -0500 -From: Bill Wilson -To: Hans de Goede -Subject: Re: gkrellm openssl license exception? -Message-Id: <20080908192026.d5aa51a5.billw@dslextreme.com> -In-Reply-To: <48B2F6B0.30505@hhs.nl> -References: <48B2F6B0.30505@hhs.nl> -X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i486-pc-linux-gnu) -Mime-Version: 1.0 -Content-Type: text/plain; charset=US-ASCII -Content-Transfer-Encoding: 7bit -X-Canit-CHI2: 0.00 -X-Bayes-Prob: 0.0001 (Score 0, tokens from: @@RPTN) -X-Spam-Score: 0.00 () [Tag at 8.00] -X-CanItPRO-Stream: hhs:j.w.r.degoede@hhs.nl (inherits from hhs:default,base:default) -X-Canit-Stats-ID: 110670270 - 6f51dcc34c3c -X-Scanned-By: CanIt (www . roaringpenguin . com) on 194.171.167.218 -X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 08092008 #1073355, status: clean - -On Mon, 25 Aug 2008 20:15:12 +0200 -Hans de Goede wrote: - -> Don't know if you remember me, we've had some contact in the past. I'm the -> Fedora gkrellm packahe maintainer, as well as the author of the lm_sensors-3.x -> support for gkrellm. - -Hi Hans, -Sure, I remember. - -> I recently got this bug reported against gkrellm: -> https://bugzilla.redhat.com/show_bug.cgi?id=446860 -> -> The problem is, or I believe it to be, that when an application uses -> libgnutls-openssl (such as gkrellm does) and then a library uses the real -> openssl (for example glibc through nss_ldap, see bug) then in the nss_ldap -> example, the later dlopen's nss_ldap starts using the openssl symbols from -> gnutls instead of those from openssl, but they are not ABI compatible -> boom. -> -> -> So I would like to build and distribute gkrellm against the real openssl. -> However as you probably know, according according to some the GPL and the -> openssl library are not compatible. This can be fixed by adding a special -> exception to the GPL such as the FSF for example has done for wget, quoting -> from the wget license: -> -> "In addition, as a special exception, the Free Software Foundation gives -> permission to link the code of its release of Wget with the OpenSSL project's -> "OpenSSL" library (or with modified versions of it that use the same license as -> the "OpenSSL" library), and distribute the linked executables. You must obey -> the GNU General Public License in all respects for all of the code used other -> than "OpenSSL". If you modify this file, you may extend this exception to your -> version of the file, but you are not obligated to do so. If you do not wish to -> do so, delete this exception statement from your version." -> -> This I wonder if you would be willing to add such an exception to the gkrellm -> license, fixing the openssl license issues. - -This is OK with me and I'll add a similar exception for linking OpenSSL to gkrellm -for the next release. - -If you want to do an OpenSSL linked against the current gkrellm 2.3.1 package -for Fedora in the meantime, you can consider this email permission to do so. - -Oh, and sorry for the delay in getting back to you. I've been doing a lot of -house remodeling lately :( - -Bill - --- -http://gkrellm.net - diff --git a/gkrellm.spec b/gkrellm.spec index 236ddb5..099e93f 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm -Version: 2.3.1 -Release: 6%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -9,13 +9,10 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers Source1: gkrellmd.init Source2: gkrellm.desktop Source3: gkrellm.png -Source4: gkrellm-openssl-license-exception.eml 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.3.1-netdb.patch -Patch6: gkrellm-2.3.1-leak-fix.patch +Patch4: gkrellm-2.3.1-netdb.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) @@ -63,10 +60,7 @@ Development files for the GNU Krell Monitors. %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width -%patch4 -p1 -z .libdir2 -%patch5 -p1 -z .netdb -%patch6 -p1 -z .leakfix -cp -a %{SOURCE4} . +%patch4 -p1 -z .netdb 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 @@ -80,8 +74,8 @@ done %build make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ - without-gnutls=1 + INCLUDEDIR=%{_includedir} \ + CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DSYSTEM_PLUGINS_DIR='\"%{_libdir}/gkrellm2/plugins\"'" %install @@ -153,7 +147,6 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYRIGHT Changelog README Themes.html -%doc gkrellm-openssl-license-exception.eml %{_bindir}/%{name} %{_libdir}/gkrellm2 %{_datadir}/gkrellm2 @@ -175,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 23 2008 Hans de Goede 2.3.2-1 +- New upstream release 2.3.2 +- Drop upstreamed memleak patch + * Thu Oct 2 2008 Hans de Goede 2.3.1-6 - Fix a small memory leak (which would accumulate over time) thanks to Daniel Colascione for the patch (rh 464040) diff --git a/gkrellmd.init b/gkrellmd.init index 051c140..409397c 100644 --- a/gkrellmd.init +++ b/gkrellmd.init @@ -13,6 +13,7 @@ # Should-Start: hddtemp # Should-Stop: hddtemp # Short-Description: GNU Krell Monitors Server +# Description: GNU Krell Monitors Server ### END INIT INFO # source function library diff --git a/sources b/sources index fa25ab1..67acb5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -009d8dddd3ce5cc83a4bb4d559ee922d gkrellm-2.3.1.tar.bz2 +d5543a439ee77950282d06b000048be7 gkrellm-2.3.2.tar.bz2 From b461d12ef155790bebecde5ac5460e379433c7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 16 Jan 2009 15:52:36 +0000 Subject: [PATCH 021/100] - rebuild with new openssl --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 099e93f..1ee64f7 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 16 2009 Tomas Mraz 2.3.2-2 +- rebuild with new openssl + * Thu Oct 23 2008 Hans de Goede 2.3.2-1 - New upstream release 2.3.2 - Drop upstreamed memleak patch From 4c1fbc672cf034e4ce395552eb995a466d8147e5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 21:45:02 +0000 Subject: [PATCH 022/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 1ee64f7..a1e9917 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 2.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 16 2009 Tomas Mraz 2.3.2-2 - rebuild with new openssl From de4203ae0a48ab1ed63ec9a035c07ec8e9d93b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 17 Mar 2009 21:02:37 +0000 Subject: [PATCH 023/100] - Sync icon cache update scriptlets with current Fedora guidelines. --- gkrellm.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index a1e9917..e2e3a79 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -107,17 +107,16 @@ install -p -m 644 %{SOURCE3} \ %post -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %pre daemon getent group gkrellmd >/dev/null || groupadd -r gkrellmd @@ -168,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 17 2009 Ville Skyttä - 2.3.2-4 +- Sync icon cache update scriptlets with current Fedora guidelines. + * Tue Feb 24 2009 Fedora Release Engineering - 2.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From a201bb410185e04631b5563dbe1a6551a9bc86a6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 00:14:17 +0000 Subject: [PATCH 024/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index e2e3a79..b773d82 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Mar 17 2009 Ville Skyttä - 2.3.2-4 - Sync icon cache update scriptlets with current Fedora guidelines. From 79dc551ee48179624b04c350f0f1f8d11ca9942f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 21 Aug 2009 13:31:37 +0000 Subject: [PATCH 025/100] - rebuilt with new openssl --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index b773d82..08ff822 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 21 2009 Tomas Mraz - 2.3.2-6 +- rebuilt with new openssl + * Fri Jul 24 2009 Fedora Release Engineering - 2.3.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 881678bf6534dfdb1636dbe8aab81c98cd816aa2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:27 +0000 Subject: [PATCH 026/100] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f602c5..847d3eb 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := gkrellm 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 3fd27a54e5dadcd9885cb31ee83f363c51a6753d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 27 Nov 2009 11:00:20 +0000 Subject: [PATCH 027/100] - Fix crash when using multiple simap/spop mailboxes (#541824) --- gkrellm-2.3.2-ssl-threadsafety.patch | 64 ++++++++++++++++++++++++++++ gkrellm.spec | 7 ++- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 gkrellm-2.3.2-ssl-threadsafety.patch diff --git a/gkrellm-2.3.2-ssl-threadsafety.patch b/gkrellm-2.3.2-ssl-threadsafety.patch new file mode 100644 index 0000000..293c8c7 --- /dev/null +++ b/gkrellm-2.3.2-ssl-threadsafety.patch @@ -0,0 +1,64 @@ +diff -up gkrellm-2.3.2/src/mail.c~ gkrellm-2.3.2/src/mail.c +--- gkrellm-2.3.2/src/mail.c~ 2008-10-04 02:33:37.000000000 +0200 ++++ gkrellm-2.3.2/src/mail.c 2009-11-27 11:50:31.000000000 +0100 +@@ -306,6 +306,21 @@ static gint anim_frame, + + static gint style_id; + ++#ifdef HAVE_SSL ++#ifndef HAVE_GNUTLS ++static GMutex **ssl_locks; ++ ++static void ++ssl_locking_cb(int mode, int n, const char *file, int line) ++ { ++ if (mode & CRYPTO_LOCK) ++ g_mutex_lock(ssl_locks[n]); ++ else ++ g_mutex_unlock(ssl_locks[n]); ++ } ++#endif ++#endif ++ + /* This may be called from gkrellm_sys_main_init() + */ + void +@@ -750,9 +765,6 @@ ssl_negotiate(ConnInfo *conn, Mailbox *m + { + SSL_METHOD *ssl_method; + +- SSLeay_add_ssl_algorithms(); +- SSL_load_error_strings(); +- + if (mbox->account->use_ssl == SSL_TRANSPORT) + ssl_method = SSLv23_client_method(); + else +@@ -4246,6 +4258,12 @@ static GkrellmMonitor monitor_mail = + GkrellmMonitor * + gkrellm_init_mail_monitor(void) + { ++#ifdef HAVE_SSL ++#ifndef HAVE_GNUTLS ++ int i, num_locks = CRYPTO_num_locks(); ++#endif ++#endif ++ + monitor_mail.name = _(monitor_mail.name); + enable_mail = TRUE; + show_tooltip = TRUE; +@@ -4266,6 +4284,15 @@ gkrellm_init_mail_monitor(void) + #ifdef HAVE_GNUTLS + gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); + gnutls_global_init(); ++#else ++#ifdef HAVE_SSL ++ SSL_load_error_strings(); ++ SSL_library_init(); ++ ssl_locks = g_new(GMutex *, num_locks); ++ for (i = 0; i < num_locks; i++) ++ ssl_locks[i] = g_mutex_new(); ++ CRYPTO_set_locking_callback(ssl_locking_cb); ++#endif + #endif + + mail_fetch = g_new0(Mailbox, 1); diff --git a/gkrellm.spec b/gkrellm.spec index 08ff822..645f999 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -13,6 +13,7 @@ Patch1: gkrellm-2.1.28-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch Patch4: gkrellm-2.3.1-netdb.patch +Patch5: gkrellm-2.3.2-ssl-threadsafety.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) @@ -61,6 +62,7 @@ Development files for the GNU Krell Monitors. %patch2 -p1 -z .sansfont %patch3 -p1 -z .width %patch4 -p1 -z .netdb +%patch5 -p1 -z .ssl 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 @@ -167,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 27 2009 Hans de Goede 2.3.2-7 +- Fix crash when using multiple simap/spop mailboxes (#541824) + * Fri Aug 21 2009 Tomas Mraz - 2.3.2-6 - rebuilt with new openssl From 5afd34be04a41056f1cdf782b85480e41a9254c5 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 20 Dec 2009 14:10:29 +0000 Subject: [PATCH 028/100] - Don't crash on laptops with dead batteries (#545987) - Don't crash with transparent themes (#549005) --- gkrellm-2.3.2-dead-bat-crash.patch | 13 +++++++++++++ gkrellm-2.3.2-transp-crash.patch | 21 +++++++++++++++++++++ gkrellm.spec | 10 +++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gkrellm-2.3.2-dead-bat-crash.patch create mode 100644 gkrellm-2.3.2-transp-crash.patch diff --git a/gkrellm-2.3.2-dead-bat-crash.patch b/gkrellm-2.3.2-dead-bat-crash.patch new file mode 100644 index 0000000..472e4ce --- /dev/null +++ b/gkrellm-2.3.2-dead-bat-crash.patch @@ -0,0 +1,13 @@ +diff -up gkrellm-2.3.2/src/sysdeps/linux.c~ gkrellm-2.3.2/src/sysdeps/linux.c +--- gkrellm-2.3.2/src/sysdeps/linux.c~ 2008-10-04 02:38:28.000000000 +0200 ++++ gkrellm-2.3.2/src/sysdeps/linux.c 2009-12-20 14:51:17.000000000 +0100 +@@ -1862,6 +1862,9 @@ sysfs_power_data (struct syspower *sp) + if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_full)) + { + charge_full = strtoll (buf, NULL, 0); ++ /* Check for broken batteries (avoids div by zero) */ ++ if (charge_full == 0) ++ return FALSE; + } + if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_now)) + { diff --git a/gkrellm-2.3.2-transp-crash.patch b/gkrellm-2.3.2-transp-crash.patch new file mode 100644 index 0000000..3f9be71 --- /dev/null +++ b/gkrellm-2.3.2-transp-crash.patch @@ -0,0 +1,21 @@ +diff -up gkrellm-2.3.2/src/winops-x11.c~ gkrellm-2.3.2/src/winops-x11.c +--- gkrellm-2.3.2/src/winops-x11.c~ 2008-10-04 02:35:53.000000000 +0200 ++++ gkrellm-2.3.2/src/winops-x11.c 2009-12-20 14:43:45.000000000 +0100 +@@ -538,7 +538,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans + GkrellmMargin *m; + gint x, y; + +- if ( root_xpixmap == None || !cp->transparency ++ if ( root_xpixmap == None || trans_gc == NULL || !cp->transparency + || !cp->drawing_area || !cp->drawing_area->window + ) + return FALSE; +@@ -605,7 +605,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans + Window child; + gint x, y; + +- if ( root_xpixmap == None || !p->transparency ++ if ( root_xpixmap == None || trans_gc == NULL || !p->transparency + || !p->drawing_area || !p->drawing_area->window + ) + return FALSE; diff --git a/gkrellm.spec b/gkrellm.spec index 645f999..e5e7abe 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -14,6 +14,8 @@ Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch Patch4: gkrellm-2.3.1-netdb.patch Patch5: gkrellm-2.3.2-ssl-threadsafety.patch +Patch6: gkrellm-2.3.2-dead-bat-crash.patch +Patch7: gkrellm-2.3.2-transp-crash.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) @@ -63,6 +65,8 @@ Development files for the GNU Krell Monitors. %patch3 -p1 -z .width %patch4 -p1 -z .netdb %patch5 -p1 -z .ssl +%patch6 -p1 +%patch7 -p1 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 @@ -169,6 +173,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 20 2009 Hans de Goede 2.3.2-8 +- Don't crash on laptops with dead batteries (#545987) +- Don't crash with transparent themes (#549005) + * Fri Nov 27 2009 Hans de Goede 2.3.2-7 - Fix crash when using multiple simap/spop mailboxes (#541824) From df15f6c0999dd06a09b26162d000768fa4d11738 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 22 Dec 2009 08:32:03 +0000 Subject: [PATCH 029/100] - New upstream release 2.3.3 - Fixes the gkrellm client crash when the gkrellm server reboots (#545327) - Drop a number of upstreamed patches --- .cvsignore | 2 +- gkrellm-2.3.1-netdb.patch | 30 ------------- gkrellm-2.3.2-dead-bat-crash.patch | 13 ------ gkrellm-2.3.2-ssl-threadsafety.patch | 64 ---------------------------- gkrellm.spec | 19 ++++----- sources | 2 +- 6 files changed, 11 insertions(+), 119 deletions(-) delete mode 100644 gkrellm-2.3.1-netdb.patch delete mode 100644 gkrellm-2.3.2-dead-bat-crash.patch delete mode 100644 gkrellm-2.3.2-ssl-threadsafety.patch diff --git a/.cvsignore b/.cvsignore index 7a5fb8c..645b2dc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gkrellm-2.3.2.tar.bz2 +gkrellm-2.3.3.tar.bz2 diff --git a/gkrellm-2.3.1-netdb.patch b/gkrellm-2.3.1-netdb.patch deleted file mode 100644 index be65b1c..0000000 --- a/gkrellm-2.3.1-netdb.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up gkrellm-2.3.2/src/client.c.netdb gkrellm-2.3.2/src/client.c ---- gkrellm-2.3.2/src/client.c.netdb 2008-10-04 02:33:37.000000000 +0200 -+++ gkrellm-2.3.2/src/client.c 2008-10-23 18:48:02.000000000 +0200 -@@ -1620,7 +1620,7 @@ KeyTable update_table[] = - - - static gint --getline(gint fd, gchar *buf, gint len) -+gkrellm_getline(gint fd, gchar *buf, gint len) - { - fd_set read_fds; - struct timeval tv; -@@ -1714,7 +1714,7 @@ read_server_setup(gint fd) - - while (1) - { -- rs=getline(fd, buf, sizeof(buf)); -+ rs=gkrellm_getline(fd, buf, sizeof(buf)); - if(rs<0) - return FALSE; - if (!strcmp(buf, "")) -@@ -1732,7 +1732,7 @@ read_server_setup(gint fd) - table_size = sizeof(update_table) / sizeof(KeyTable); - while (1) - { -- rs=getline(fd, buf, sizeof(buf)); -+ rs=gkrellm_getline(fd, buf, sizeof(buf)); - if(rs<0) - return FALSE; - if (!strcmp(buf, "")) diff --git a/gkrellm-2.3.2-dead-bat-crash.patch b/gkrellm-2.3.2-dead-bat-crash.patch deleted file mode 100644 index 472e4ce..0000000 --- a/gkrellm-2.3.2-dead-bat-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up gkrellm-2.3.2/src/sysdeps/linux.c~ gkrellm-2.3.2/src/sysdeps/linux.c ---- gkrellm-2.3.2/src/sysdeps/linux.c~ 2008-10-04 02:38:28.000000000 +0200 -+++ gkrellm-2.3.2/src/sysdeps/linux.c 2009-12-20 14:51:17.000000000 +0100 -@@ -1862,6 +1862,9 @@ sysfs_power_data (struct syspower *sp) - if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_full)) - { - charge_full = strtoll (buf, NULL, 0); -+ /* Check for broken batteries (avoids div by zero) */ -+ if (charge_full == 0) -+ return FALSE; - } - if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_now)) - { diff --git a/gkrellm-2.3.2-ssl-threadsafety.patch b/gkrellm-2.3.2-ssl-threadsafety.patch deleted file mode 100644 index 293c8c7..0000000 --- a/gkrellm-2.3.2-ssl-threadsafety.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up gkrellm-2.3.2/src/mail.c~ gkrellm-2.3.2/src/mail.c ---- gkrellm-2.3.2/src/mail.c~ 2008-10-04 02:33:37.000000000 +0200 -+++ gkrellm-2.3.2/src/mail.c 2009-11-27 11:50:31.000000000 +0100 -@@ -306,6 +306,21 @@ static gint anim_frame, - - static gint style_id; - -+#ifdef HAVE_SSL -+#ifndef HAVE_GNUTLS -+static GMutex **ssl_locks; -+ -+static void -+ssl_locking_cb(int mode, int n, const char *file, int line) -+ { -+ if (mode & CRYPTO_LOCK) -+ g_mutex_lock(ssl_locks[n]); -+ else -+ g_mutex_unlock(ssl_locks[n]); -+ } -+#endif -+#endif -+ - /* This may be called from gkrellm_sys_main_init() - */ - void -@@ -750,9 +765,6 @@ ssl_negotiate(ConnInfo *conn, Mailbox *m - { - SSL_METHOD *ssl_method; - -- SSLeay_add_ssl_algorithms(); -- SSL_load_error_strings(); -- - if (mbox->account->use_ssl == SSL_TRANSPORT) - ssl_method = SSLv23_client_method(); - else -@@ -4246,6 +4258,12 @@ static GkrellmMonitor monitor_mail = - GkrellmMonitor * - gkrellm_init_mail_monitor(void) - { -+#ifdef HAVE_SSL -+#ifndef HAVE_GNUTLS -+ int i, num_locks = CRYPTO_num_locks(); -+#endif -+#endif -+ - monitor_mail.name = _(monitor_mail.name); - enable_mail = TRUE; - show_tooltip = TRUE; -@@ -4266,6 +4284,15 @@ gkrellm_init_mail_monitor(void) - #ifdef HAVE_GNUTLS - gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); - gnutls_global_init(); -+#else -+#ifdef HAVE_SSL -+ SSL_load_error_strings(); -+ SSL_library_init(); -+ ssl_locks = g_new(GMutex *, num_locks); -+ for (i = 0; i < num_locks; i++) -+ ssl_locks[i] = g_mutex_new(); -+ CRYPTO_set_locking_callback(ssl_locking_cb); -+#endif - #endif - - mail_fetch = g_new0(Mailbox, 1); diff --git a/gkrellm.spec b/gkrellm.spec index e5e7abe..28f99dd 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm -Version: 2.3.2 -Release: 8%{?dist} +Version: 2.3.3 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -12,10 +12,7 @@ Source3: gkrellm.png Patch1: gkrellm-2.1.28-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch -Patch4: gkrellm-2.3.1-netdb.patch -Patch5: gkrellm-2.3.2-ssl-threadsafety.patch -Patch6: gkrellm-2.3.2-dead-bat-crash.patch -Patch7: gkrellm-2.3.2-transp-crash.patch +Patch4: gkrellm-2.3.2-transp-crash.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) @@ -63,10 +60,7 @@ Development files for the GNU Krell Monitors. %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width -%patch4 -p1 -z .netdb -%patch5 -p1 -z .ssl -%patch6 -p1 -%patch7 -p1 +%patch4 -p1 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,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 22 2009 Hans de Goede 2.3.3-1 +- New upstream release 2.3.3 +- Fixes the gkrellm client crash when the gkrellm server reboots (#545327) +- Drop a number of upstreamed patches + * Sun Dec 20 2009 Hans de Goede 2.3.2-8 - Don't crash on laptops with dead batteries (#545987) - Don't crash with transparent themes (#549005) diff --git a/sources b/sources index 67acb5b..87eb7d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5543a439ee77950282d06b000048be7 gkrellm-2.3.2.tar.bz2 +74c5252952c08a9866a6d381b7fd7454 gkrellm-2.3.3.tar.bz2 From 990543952d42d403ceb73612c436309a27fdee6f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 5 Jan 2010 12:39:28 +0000 Subject: [PATCH 030/100] - New upstream release 2.3.4 --- .cvsignore | 2 +- gkrellm-2.3.2-transp-crash.patch | 21 --------------------- gkrellm.spec | 7 ++++--- sources | 2 +- 4 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 gkrellm-2.3.2-transp-crash.patch diff --git a/.cvsignore b/.cvsignore index 645b2dc..a2162b3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gkrellm-2.3.3.tar.bz2 +gkrellm-2.3.4.tar.bz2 diff --git a/gkrellm-2.3.2-transp-crash.patch b/gkrellm-2.3.2-transp-crash.patch deleted file mode 100644 index 3f9be71..0000000 --- a/gkrellm-2.3.2-transp-crash.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up gkrellm-2.3.2/src/winops-x11.c~ gkrellm-2.3.2/src/winops-x11.c ---- gkrellm-2.3.2/src/winops-x11.c~ 2008-10-04 02:35:53.000000000 +0200 -+++ gkrellm-2.3.2/src/winops-x11.c 2009-12-20 14:43:45.000000000 +0100 -@@ -538,7 +538,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans - GkrellmMargin *m; - gint x, y; - -- if ( root_xpixmap == None || !cp->transparency -+ if ( root_xpixmap == None || trans_gc == NULL || !cp->transparency - || !cp->drawing_area || !cp->drawing_area->window - ) - return FALSE; -@@ -605,7 +605,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans - Window child; - gint x, y; - -- if ( root_xpixmap == None || !p->transparency -+ if ( root_xpixmap == None || trans_gc == NULL || !p->transparency - || !p->drawing_area || !p->drawing_area->window - ) - return FALSE; diff --git a/gkrellm.spec b/gkrellm.spec index 28f99dd..177a603 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,5 +1,5 @@ Name: gkrellm -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System @@ -12,7 +12,6 @@ Source3: gkrellm.png Patch1: gkrellm-2.1.28-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch -Patch4: gkrellm-2.3.2-transp-crash.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,7 +59,6 @@ Development files for the GNU Krell Monitors. %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width -%patch4 -p1 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 @@ -167,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 5 2010 Hans de Goede 2.3.4-1 +- New upstream release 2.3.4 + * Tue Dec 22 2009 Hans de Goede 2.3.3-1 - New upstream release 2.3.3 - Fixes the gkrellm client crash when the gkrellm server reboots (#545327) diff --git a/sources b/sources index 87eb7d7..ac2b22e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74c5252952c08a9866a6d381b7fd7454 gkrellm-2.3.3.tar.bz2 +270917784da6bf1292aba0c82af726d6 gkrellm-2.3.4.tar.bz2 From 29f163d1d889b2ace3afc7e27d8babf6c8705502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 14 Feb 2010 21:58:10 +0000 Subject: [PATCH 031/100] - Fix build with --no-add-needed (#564850). - Fix plugin dir defaults in installed headers. - Build with NTLM support. --- gkrellm-2.3.4-no-add-needed.patch | 12 +++++++++++ gkrellm.spec | 36 +++++++++++++++++-------------- 2 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 gkrellm-2.3.4-no-add-needed.patch diff --git a/gkrellm-2.3.4-no-add-needed.patch b/gkrellm-2.3.4-no-add-needed.patch new file mode 100644 index 0000000..9969934 --- /dev/null +++ b/gkrellm-2.3.4-no-add-needed.patch @@ -0,0 +1,12 @@ +diff -up gkrellm-2.3.4/src/Makefile~ gkrellm-2.3.4/src/Makefile +--- gkrellm-2.3.4/src/Makefile~ 2010-01-05 01:12:07.000000000 +0200 ++++ gkrellm-2.3.4/src/Makefile 2010-02-13 18:10:45.000000000 +0200 +@@ -91,7 +91,7 @@ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_ + ${NTLM_INCLUDES} -DGKRELLM_CLIENT + + LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS) \ +- $(NTLM_LIBS) $(X11_LIBS) ++ $(NTLM_LIBS) $(X11_LIBS) -lm + + ifeq ($(debug),1) + FLAGS += -g diff --git a/gkrellm.spec b/gkrellm.spec index 177a603..629aa1d 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -9,11 +9,13 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers Source1: gkrellmd.init Source2: gkrellm.desktop Source3: gkrellm.png +# Sent upstream 2010-02-14 +Patch0: gkrellm-2.3.4-no-add-needed.patch Patch1: gkrellm-2.1.28-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext -BuildRequires: lm_sensors-devel +BuildRequires: lm_sensors-devel libntlm-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -56,24 +58,21 @@ Development files for the GNU Krell Monitors. %prep %setup -q +%patch0 -p1 -z .no-add-needed %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width -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 - sed -i -e "s@/usr/lib/gkrellm/plugins@%{_libdir}/gkrellm2/plugins@" $i -done -for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do - sed -i -e "s@/usr/local/lib/gkrellm2/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i - sed -i -e "s@/usr/local/lib/gkrellm/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i +for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html \ + src/gkrellm.h server/gkrellmd.h; do + sed -i -e "s@/usr/lib/gkrellm2*/plugins@%{_libdir}/gkrellm2/plugins@" $i + sed -i -e "s@/usr/local/lib/gkrellm2*/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i done %build make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} \ - CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DSYSTEM_PLUGINS_DIR='\"%{_libdir}/gkrellm2/plugins\"'" + INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install @@ -165,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 14 2010 Ville Skyttä - 2.3.4-2 +- Fix build with --no-add-needed (#564850). +- Fix plugin dir defaults in installed headers. +- Build with NTLM support. + * Tue Jan 5 2010 Hans de Goede 2.3.4-1 - New upstream release 2.3.4 @@ -186,7 +190,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Jul 24 2009 Fedora Release Engineering - 2.3.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Tue Mar 17 2009 Ville Skyttä - 2.3.2-4 +* Tue Mar 17 2009 Ville Skyttä - 2.3.2-4 - Sync icon cache update scriptlets with current Fedora guidelines. * Tue Feb 24 2009 Fedora Release Engineering - 2.3.2-3 @@ -214,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT - Fix building with latest glibc - Rebuild for gcc 4.3 -* Tue Dec 4 2007 Ville Skyttä - 2.3.1-2 +* Tue Dec 4 2007 Ville Skyttä - 2.3.1-2 - Clean up desktop-file-utils 0.14 warnings. * Mon Dec 3 2007 Hans de Goede 2.3.1-1 @@ -224,11 +228,11 @@ rm -rf $RPM_BUILD_ROOT * Wed Oct 24 2007 Hans de Goede 2.3.0-5 - Add support for lm_sensors-3.0.0 -* Wed Sep 5 2007 Ville Skyttä - 2.3.0-4 +* Wed Sep 5 2007 Ville Skyttä - 2.3.0-4 - Rewrite gkrellmd init script: better LSB compliance, hddtemp interoperability, avoidance of X error messages, general cleanup. -* Tue Sep 4 2007 Ville Skyttä - 2.3.0-3 +* Tue Sep 4 2007 Ville Skyttä - 2.3.0-3 - Fix gnutls detection/build and use it instead of openssl. - Sync user and group creation with current Fedora guidelines. @@ -409,7 +413,7 @@ rm -rf $RPM_BUILD_ROOT - make it compatible with 3d party packages * Thu Oct 09 2003 Karsten Hopp 2.1.20-2 -- added patches from Ville Skyttä : +- added patches from Ville Skyttä : - Add icon for desktop entry - Install daemon in %%{_sbindir} - Include themes and plugins dirs in main package From fa47f72978977697e862bd20828bb08c94ad9b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 20 Jun 2010 21:37:39 +0000 Subject: [PATCH 032/100] - Make -devel gtk2-devel dependency ISA qualified. --- gkrellm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 629aa1d..185b714 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -50,7 +50,7 @@ data from the server. %package devel Summary: Development files for the GNU Krell Monitors Group: Development/System -Requires: gtk2-devel +Requires: gtk2-devel%{?_isa} %description devel Development files for the GNU Krell Monitors. @@ -164,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 21 2010 Ville Skyttä - 2.3.4-3 +- Make -devel gtk2-devel dependency ISA qualified. + * Sun Feb 14 2010 Ville Skyttä - 2.3.4-2 - Fix build with --no-add-needed (#564850). - Fix plugin dir defaults in installed headers. From d18c4e04c413fcf749b83c9e82296c4ac9e3c209 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:42:47 +0000 Subject: [PATCH 033/100] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 847d3eb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: gkrellm -# $Id$ -NAME := gkrellm -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 $$d/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) From d740d6141f264f015caa47ff1c2b51e45e24f2b8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2010 10:04:09 +0200 Subject: [PATCH 034/100] - New upstream release 2.3.5 --- .gitignore | 1 + gkrellm-2.1.28-config.patch | 14 +++++++------- gkrellm-2.3.4-no-add-needed.patch | 12 ------------ gkrellm.spec | 10 +++++----- sources | 2 +- 5 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 gkrellm-2.3.4-no-add-needed.patch diff --git a/.gitignore b/.gitignore index a2162b3..3fffe3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ gkrellm-2.3.4.tar.bz2 +/gkrellm-2.3.5.tar.bz2 diff --git a/gkrellm-2.1.28-config.patch b/gkrellm-2.1.28-config.patch index eabd33a..b774d5d 100644 --- a/gkrellm-2.1.28-config.patch +++ b/gkrellm-2.1.28-config.patch @@ -1,7 +1,7 @@ -diff -up gkrellm-2.3.2/server/gkrellmd.conf.config gkrellm-2.3.2/server/gkrellmd.conf ---- gkrellm-2.3.2/server/gkrellmd.conf.config 2008-10-04 03:40:30.000000000 +0200 -+++ gkrellm-2.3.2/server/gkrellmd.conf 2008-10-23 18:45:04.000000000 +0200 -@@ -22,26 +22,27 @@ port 19150 +diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd.conf +--- gkrellm-2.3.5/server/gkrellmd.conf.config 2010-09-14 16:26:19.000000000 +0200 ++++ gkrellm-2.3.5/server/gkrellmd.conf 2010-10-10 09:08:05.110736001 +0200 +@@ -22,26 +22,27 @@ # 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. # @@ -34,8 +34,8 @@ diff -up gkrellm-2.3.2/server/gkrellmd.conf.config gkrellm-2.3.2/server/gkrellmd +detach # Enable writing logging message to the system syslog file - #syslog -@@ -74,7 +75,7 @@ port 19150 + # NOTE: On windows this enables logging to the windows event log +@@ -76,7 +77,7 @@ # 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. # @@ -44,7 +44,7 @@ diff -up gkrellm-2.3.2/server/gkrellmd.conf.config gkrellm-2.3.2/server/gkrellmd # Configure gkrellm clients to attempt automatic reconnects to a # gkrellmd server every reconnect-timeout seconds after a disconnected -@@ -83,7 +84,7 @@ port 19150 +@@ -85,7 +86,7 @@ # 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. # diff --git a/gkrellm-2.3.4-no-add-needed.patch b/gkrellm-2.3.4-no-add-needed.patch deleted file mode 100644 index 9969934..0000000 --- a/gkrellm-2.3.4-no-add-needed.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gkrellm-2.3.4/src/Makefile~ gkrellm-2.3.4/src/Makefile ---- gkrellm-2.3.4/src/Makefile~ 2010-01-05 01:12:07.000000000 +0200 -+++ gkrellm-2.3.4/src/Makefile 2010-02-13 18:10:45.000000000 +0200 -@@ -91,7 +91,7 @@ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_ - ${NTLM_INCLUDES} -DGKRELLM_CLIENT - - LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS) \ -- $(NTLM_LIBS) $(X11_LIBS) -+ $(NTLM_LIBS) $(X11_LIBS) -lm - - ifeq ($(debug),1) - FLAGS += -g diff --git a/gkrellm.spec b/gkrellm.spec index 185b714..ed8c166 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm -Version: 2.3.4 -Release: 3%{?dist} +Version: 2.3.5 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -9,8 +9,6 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers Source1: gkrellmd.init Source2: gkrellm.desktop Source3: gkrellm.png -# Sent upstream 2010-02-14 -Patch0: gkrellm-2.3.4-no-add-needed.patch Patch1: gkrellm-2.1.28-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch @@ -58,7 +56,6 @@ Development files for the GNU Krell Monitors. %prep %setup -q -%patch0 -p1 -z .no-add-needed %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width @@ -164,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 10 2010 Hans de Goede 2.3.5-1 +- New upstream release 2.3.5 + * Mon Jun 21 2010 Ville Skyttä - 2.3.4-3 - Make -devel gtk2-devel dependency ISA qualified. diff --git a/sources b/sources index ac2b22e..1d14148 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -270917784da6bf1292aba0c82af726d6 gkrellm-2.3.4.tar.bz2 +e43a9416a6975e3be63d591bdeb33b04 gkrellm-2.3.5.tar.bz2 From d8343e52ca6937f6a8cd54aa348a70792c3ce983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 Oct 2010 15:23:17 +0300 Subject: [PATCH 035/100] Add StartupNotify and StartupWMClass to gkrellm.desktop. http://lists.fedoraproject.org/pipermail/devel/2010-March/133523.html --- gkrellm.desktop | 2 ++ gkrellm.spec | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gkrellm.desktop b/gkrellm.desktop index 9464db1..a854538 100644 --- a/gkrellm.desktop +++ b/gkrellm.desktop @@ -6,3 +6,5 @@ Icon=gkrellm Terminal=false Type=Application Categories=System; +StartupNotify=true +StartupWMClass=gkrellm diff --git a/gkrellm.spec b/gkrellm.spec index ed8c166..f1dd4aa 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -161,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 24 2010 Ville Skyttä - 2.3.5-2 +- Add StartupNotify and StartupWMClass to gkrellm.desktop. + * Sun Oct 10 2010 Hans de Goede 2.3.5-1 - New upstream release 2.3.5 From 211335acf0fb89b13c380ccd8a4183444caa6968 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 16 Nov 2010 22:15:43 +0100 Subject: [PATCH 036/100] - Add COPYRIGHT file to -devel and -daemon sub-packages --- gkrellm.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index f1dd4aa..69a9f71 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -149,11 +149,13 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) +%doc COPYRIGHT %{_includedir}/gkrellm2 %{_libdir}/pkgconfig/%{name}.pc %files daemon %defattr(-,root,root,-) +%doc COPYRIGHT %{_initrddir}/gkrellmd %{_sbindir}/gkrellmd %{_mandir}/man1/gkrellmd.* @@ -161,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 16 2010 Hans de Goede - 2.3.5-3 +- Add COPYRIGHT file to -devel and -daemon sub-packages + * Sun Oct 24 2010 Ville Skyttä - 2.3.5-2 - Add StartupNotify and StartupWMClass to gkrellm.desktop. From 5beefb0c34aa46cce6d22f5febe2e4e732c68b2c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 20:10:12 -0600 Subject: [PATCH 037/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 69a9f71..8f43737 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ @@ -163,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Nov 16 2010 Hans de Goede - 2.3.5-3 - Add COPYRIGHT file to -devel and -daemon sub-packages From c7ec836d254b70e3339dfefc31d874208f7f6fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 29 Jul 2011 23:39:51 +0300 Subject: [PATCH 038/100] Migrate daemon to systemd (#661656). Do icon dir timestamp update in %post with lua. --- ...config.patch => gkrellm-2.3.5-config.patch | 18 +---- gkrellm.spec | 57 ++++++++------ gkrellmd.init | 76 ------------------- gkrellmd.service | 9 +++ 4 files changed, 46 insertions(+), 114 deletions(-) rename gkrellm-2.1.28-config.patch => gkrellm-2.3.5-config.patch (73%) delete mode 100644 gkrellmd.init create mode 100644 gkrellmd.service diff --git a/gkrellm-2.1.28-config.patch b/gkrellm-2.3.5-config.patch similarity index 73% rename from gkrellm-2.1.28-config.patch rename to gkrellm-2.3.5-config.patch index b774d5d..c623059 100644 --- a/gkrellm-2.1.28-config.patch +++ b/gkrellm-2.3.5-config.patch @@ -1,7 +1,7 @@ diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd.conf ---- gkrellm-2.3.5/server/gkrellmd.conf.config 2010-09-14 16:26:19.000000000 +0200 -+++ gkrellm-2.3.5/server/gkrellmd.conf 2010-10-10 09:08:05.110736001 +0200 -@@ -22,26 +22,27 @@ +--- gkrellm-2.3.5/server/gkrellmd.conf.config 2010-09-14 17:26:19.000000000 +0300 ++++ gkrellm-2.3.5/server/gkrellmd.conf 2011-06-19 19:17:56.398591498 +0300 +@@ -22,16 +22,17 @@ # 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. # @@ -23,18 +23,6 @@ diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd # Create a PID file for the running gkrellmd. Default is no PID file. # NOTE: Option ignored on Windows - # --#pidfile /var/run/gkrellmd.pid -+pidfile /var/run/gkrellmd.pid - - # Run in background and detach from the controlling terminal - # NOTE: Option ignored on Windows - # --#detach -+detach - - # Enable writing logging message to the system syslog file - # NOTE: On windows this enables logging to the windows event log @@ -76,7 +77,7 @@ # 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. diff --git a/gkrellm.spec b/gkrellm.spec index 8f43737..4f8eaf6 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,19 +1,21 @@ Name: gkrellm Version: 2.3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPLv3+ URL: http://www.gkrellm.net/ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.bz2 -Source1: gkrellmd.init +Source1: gkrellmd.service Source2: gkrellm.desktop Source3: gkrellm.png -Patch1: gkrellm-2.1.28-config.patch +# The next time gkrellmd.conf changes after 2.3.5-5, remember to set it +# config(noreplace) again. +Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext -BuildRequires: lm_sensors-devel libntlm-devel +BuildRequires: lm_sensors-devel libntlm-devel systemd-units BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -33,11 +35,10 @@ Additional features are: %package daemon Summary: The GNU Krell Monitors Server Group: System Environment/Daemons -Requires(pre): shadow-utils -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service +Requires(pre): shadow-utils systemd-sysv chkconfig +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units %description daemon gkrellmd listens for connections from gkrellm clients. When a gkrellm @@ -74,7 +75,6 @@ make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/gkrellm2/themes mkdir -p $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins @@ -86,8 +86,9 @@ make install \ PKGCONFIGDIR=$RPM_BUILD_ROOT%{_libdir}/pkgconfig \ INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} \ STRIP="" -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/gkrellmd -install -m 644 server/gkrellmd.conf $RPM_BUILD_ROOT%{_sysconfdir}/gkrellmd.conf +install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/gkrellmd.service +install -Dpm 644 server/gkrellmd.conf \ + $RPM_BUILD_ROOT%{_sysconfdir}/gkrellmd.conf %find_lang %name # below is the desktop file and icon stuff. @@ -100,8 +101,8 @@ install -p -m 644 %{SOURCE3} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +%post -p +posix.utime("%{_datadir}/icons/hicolor") %postun if [ $1 -eq 0 ] ; then @@ -116,21 +117,25 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/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 +if [ $1 -gt 1 ] && [ ! -e %{_unitdir}/gkrellmd.service ] && \ + [ -e %{_initddir}/gkrellmd ] ; then + systemd-sysv-convert --save gkrellmd &>/dev/null + chkconfig --del gkrellmd &>/dev/null +fi : %post daemon -/sbin/chkconfig --add gkrellmd || : +systemctl daemon-reload &>/dev/null || : %preun daemon -if [ "$1" = "0" ]; then - /sbin/service gkrellmd stop > /dev/null 2>&1 || : - /sbin/chkconfig --del gkrellmd || : +if [ $1 -eq 0 ] ; then + systemctl --no-reload disable gkrellmd.service &>/dev/null + systemctl stop gkrellmd.service &>/dev/null || : fi %postun daemon -if [ "$1" -ge "1" ]; then - /sbin/service gkrellmd condrestart > /dev/null 2>&1 || : -fi +systemctl daemon-reload &>/dev/null +[ $1 -gt 0 ] && systemctl try-restart gkrellmd.service &>/dev/null || : %clean @@ -156,13 +161,19 @@ rm -rf $RPM_BUILD_ROOT %files daemon %defattr(-,root,root,-) %doc COPYRIGHT -%{_initrddir}/gkrellmd +%{_unitdir}/gkrellmd.service %{_sbindir}/gkrellmd %{_mandir}/man1/gkrellmd.* -%config(noreplace) %{_sysconfdir}/gkrellmd.conf +# Temporarily not noreplace so systemd related changes take effect. +# See comments next to the config PatchX: above. +%config %{_sysconfdir}/gkrellmd.conf %changelog +* Mon Jun 20 2011 Ville Skyttä - 2.3.5-5 +- Migrate daemon to systemd (#661656). +- Do icon dir timestamp update in %%post with lua. + * Tue Feb 08 2011 Fedora Release Engineering - 2.3.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/gkrellmd.init b/gkrellmd.init deleted file mode 100644 index 409397c..0000000 --- a/gkrellmd.init +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 85 15 -# description: GNU Krell Monitors Server -# -# processname: gkrellmd -# config: /etc/gkrellmd.conf - -### BEGIN INIT INFO -# Provides: gkrellmd -# Required-Start: $network -# Required-Stop: $network -# Should-Start: hddtemp -# Should-Stop: hddtemp -# Short-Description: GNU Krell Monitors Server -# Description: GNU Krell Monitors Server -### END INIT INFO - -# source function library -. /etc/rc.d/init.d/functions - -exec=/usr/sbin/gkrellmd -prog=${exec##*/} -lockfile=/var/lock/subsys/$prog - -start() { - if [ -f /etc/gkrellmd.conf ] ; then - echo -n $"Starting GNU Krell Monitors server ($prog): " - DISPLAY= daemon --user gkrellmd $exec -d - rv=$? - echo - else - action $"Unconfigured: $prog, /etc/gkrellmd.conf not found" /bin/false - rv=6 - fi - [ $rv -eq 0 ] && touch $lockfile - return $rv -} - -stop() { - echo -n $"Stopping GNU Krell Monitors server ($prog): " - killproc $prog - rv=$? - [ $rv -eq 0 ] && rm -f $lockfile - echo - return $rv -} - -restart() { - stop - start -} - -case "$1" in - start|stop|restart) - $1 - ;; - force-reload) - restart - ;; - status) - status $prog - ;; - try-restart|condrestart) - if status $prog >/dev/null ; then - restart - fi - ;; - reload) - action $"Service $prog does not support the reload action: " /bin/false - exit 3 - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}" - exit 2 -esac diff --git a/gkrellmd.service b/gkrellmd.service new file mode 100644 index 0000000..469e010 --- /dev/null +++ b/gkrellmd.service @@ -0,0 +1,9 @@ +[Unit] +Description=GNU Krell Monitors server +After=network.target syslog.target hddtemp.service + +[Service] +ExecStart=/usr/sbin/gkrellmd + +[Install] +WantedBy=multi-user.target From e3069d09aa18a5bcafc04f7ae02753047d97e0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 13 Nov 2011 22:24:49 +0200 Subject: [PATCH 039/100] Build with $RPM_LD_FLAGS. Clean up specfile stuff no longer needed with Fedora or EL6+. --- gkrellm.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 4f8eaf6..2c70229 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,8 +1,7 @@ Name: gkrellm Version: 2.3.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiple stacked system monitors in one process -Group: Applications/System License: GPLv3+ URL: http://www.gkrellm.net/ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.bz2 @@ -16,7 +15,6 @@ Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel libntlm-devel systemd-units -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description GKrellM charts CPU, load, Disk, and all active net interfaces @@ -70,11 +68,11 @@ done %build make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" + INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ + LDFLAGS="$RPM_LD_FLAGS" %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/gkrellm2/themes mkdir -p $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins @@ -138,12 +136,7 @@ systemctl daemon-reload &>/dev/null [ $1 -gt 0 ] && systemctl try-restart gkrellmd.service &>/dev/null || : -%clean -rm -rf $RPM_BUILD_ROOT - - %files -f %{name}.lang -%defattr(-,root,root,-) %doc COPYRIGHT Changelog README Themes.html %{_bindir}/%{name} %{_libdir}/gkrellm2 @@ -153,13 +146,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %files devel -%defattr(-,root,root,-) %doc COPYRIGHT %{_includedir}/gkrellm2 %{_libdir}/pkgconfig/%{name}.pc %files daemon -%defattr(-,root,root,-) %doc COPYRIGHT %{_unitdir}/gkrellmd.service %{_sbindir}/gkrellmd @@ -170,6 +161,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 13 2011 Ville Skyttä - 2.3.5-6 +- Build with $RPM_LD_FLAGS. +- Clean up specfile stuff no longer needed with Fedora or EL6+. + * Mon Jun 20 2011 Ville Skyttä - 2.3.5-5 - Migrate daemon to systemd (#661656). - Do icon dir timestamp update in %%post with lua. From 6e48d3e943160d45e71e68d8b63aa2d7c34afdbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 13 Nov 2011 23:36:47 +0200 Subject: [PATCH 040/100] Drop Group from -daemon and -devel too. --- gkrellm.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 2c70229..fe37d54 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -32,7 +32,6 @@ Additional features are: %package daemon Summary: The GNU Krell Monitors Server -Group: System Environment/Daemons Requires(pre): shadow-utils systemd-sysv chkconfig Requires(post): systemd-units Requires(preun): systemd-units @@ -46,7 +45,6 @@ data from the server. %package devel Summary: Development files for the GNU Krell Monitors -Group: Development/System Requires: gtk2-devel%{?_isa} %description devel @@ -161,7 +159,7 @@ systemctl daemon-reload &>/dev/null %changelog -* Sun Nov 13 2011 Ville Skyttä - 2.3.5-6 +* Sun Nov 13 2011 Ville Skyttä - 2.3.5-7 - Build with $RPM_LD_FLAGS. - Clean up specfile stuff no longer needed with Fedora or EL6+. From cf68f0df461ed2e45291d46ae6b78727aeb3ff17 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 21:33:09 -0600 Subject: [PATCH 041/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index fe37d54..0595aae 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -159,6 +159,9 @@ systemctl daemon-reload &>/dev/null %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 2.3.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Nov 13 2011 Ville Skyttä - 2.3.5-7 - Build with $RPM_LD_FLAGS. - Clean up specfile stuff no longer needed with Fedora or EL6+. From ffa04ca4b580a574a727e586ae696ae797fefd0e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 15 Jan 2012 19:31:41 +0100 Subject: [PATCH 042/100] Explicitly link against gmodule-2.0 to fix building with latest glib --- gkrellm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 0595aae..752a12b 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.3.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -67,7 +67,7 @@ done %build make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ - LDFLAGS="$RPM_LD_FLAGS" + LDFLAGS="$(pkg-config --libs gmodule-2.0) $RPM_LD_FLAGS" %install @@ -159,6 +159,9 @@ systemctl daemon-reload &>/dev/null %changelog +* Sun Jan 15 2012 Hans de Goede - 2.3.5-8 +- Explicitly link against gmodule-2.0 to fix building with latest glib + * Fri Jan 13 2012 Fedora Release Engineering - 2.3.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 2459ac04b46572b219d6e729b7ed636a0da76f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 23 Apr 2012 22:53:43 +0300 Subject: [PATCH 043/100] Build with hardening flags on. --- gkrellm.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 752a12b..dc1bfd5 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,6 +1,8 @@ +%global _hardened_build 1 + Name: gkrellm Version: 2.3.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -159,6 +161,9 @@ systemctl daemon-reload &>/dev/null %changelog +* Mon Apr 23 2012 Ville Skyttä - 2.3.5-10 +- Build with hardening flags on. + * Sun Jan 15 2012 Hans de Goede - 2.3.5-8 - Explicitly link against gmodule-2.0 to fix building with latest glib From e10c0d2831e3d7091d39b79755e698b9f5ac5c99 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 01:43:27 -0500 Subject: [PATCH 044/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index dc1bfd5..47b24a8 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -161,6 +161,9 @@ systemctl daemon-reload &>/dev/null %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 2.3.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Apr 23 2012 Ville Skyttä - 2.3.5-10 - Build with hardening flags on. From f42eae7d3c3ae9391ce7ade65ae5dc7559994e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 8 Feb 2013 12:51:58 +0200 Subject: [PATCH 045/100] Systemd unit: add Documentation, remove obsolete After=syslog.target. - Fix bogus dates in %changelog. --- gkrellm.spec | 10 +++++++--- gkrellmd.service | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 47b24a8..5435a56 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -161,6 +161,10 @@ systemctl daemon-reload &>/dev/null %changelog +* Fri Feb 8 2013 Ville Skyttä - 2.3.5-12 +- Systemd unit: add Documentation, remove obsolete After=syslog.target. +- Fix bogus dates in %%changelog. + * Thu Jul 19 2012 Fedora Release Engineering - 2.3.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild @@ -355,7 +359,7 @@ systemctl daemon-reload &>/dev/null * Wed Nov 9 2005 Tomas Mraz 2.2.7-4 - rebuilt with new openssl -* Thu Sep 06 2005 Karsten Hopp 2.2.7-3 +* Tue Sep 06 2005 Karsten Hopp 2.2.7-3 - fix path to gkrellm2 plugins on 64bit archs (#164066) * Thu Aug 18 2005 Florian La Roche @@ -421,7 +425,7 @@ systemctl daemon-reload &>/dev/null * Tue Mar 02 2004 Elliot Lee - rebuilt -* Fri Feb 25 2004 Karsten Hopp 2.1.26-1 +* Wed Feb 25 2004 Karsten Hopp 2.1.26-1 - update to 2.1.26, which fixes sensor data being 10x to high (#115850) - requires kernel >= 2.6.2 diff --git a/gkrellmd.service b/gkrellmd.service index 469e010..876100c 100644 --- a/gkrellmd.service +++ b/gkrellmd.service @@ -1,6 +1,7 @@ [Unit] Description=GNU Krell Monitors server -After=network.target syslog.target hddtemp.service +Documentation=man:gkrellmd(1) +After=network.target hddtemp.service [Service] ExecStart=/usr/sbin/gkrellmd From 70057404e3588f1b80be5c3ccb6caf547535f24b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 17:31:24 -0600 Subject: [PATCH 046/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 5435a56..9bfe439 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -161,6 +161,9 @@ systemctl daemon-reload &>/dev/null %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.3.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Feb 8 2013 Ville Skyttä - 2.3.5-12 - Systemd unit: add Documentation, remove obsolete After=syslog.target. - Fix bogus dates in %%changelog. From b30149cec6084166ec63888bb8097bfeeaea5d6f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 09:31:52 -0500 Subject: [PATCH 047/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 9bfe439..ca36b85 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.5 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -161,6 +161,9 @@ systemctl daemon-reload &>/dev/null %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.3.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 2.3.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 76b0d2a98074e7d522ae06a792c98933146ac013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 6 Dec 2013 23:05:35 +0200 Subject: [PATCH 048/100] Fix build with -Werror=format-security (#1037086). --- gkrellm-2.3.5-syslogfmt-1037086.patch | 12 ++++++++++++ gkrellm.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gkrellm-2.3.5-syslogfmt-1037086.patch diff --git a/gkrellm-2.3.5-syslogfmt-1037086.patch b/gkrellm-2.3.5-syslogfmt-1037086.patch new file mode 100644 index 0000000..3e0265a --- /dev/null +++ b/gkrellm-2.3.5-syslogfmt-1037086.patch @@ -0,0 +1,12 @@ +diff -up gkrellm-2.3.5/server/main.c~ gkrellm-2.3.5/server/main.c +--- gkrellm-2.3.5/server/main.c~ 2010-10-02 19:13:29.000000000 +0300 ++++ gkrellm-2.3.5/server/main.c 2013-12-06 22:56:38.690534043 +0200 +@@ -187,7 +187,7 @@ static void gkrellmd_syslog_log(GLogLeve + if (log_level & G_LOG_LEVEL_CRITICAL) + facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT); + +- syslog(facility_priority, message); ++ syslog(facility_priority, "%s", message); + #endif // defined(WIN32) + } // gkrellmd_syslog_log() + diff --git a/gkrellm.spec b/gkrellm.spec index ca36b85..4cd4167 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -10,6 +10,8 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers Source1: gkrellmd.service Source2: gkrellm.desktop Source3: gkrellm.png +# Sent upstream 2013-12-06 +Patch0: gkrellm-2.3.5-syslogfmt-1037086.patch # The next time gkrellmd.conf changes after 2.3.5-5, remember to set it # config(noreplace) again. Patch1: gkrellm-2.3.5-config.patch @@ -55,6 +57,7 @@ Development files for the GNU Krell Monitors. %prep %setup -q +%patch0 -p1 -z .syslogfmt %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width @@ -161,6 +164,9 @@ systemctl daemon-reload &>/dev/null %changelog +* Fri Dec 6 2013 Ville Skyttä - 2.3.5-15 +- Fix build with -Werror=format-security (#1037086). + * Sat Aug 03 2013 Fedora Release Engineering - 2.3.5-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 1c6106792ece292678f668cf8900c5ce754c18d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 11 Dec 2013 20:43:54 +0200 Subject: [PATCH 049/100] Use main package's doc dir for -devel and -daemon. --- gkrellm.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 4cd4167..bf64b88 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,8 +1,9 @@ %global _hardened_build 1 +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: gkrellm Version: 2.3.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -149,12 +150,14 @@ systemctl daemon-reload &>/dev/null %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %files devel -%doc COPYRIGHT +%dir %{_pkgdocdir} +%{_pkgdocdir}/COPYRIGHT %{_includedir}/gkrellm2 %{_libdir}/pkgconfig/%{name}.pc %files daemon -%doc COPYRIGHT +%dir %{_pkgdocdir} +%{_pkgdocdir}/COPYRIGHT %{_unitdir}/gkrellmd.service %{_sbindir}/gkrellmd %{_mandir}/man1/gkrellmd.* @@ -164,6 +167,9 @@ systemctl daemon-reload &>/dev/null %changelog +* Wed Dec 11 2013 Ville Skyttä - 2.3.5-16 +- Use main package's doc dir for -devel and -daemon. + * Fri Dec 6 2013 Ville Skyttä - 2.3.5-15 - Fix build with -Werror=format-security (#1037086). From ee5ebacd0f66d165806ffb903f7ddae90aea7bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 31 Dec 2013 13:14:30 +0200 Subject: [PATCH 050/100] Run icon through optipng (#1047215). --- gkrellm.png | Bin 3149 -> 1937 bytes gkrellm.spec | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.png b/gkrellm.png index 373ad6045b657b57f3e8cce5605c42e3af752cea..e31baec9b14dad8305eac321669b7fea555d7893 100644 GIT binary patch delta 1934 zcmV;92XXk#7?BT<8Gi!+003az3AF$K010qNS#tmY07w7;07w8v$!k6U00Q?=OjJbx z000640tNyC1_lNQ0tpHR2MPub3JM7h0ul}i3l0ht5&{+y2^10%6B7;&6%H8|3m+B| z7aI~F92FBC2`C*7Cmj|Y9ug=X8Wti6EFu;iBM&Yl8Wbi9HGd}`94HnwC>kd!8a65( zEGi}H-9yu;9EiW28Fd-~4BqB5tNHiimHZLtUHa0g6LpUNyIwnUtEG0TRIzB2v zJ}fjoE+jrODn2(cLJCqsDl$SkHA5>uLn}^0F)BnrJw_g0Mk-oL4qi$YQc5mXOBPm3 zNk&XETuu^RPJbSDPBuqQHeOCRE>cobR3>;-I9yasNL3zuRyJ)}I&N80Pg)XmT0b>j zLONhHd|*9vU|?WjB8Xuuf@DHWWI}UfMnYyDa%M_CXdZTGDu`(sk7`CJIpQ-***r+`MLfKi};R-1w(wt`k_g*vWZ&igH?uUZ#v(kd02ZjwZj3EVPb(a*6o*u@YKF*$Mo}O^2o^n>7 zaA}`-wV*4rpm3C;BFds|!J>MIrFf^MdvvCFoTq@cs*-}LnvSZTnyX6Gtb=Q;hPtj& z)~qME>?(Z+V-#;U5us=COl*vf+B%AVfJwARjQ;?B0R z(ZRdYlIGH<=F+~#(!Si&m+RHE=-8g@+QR7C%EH~q>)z7l-@WhRw({cA%HrJC=GgG& z+JD~X!uIOo-tE%%?#}k{-TLw6_Vw=h_v-uj^7#Du{Qv*|joI!600001bW%=J06^y0 zW&i*H0b)x>MEpDsqkjMZ1SUyDK~xwS?ZMBBRaF4M@$WhJ+q=q6$KNf+MF4ICpC~zSZ2!94eNJ11N8f&(LR3z@-?)3?eW0|8I* z2P?16UcliZ93~}6Atr$tGY?%!PxDjVG?H-?RDVXkcVkWHSISYfUXGCEl|eIHqJO-) zD^-*i1|kTAx0SiEWuPFGsMohq&{0ZH1my~b07xP*o&yKCr7i~)U@@Ew4(&2d$1csY zOwXrT@6J{3>Yhp4%-eaLr}hm34GKa~V4gicG-Xn-;8~?*Z8!!e9DN#+$=~7#6om9C z%%yK`VL&cK8RYb7AMHC9C6kE-1%H8b5=?pS+=Uy4g2Kx^$h}-pFbW7v205Sriv`7O zdnTc8^Uk=Fb?+oyI_Z2q>ypGQ^w3M0v7n#<1`JroB7bzcRBo&h)u<+eimFN(gu;7; z`Oy?41rdPk2`dBzfdMpy4g?gm6Vz7M6`%kiERdv9(I@nySvu=qb19^dVt*k%O6TF4 z%0WWYSp$@?8GZKGQ{%JTbmT!^r5ZMuR4XS1wK_;pAO!*7L@AmRGWT5jYElAR04Tsw zQn+Y73KLLJcfx?BAS__xfBp>sm4UPbAi+uMZRvx8L1iP5JUzBN&{@A$w+*0R z#*!W1ad|B7WiegItm>lUIJ*ucsiS@ud942V_1LR}0_zYrwryJF_kVPX_F$^nt>)n6 zB&9(hT#|%`H;#{7$rnID;$h>7Q_Cx17c%fcLC8G{sKV&qS7K8E1#<`YId`Y?mr_D2 z*Q_^S28>2s|=$0u47ty;6)stt6zwSihq z-)gDC*(X6ldTswPoqst^a^#CM90vC6CO{fMvSZT8yRTL#T-aCv2@8V*dyY%tv*qiv zuopOV0I(ALoMij$sjW$bQm3DP$O8p=B~S-XZia+{cL4TN0zU_>=u2>z^E+3dKtg+{ zQLTJ5qWONyFdRMrj3$cp4xZZpXJ31dYnYM>(-0^_9s(mgaDV;-b-(AT U`nLvI00000Ne4wvM6N<$f`^7s(EtDd delta 3136 zcmV-G48QY{56u{m85#xv00374`G)`i00v@9M??Vs0RI60puMM)ks%j<3++inK~y-) z?U;Xz9o2QmKQr&n&-Y`Wch|edc2YxeAt^uNLcv&6O+wNpstX8JDQN>Hid$UCq)pm{ zP+ZlBAEl{MrN~lQ4(c7be$Sb4>~`HZ}&p$Uv1}T76MLfr?d8V-$3L2vJF<&X+L&Y3$}=N!$iTQ8YAty`A@95`?w6TV=7gx7y|oRe>z<-mbw zJ4Slhf9WBR**M6yPh^`wI++2j7E!Py-&o3O#*dtw=Y?g`c#3w|J;Qbwp@nv~Mw>)M z*>5kt{w(#%5|oOm51z-DF$a$v(*VT$V%IG3;(zQ1KnTH|8$QMBKmH-teey;eVc=K> zW!J&c>$v3r$1o^=TY`#Z;aZu2x=^_KFoW(g3|pgIs$d%qwE=-)524!wl+6iJ^ZnSh z0W8PFwk>og!FEl`?f{w_VcU{&c^SefVUL=p^~6nY$`a`1)Xp>(>aWPT5&xq(abJS%K30P+Z9R% z3u|JPGFTm^VvqKPm*|}+RgCYap5B9PTim^IJ$L-c1ISQ9+e1o;?+3&!AL&U#*&viQ z%2Ox_t#BDZ;}}WkB134;DJEx+18}}Ijfyn9Xo4`&QBu;7vj8;YIEjjA$^f4xN@_?o zhf<0^`uJ9V0BmZ+Vbl-6aw=V>DD{Afx$=@V?0f1P434g5X7X?$-T~rtxVttPCS?}G z9wInL-hhB=JE5JH`0>um2~E%3E)Y)AFY=3=>n-DBERLF1Z*@WTn!! zHQb7cX4bH5Eia{2r;bsBl3Bv383&Mre-fk=;eZ} z=$i;p2q6GJbhDdPyoDYwUDyLcpdyXY(O)JCeZnxIC0po*&e`d+5E&#rB|K_P=HtMB z&j6*eYmTp`_}acN0418D!3D`ms;Z8aI0Uim_dvz2pvdx|H*5eLv*R-5BHtr?lv2EW z;yM0v><65he4CbR0dU?s15xHtmBi@EL?tm+rxaS6jpdkB(>gV)f+HN9#A5e}ZxlRW z%kJf7mbwKbhb*MXC%qvA5VwZVjTWYV7^EUh8l8nY79jy97KwsoY-u3}XRv21Ow*+IF3thi%0_h6Esjo)ajcPGv!t-Zh)u$@yR{}XQkCg8H7n zK!8D}HwprX$$Q~6Owdf7Fbsh#A4Z*3c?dm!{xLS%4*}q(O1B^z%=0`u1htToh4L&e*DesIQr4`KJvH*ZgI_Yc}^Tz&{ z`P|1o&VxI@%Xnj&O@H+zED=+&SE84ixW)<`!@{v@=t8F~>R2U{iWtFv)GFAfkI+jD zh!M)=3f8cNJy0VqdkpBysZ<vq-GM7hOs=7-w7*Kc11ZH+H$9HCLkn&QS*`woN zC6uf#fV>KMt$G2=p6%QD?A9&3e|S~SGlfg2W)NCYHc<(&>gGzAdYID14Tt*DXFy-p z$FrRbL~M1dU)gY(_^HQ#jhjEoua-Z8Iy6l~oka!35}$jZrOxCDt5n3!mtW$yPiCzetr713wOvdcnm{TKfuL?Kki>CNhWYA$BLpYUPVdqyTzTnAPK=#mueY1S=^H2%p1wdk9Yzw-ssD-;Uk3ba>KN%*lhJyG zvTb0BDcb%>zBuTA=@PAQ9>|eGeYcW@+v!3WM8#BegYL(G!w1GV;T`0NdXrW#Lx@i$ z>E6WoN>82T-rxCs?t5|v^S8kG^fWU`_odcHOg=HA`=#u5fOZgY_?^?-xAPx)_>Mm$lnGKrK!EIgP6-IP z@8YNV=i^VZ&wC7j9S3$46h8dqHXhji2mp3HQ(sahisA!E6Ip(2TK^D7_P#?xi;^-K zKQzIoS8rwDVwZQ*zkKMwS%3U$Y`YtBT>$Dl%ZHYKu(YzA`*%Igw#|2UZea^sWbfrq z4Bx_Y)4Tbv#^bqy+b+Aku*v4jHnZu&8w!ZT=gkjs?9B;I9y!VF zSKmiK$kJ;wc@qZ{hbOLjg$-}s!Yb>7h*B3oK1x(b*>$i|9lcax+n$|#>x(=1gTK8q z7nWXs|4Xc7>pc3>_I$qWwd_-jMbY4}rv>wAB1HeQavl(5H!whm&-d5A%Afym6U)Vl z?9|O}@yI>Ukh6?dmr<_`QY+ikoTYqw&!c?ni{H#c=tn%yCx&m~y83Oof*l8T^qu&@ z#xn$jXhxQlS5-bmLbqSKzVbQNRyO4GpLjce*?8SU{O;BFVqtQy@eHEV#C`APpYXLG z-_4LSz_2sKuv5Go3-zmB2_c#PFtrrhgePA3K97I-yG-teP$vAv#BcC7A9@LnFL;1_ z<<`xJ%IA4t`y=>M0T15uCDMAtmb*J1dUOlziI6XE{VHK2|mw6s>9FBovwB(SYGF@zUcZiRHwP&^7W+JDYSHDE)=R^?!03ozxBu05~#3ndUz91 z>2D9_X+D$!LWaa3=hRG}%s%fiG!>y!&c7ASdwGpr)cyJ;FJ!>>Jf{@^09?BKk`&vj_6)ZiQ)EraO*XGkrrtikrwIa aPyY+Fgla~gBlbD~0000/dev/null %changelog +* Tue Dec 31 2013 Ville Skyttä - 2.3.5-17 +- Run icon through optipng (#1047215). + * Wed Dec 11 2013 Ville Skyttä - 2.3.5-16 - Use main package's doc dir for -devel and -daemon. From 5e5d70cb391f3d42e911a2df3202772fe5a33b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 10 Jan 2014 12:08:24 +0200 Subject: [PATCH 051/100] Patch daemon to allow binding to a listen address that doesn't exist yet. - Use systemd macros in scriptlets (#850128). --- ...-a-listen-address-that-doesn-t-exist.patch | 30 +++++++++++++++++++ gkrellm.spec | 30 +++++++++++-------- gkrellmd.service | 2 +- 3 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch diff --git a/0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch b/0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch new file mode 100644 index 0000000..83bf0b0 --- /dev/null +++ b/0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch @@ -0,0 +1,30 @@ +From a6983649c997dffd71d365792fa665cc135e696a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Fri, 10 Jan 2014 09:34:59 +0200 +Subject: [PATCH] Allow binding to a listen address that doesn't exist yet + +--- + server/main.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/server/main.c b/server/main.c +index a5a9e4e..b2f460b 100644 +--- a/server/main.c ++++ b/server/main.c +@@ -1003,6 +1003,13 @@ socksetup(int af) + #endif + continue; + } ++ ++#ifdef IP_FREEBIND ++ if (setsockopt(*s, SOL_IP, IP_FREEBIND, &on, sizeof(on)) < 0) ++ { ++ g_warning("gkrellmd: setsockopt (IP_FREEBIND) failed\n"); ++ } ++#endif + } + + #ifdef IPV6_V6ONLY +-- +1.8.3.1 + diff --git a/gkrellm.spec b/gkrellm.spec index 54cd219..b704547 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -3,7 +3,7 @@ Name: gkrellm Version: 2.3.5 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -18,8 +18,10 @@ Patch0: gkrellm-2.3.5-syslogfmt-1037086.patch Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch +# Sent upstream 2014-01-10 +Patch4: 0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext -BuildRequires: lm_sensors-devel libntlm-devel systemd-units +BuildRequires: lm_sensors-devel libntlm-devel %description GKrellM charts CPU, load, Disk, and all active net interfaces @@ -37,10 +39,13 @@ Additional features are: %package daemon Summary: The GNU Krell Monitors Server +# systemd >= 186 for scriptlet macros +BuildRequires: systemd >= 186 Requires(pre): shadow-utils systemd-sysv chkconfig -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + %description daemon gkrellmd listens for connections from gkrellm clients. When a gkrellm @@ -62,6 +67,7 @@ Development files for the GNU Krell Monitors. %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width +%patch4 -p1 -z .freebind for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html \ src/gkrellm.h server/gkrellmd.h; do @@ -127,17 +133,13 @@ fi : %post daemon -systemctl daemon-reload &>/dev/null || : +%systemd_post gkrellmd.service %preun daemon -if [ $1 -eq 0 ] ; then - systemctl --no-reload disable gkrellmd.service &>/dev/null - systemctl stop gkrellmd.service &>/dev/null || : -fi +%systemd_preun gkrellmd.service %postun daemon -systemctl daemon-reload &>/dev/null -[ $1 -gt 0 ] && systemctl try-restart gkrellmd.service &>/dev/null || : +%systemd_postun_with_restart gkrellmd.service %files -f %{name}.lang @@ -167,6 +169,10 @@ systemctl daemon-reload &>/dev/null %changelog +* Fri Jan 10 2014 Ville Skyttä - 2.3.5-18 +- Patch daemon to allow binding to a listen address that doesn't exist yet. +- Use systemd macros in scriptlets (#850128). + * Tue Dec 31 2013 Ville Skyttä - 2.3.5-17 - Run icon through optipng (#1047215). diff --git a/gkrellmd.service b/gkrellmd.service index 876100c..ff8ec33 100644 --- a/gkrellmd.service +++ b/gkrellmd.service @@ -1,7 +1,7 @@ [Unit] Description=GNU Krell Monitors server Documentation=man:gkrellmd(1) -After=network.target hddtemp.service +After=hddtemp.service [Service] ExecStart=/usr/sbin/gkrellmd From 13b22c52b62515c78b4ae8d05d41ae96a8735676 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:56:40 -0500 Subject: [PATCH 052/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index b704547..caa18db 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -3,7 +3,7 @@ Name: gkrellm Version: 2.3.5 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -169,6 +169,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.3.5-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Jan 10 2014 Ville Skyttä - 2.3.5-18 - Patch daemon to allow binding to a listen address that doesn't exist yet. - Use systemd macros in scriptlets (#850128). From b7b13666182714ca3863ce44234d95a1818c253d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 12 Jul 2014 13:45:48 +0300 Subject: [PATCH 053/100] Start daemon after lm_sensors (#1117750, DaveG) - Specfile cleanups --- gkrellm.spec | 10 ++++++---- gkrellmd.service | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index caa18db..b464ecb 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -3,7 +3,7 @@ Name: gkrellm Version: 2.3.5 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -42,9 +42,7 @@ Summary: The GNU Krell Monitors Server # systemd >= 186 for scriptlet macros BuildRequires: systemd >= 186 Requires(pre): shadow-utils systemd-sysv chkconfig -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires(post,preun,postun): systemd %description daemon @@ -169,6 +167,10 @@ fi %changelog +* Sat Jul 12 2014 Ville Skyttä - 2.3.5-20 +- Start daemon after lm_sensors (#1117750, DaveG) +- Specfile cleanups + * Sat Jun 07 2014 Fedora Release Engineering - 2.3.5-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/gkrellmd.service b/gkrellmd.service index ff8ec33..dcbac9f 100644 --- a/gkrellmd.service +++ b/gkrellmd.service @@ -1,7 +1,7 @@ [Unit] Description=GNU Krell Monitors server Documentation=man:gkrellmd(1) -After=hddtemp.service +After=hddtemp.service lm_sensors.service [Service] ExecStart=/usr/sbin/gkrellmd From 62b20d1907edbf23e21342c4eb688bd4f0e8564d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 16:34:37 +0000 Subject: [PATCH 054/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index b464ecb..ccb3b6e 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -3,7 +3,7 @@ Name: gkrellm Version: 2.3.5 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -167,6 +167,9 @@ fi %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 2.3.5-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jul 12 2014 Ville Skyttä - 2.3.5-20 - Start daemon after lm_sensors (#1117750, DaveG) - Specfile cleanups From 501dd4674b9bb0c122746316cf1b73df7d7c9368 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 08:18:49 +0000 Subject: [PATCH 055/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index ccb3b6e..41aaeb1 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -3,7 +3,7 @@ Name: gkrellm Version: 2.3.5 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -167,6 +167,9 @@ fi %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.3.5-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Aug 16 2014 Fedora Release Engineering - 2.3.5-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From cd9bdf0213b2ebd6726771522c47639bdd9e51c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 9 Oct 2015 23:10:08 +0300 Subject: [PATCH 056/100] Mark COPYRIGHT as %license --- .gitignore | 3 +-- gkrellm.spec | 15 ++++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3fffe3d..dafa321 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -gkrellm-2.3.4.tar.bz2 -/gkrellm-2.3.5.tar.bz2 +/*.tar.* diff --git a/gkrellm.spec b/gkrellm.spec index 41aaeb1..f9291ed 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,9 +1,8 @@ %global _hardened_build 1 -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: gkrellm Version: 2.3.5 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -141,7 +140,8 @@ fi %files -f %{name}.lang -%doc COPYRIGHT Changelog README Themes.html +%license COPYRIGHT +%doc Changelog README Themes.html %{_bindir}/%{name} %{_libdir}/gkrellm2 %{_datadir}/gkrellm2 @@ -150,14 +150,12 @@ fi %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %files devel -%dir %{_pkgdocdir} -%{_pkgdocdir}/COPYRIGHT +%license %{_licensedir}/%{name}* %{_includedir}/gkrellm2 %{_libdir}/pkgconfig/%{name}.pc %files daemon -%dir %{_pkgdocdir} -%{_pkgdocdir}/COPYRIGHT +%license %{_licensedir}/%{name}* %{_unitdir}/gkrellmd.service %{_sbindir}/gkrellmd %{_mandir}/man1/gkrellmd.* @@ -167,6 +165,9 @@ fi %changelog +* Fri Oct 9 2015 Ville Skyttä - 2.3.5-23 +- Mark COPYRIGHT as %%license + * Wed Jun 17 2015 Fedora Release Engineering - 2.3.5-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From b65a76541734a3612230e8b58102baa9da55ff60 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:58:40 +0000 Subject: [PATCH 057/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index f9291ed..c710f45 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.5 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -165,6 +165,9 @@ fi %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.3.5-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Oct 9 2015 Ville Skyttä - 2.3.5-23 - Mark COPYRIGHT as %%license From d14f8af25503ccf55342fb00353f45f7d492f64a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 26 Feb 2016 22:17:04 +0100 Subject: [PATCH 058/100] Update to a 2.3.6-rc git snapshot for misc. fixes (inspired by Debian) - Add a bunch of patches from Debian - Add appdata --- ...-a-listen-address-that-doesn-t-exist.patch | 30 -------------- gkrellm-2.3.5-syslogfmt-1037086.patch | 12 ------ gkrellm.desktop | 1 + gkrellm.spec | 39 ++++++++++++------- gnome-gkrellm.appdata.xml | 33 ++++++++++++++++ make-git-snapshot.sh | 22 +++++++++++ sources | 3 +- 7 files changed, 83 insertions(+), 57 deletions(-) delete mode 100644 0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch delete mode 100644 gkrellm-2.3.5-syslogfmt-1037086.patch create mode 100644 gnome-gkrellm.appdata.xml create mode 100755 make-git-snapshot.sh diff --git a/0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch b/0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch deleted file mode 100644 index 83bf0b0..0000000 --- a/0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a6983649c997dffd71d365792fa665cc135e696a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Fri, 10 Jan 2014 09:34:59 +0200 -Subject: [PATCH] Allow binding to a listen address that doesn't exist yet - ---- - server/main.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/server/main.c b/server/main.c -index a5a9e4e..b2f460b 100644 ---- a/server/main.c -+++ b/server/main.c -@@ -1003,6 +1003,13 @@ socksetup(int af) - #endif - continue; - } -+ -+#ifdef IP_FREEBIND -+ if (setsockopt(*s, SOL_IP, IP_FREEBIND, &on, sizeof(on)) < 0) -+ { -+ g_warning("gkrellmd: setsockopt (IP_FREEBIND) failed\n"); -+ } -+#endif - } - - #ifdef IPV6_V6ONLY --- -1.8.3.1 - diff --git a/gkrellm-2.3.5-syslogfmt-1037086.patch b/gkrellm-2.3.5-syslogfmt-1037086.patch deleted file mode 100644 index 3e0265a..0000000 --- a/gkrellm-2.3.5-syslogfmt-1037086.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gkrellm-2.3.5/server/main.c~ gkrellm-2.3.5/server/main.c ---- gkrellm-2.3.5/server/main.c~ 2010-10-02 19:13:29.000000000 +0300 -+++ gkrellm-2.3.5/server/main.c 2013-12-06 22:56:38.690534043 +0200 -@@ -187,7 +187,7 @@ static void gkrellmd_syslog_log(GLogLeve - if (log_level & G_LOG_LEVEL_CRITICAL) - facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT); - -- syslog(facility_priority, message); -+ syslog(facility_priority, "%s", message); - #endif // defined(WIN32) - } // gkrellmd_syslog_log() - diff --git a/gkrellm.desktop b/gkrellm.desktop index a854538..984b936 100644 --- a/gkrellm.desktop +++ b/gkrellm.desktop @@ -8,3 +8,4 @@ Type=Application Categories=System; StartupNotify=true StartupWMClass=gkrellm +Keywords=system;monitor;cpu;memory;disks;network; diff --git a/gkrellm.spec b/gkrellm.spec index c710f45..012d524 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,26 +1,26 @@ +%global gitdate 20160226 %global _hardened_build 1 Name: gkrellm -Version: 2.3.5 -Release: 24%{?dist} +Version: 2.3.6 +Release: 0.1.rc1.git%{gitdate}%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ -Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{gitdate}.tar.bz2 Source1: gkrellmd.service Source2: gkrellm.desktop Source3: gkrellm.png -# Sent upstream 2013-12-06 -Patch0: gkrellm-2.3.5-syslogfmt-1037086.patch +Source4: gnome-gkrellm.appdata.xml +Source5: make-git-snapshot.sh +Source6: ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/g/gkrellm/gkrellm_2.3.6~rc1-1.debian.tar.xz # The next time gkrellmd.conf changes after 2.3.5-5, remember to set it # config(noreplace) again. Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch -# Sent upstream 2014-01-10 -Patch4: 0001-Allow-binding-to-a-listen-address-that-doesn-t-exist.patch BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext -BuildRequires: lm_sensors-devel libntlm-devel +BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib %description GKrellM charts CPU, load, Disk, and all active net interfaces @@ -59,12 +59,14 @@ Development files for the GNU Krell Monitors. %prep -%setup -q -%patch0 -p1 -z .syslogfmt +%setup -q -n %{name}-%{gitdate} -a 6 %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width -%patch4 -p1 -z .freebind +rm debian/patches/01_gkrellmd.conf.patch +for i in debian/patches/*_*.patch; do + patch -p1 --fuzz=0 < $i +done for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html \ src/gkrellm.h server/gkrellmd.h; do @@ -76,7 +78,7 @@ done %build make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ - LDFLAGS="$(pkg-config --libs gmodule-2.0) $RPM_LD_FLAGS" + LDFLAGS="$RPM_LD_FLAGS" %install @@ -89,8 +91,7 @@ make install \ SINSTALLDIR=$RPM_BUILD_ROOT%{_sbindir} \ MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \ PKGCONFIGDIR=$RPM_BUILD_ROOT%{_libdir}/pkgconfig \ - INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} \ - STRIP="" + INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/gkrellmd.service install -Dpm 644 server/gkrellmd.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/gkrellmd.conf @@ -104,6 +105,10 @@ desktop-file-install --vendor gnome \ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 %{SOURCE3} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet \ + $RPM_BUILD_ROOT%{_datadir}/appdata/gnome-%{name}.appdata.xml %post -p @@ -146,6 +151,7 @@ fi %{_libdir}/gkrellm2 %{_datadir}/gkrellm2 %{_mandir}/man1/%{name}.1* +%{_datadir}/appdata/gnome-%{name}.appdata.xml %{_datadir}/applications/gnome-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png @@ -165,6 +171,11 @@ fi %changelog +* Fri Feb 26 2016 Hans de Goede - 2.3.6-0.1.rc1.git20160226 +- Update to a 2.3.6-rc git snapshot for misc. fixes (inspired by Debian) +- Add a bunch of patches from Debian +- Add appdata + * Wed Feb 03 2016 Fedora Release Engineering - 2.3.5-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/gnome-gkrellm.appdata.xml b/gnome-gkrellm.appdata.xml new file mode 100644 index 0000000..a9e893a --- /dev/null +++ b/gnome-gkrellm.appdata.xml @@ -0,0 +1,33 @@ + + + gnome-gkrellm.desktop + CC0-1.0 + GPL-2.0+ + GKrellM + Monitor for CPU, memory, disks, network, mail + +

+ GKrellM is a single process stack of system monitors which supports + applying themes to match its appearance to your window manager, Gtk, + or any other theme. +

+

Features:

+
    +
  • Hostname/systemname display
    • +
  • Clock/calendar
    • +
  • Temperature, fan, and voltage sensor monitors
    • +
  • Process monitor with a chart for load and forks
    • +
  • Display of number of current processes and users
    • +
  • Disk monitor that can chart individual disks or a composite disk
    • +
  • Internet monitor (http, ftp, ...)
    • +
  • Net interface monitors, Data rx/tx LEDs
    • +
  • And much more
    • +
+ + https://billw2.github.io/gkrellm/gkrellm.html + + https://billw2.github.io/gkrellm/gkrellm.png + https://billw2.github.io/gkrellm/gkrellm0.png + + jwrdegoede_at_fedoraproject.org + diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..44cd4a0 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Usage: ./make-git-snapshot.sh [COMMIT] +# +# to make a snapshot of the given tag/branch. Defaults to HEAD. +# Point env var REF to a local git repo to reduce clone time. + +DIRNAME=gkrellm-$( date +%Y%m%d ) + +echo REF ${REF:+--reference $REF} +echo DIRNAME $DIRNAME +echo HEAD ${1:-HEAD} + +rm -rf $DIRNAME + +git clone ${REF:+--reference $REF} \ + git://git.srcbox.net/gkrellm $DIRNAME + +GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | bzip2 > $DIRNAME.tar.bz2 + +# rm -rf $DIRNAME diff --git a/sources b/sources index 1d14148..cf1a2fe 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -e43a9416a6975e3be63d591bdeb33b04 gkrellm-2.3.5.tar.bz2 +9db32a852f0f1853f4b1ba31c8c63669 gkrellm-20160226.tar.bz2 +9422afbd251fc0c917860f055f276fb3 gkrellm_2.3.6~rc1-1.debian.tar.xz From 768d70199a918987767ff9c5ca40ac9ebf12f042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 4 Jun 2016 08:52:11 +0300 Subject: [PATCH 059/100] Update to 2.3.7 - Make gkrellmd.conf noreplace again --- gkrellm.spec | 21 ++++++++++----------- sources | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 012d524..dd5666d 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,21 +1,18 @@ -%global gitdate 20160226 %global _hardened_build 1 Name: gkrellm -Version: 2.3.6 -Release: 0.1.rc1.git%{gitdate}%{?dist} +Version: 2.3.7 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ -Source0: %{name}-%{gitdate}.tar.bz2 +Source0: http://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2 Source1: gkrellmd.service Source2: gkrellm.desktop Source3: gkrellm.png Source4: gnome-gkrellm.appdata.xml Source5: make-git-snapshot.sh -Source6: ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/g/gkrellm/gkrellm_2.3.6~rc1-1.debian.tar.xz -# The next time gkrellmd.conf changes after 2.3.5-5, remember to set it -# config(noreplace) again. +Source6: http://cdn.debian.net/debian/pool/main/g/gkrellm/gkrellm_2.3.6~rc1-1.debian.tar.xz Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch @@ -59,7 +56,7 @@ Development files for the GNU Krell Monitors. %prep -%setup -q -n %{name}-%{gitdate} -a 6 +%setup -q -a 6 %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width @@ -165,12 +162,14 @@ fi %{_unitdir}/gkrellmd.service %{_sbindir}/gkrellmd %{_mandir}/man1/gkrellmd.* -# Temporarily not noreplace so systemd related changes take effect. -# See comments next to the config PatchX: above. -%config %{_sysconfdir}/gkrellmd.conf +%config(noreplace) %{_sysconfdir}/gkrellmd.conf %changelog +* Sat Jun 4 2016 Ville Skyttä - 2.3.7-1 +- Update to 2.3.7 +- Make gkrellmd.conf noreplace again + * Fri Feb 26 2016 Hans de Goede - 2.3.6-0.1.rc1.git20160226 - Update to a 2.3.6-rc git snapshot for misc. fixes (inspired by Debian) - Add a bunch of patches from Debian diff --git a/sources b/sources index cf1a2fe..dca2a35 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9db32a852f0f1853f4b1ba31c8c63669 gkrellm-20160226.tar.bz2 9422afbd251fc0c917860f055f276fb3 gkrellm_2.3.6~rc1-1.debian.tar.xz +88e3ec4f1d98ffc674447db533db6713 gkrellm-2.3.7.tar.bz2 From 782faf0fa868538601474e1104c54aab1807d734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 14 Jul 2016 11:58:54 +0300 Subject: [PATCH 060/100] Patch to fix gkrellm.pc (#1356479) --- ...gkrellm.pc-when-created-e.g.-coreuti.patch | 39 +++++++++++++++++++ gkrellm.spec | 6 +++ 2 files changed, 45 insertions(+) create mode 100644 0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch diff --git a/0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch b/0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch new file mode 100644 index 0000000..c234d47 --- /dev/null +++ b/0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch @@ -0,0 +1,39 @@ +From 3c3114b7af67c09d7830814fc09bad966533174c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Thu, 14 Jul 2016 11:51:16 +0300 +Subject: [PATCH] Fix newlines in gkrellm.pc when created e.g. coreutils echo + +Some versions of echo output a literal \n, not a newline, for \n in +arguments. +--- + Makefile | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index 35871b0..588d5fa 100644 +--- a/Makefile ++++ b/Makefile +@@ -131,13 +131,13 @@ all gkrellm: gkrellm.pc + (cd server && ${MAKE} gkrellmd) + + gkrellm.pc: Makefile +- echo 'prefix=$(INSTALLROOT)\n'\ +- 'Name: GKrellM\n'\ +- 'Description: Extensible GTK system monitoring application\n'\ +- 'Version: $(VERSION)\n'\ +- 'Requires: gtk+-2.0 >= 2.4.0\n'\ +- 'Cflags: -I$(INCLUDEDIR)\n'\ +- '$(GKRELLM_PC_EXTRA)' > gkrellm.pc ++ echo 'prefix=$(INSTALLROOT)' > gkrellm.pc ++ echo 'Name: GKrellM' >> gkrellm.pc ++ echo 'Description: Extensible GTK system monitoring application' >> gkrellm.pc ++ echo 'Version: $(VERSION)' >> gkrellm.pc ++ echo 'Requires: gtk+-2.0 >= 2.4.0' >> gkrellm.pc ++ echo 'Cflags: -I$(INCLUDEDIR)' >> gkrellm.pc ++ echo '$(GKRELLM_PC_EXTRA)' >> gkrellm.pc + + install: install_gkrellm.pc + (cd po && ${MAKE} install) +-- +2.5.5 + diff --git a/gkrellm.spec b/gkrellm.spec index dd5666d..2d29c61 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -13,6 +13,8 @@ Source3: gkrellm.png Source4: gnome-gkrellm.appdata.xml Source5: make-git-snapshot.sh Source6: http://cdn.debian.net/debian/pool/main/g/gkrellm/gkrellm_2.3.6~rc1-1.debian.tar.xz +# Sent upstream 2016-07-14 +Patch0: 0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch @@ -57,6 +59,7 @@ Development files for the GNU Krell Monitors. %prep %setup -q -a 6 +%patch0 -p1 -z .newlines %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width @@ -166,6 +169,9 @@ fi %changelog +* Thu Jul 14 2016 Ville Skyttä +- Patch to fix gkrellm.pc (#1356479) + * Sat Jun 4 2016 Ville Skyttä - 2.3.7-1 - Update to 2.3.7 - Make gkrellmd.conf noreplace again From 31f54a8e3d997f6ef15342eb2de7b759173484bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 14 Jul 2016 11:59:45 +0300 Subject: [PATCH 061/100] Optimize gkrellm.png with zopflipng --- gkrellm.png | Bin 1937 -> 1862 bytes gkrellm.spec | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gkrellm.png b/gkrellm.png index e31baec9b14dad8305eac321669b7fea555d7893..ce3be278eb1dd01a8f5ad6f073612d4de9cd6fd9 100644 GIT binary patch delta 1087 zcmV-F1i<@|55^9VBLV{Su{!tyf1`|(yZ`_I0d!JMQvg8b*k%9#1OQ1yK~#7F?au>@ zwA&pA;OCq|$3Yr1HT zN5BmnZS7iUk>y4q(}cF8YBXAKh5jJ~Zt5_XJ8AomvOJbGrJ`i1V5`|>e-Z81el%~^ zien_EKNFvO*0qNH$;x;-Um1%lmm91PFP3`qJes85a1aKA(7V5#LoP*R7-M?$v!Pbn zFS^l0V}K&k$YkV;&08dN8ebf|{EWVVZGm!2kdscbz63iF{nul zNi?_q{Uy(DN;-O7s^jc7e@k-6pr$zYcgyiV8jv(cf9@O&@!+_k1$F<=$?%tsq9ZYg zInu1`{Q8e)HIVe$9&N7;&?F3+ihupkk!&B>D!{!Tw%n^07ZeM7H-b4P6HMf7l$YtX(Ti$Fn$?q-l(UVd&kM#uvsWTPaHcgMqm#5{+F4nl`+dFtr{q>9)X5XsT}K+7t^*a9GEyb ze4c#nZBF=mgHC#z<3nZe#IZ%`j-5P0TWx#o8-bx6BkEiI_Jf3#3jK~ZM&3&r=$zjo%U zkGSR`0#ARNFuB29uF&7FOLdR)*Z+JyTE%DuL&eZ-kNLun7gs!9qUhDQOsE65?K$LnV=OKR|dE52$v9uEfZ zyvORN@9^CpfBgCmM;vp)9ZtBzZ2iC;W~+tv{>4~I zKe+v+dnDS)Aiea9_ojf}i+R2g{gyg`Le~8LVV9Lie;l|Z`PE;zn{VCEpHF)6i}}ON zl3V_g+u>IaEJnWwe)Fu0M->T|>a?S`ef5m`8Se$&l%Bf(f%b7eQ9ZJ={2?KG>lH+s z1g=-!p^KC+xOsgmasWn(jZOGP2(i13Ti|eC5pZRXtty2(-+|bzEt=G%u1n1jtzO9C z@I&DfF}^^6%a%G#0LX*BwYs;~jMA_iVuf~yFZjQU=1&4O

jKmWT0KbUhopugNIw>VlrGakL@00}6bJ@INJ11Np z<&{A*T%x?XD^-*i1|kTAx0SiEWuPFGsMohq&{0ZH1my~b0Dnj#FrEVkxTP)!6ksu& z3=ZuwPRB0IvrNyYS?|tO?&_XN+sxZ}ou~E<0u2g6P+*=tKQv`hu;5vxWoc7tX&>!77A2F31qFe05=?pS+=Uy4g2Kx^$h}-pFbW7v z205Sriv`7Odw(XOZ}ZN$lXdSTT{`J}KI@XiEcDPznX#at0R{|M$0C1px>Rng5!I+B zgNmw38HB=nh56AGBn1(G>$qgguZUvnv> zkYXV|O6TF4%0WWYSp$@?8GZKGQ{%JTbmT!^r5ZMuRDUZc1+_XzP#^^X;6y2!6EgQ) z`)X1GTmUG*QBt^QJ_-|1PTT(Rf)n6B&9(hT#|%`H;#{7$rnID;$h>7Q-8}VVHYy+K|#np3aG;9-&bN&0R?jh z_c?c`^OsUWE90@qfv<-;2{@t9QS)Y;f~IfV>JO_?6a+_K8u+U9!|8LaKgTCp6Rlda z-Kq_AyS0H@P2Xy%!r3Q5LV9igF`YS0a^#CM90vC6CO{fMvSZT8yRTL#T-aCv2@8V* zdw-5g;j`uIv#=L9bO5jt{G4R_?WwIvgi@!Uf5-y`c_mN>Pi}^Uf_DJ+QvyE+t>{Z| znDaYVpg=-h($ diff --git a/gkrellm.spec b/gkrellm.spec index 2d29c61..78a3c22 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -169,8 +169,9 @@ fi %changelog -* Thu Jul 14 2016 Ville Skyttä +* Thu Jul 14 2016 Ville Skyttä - 2.3.7-2 - Patch to fix gkrellm.pc (#1356479) +- Optimize gkrellm.png with zopflipng * Sat Jun 4 2016 Ville Skyttä - 2.3.7-1 - Update to 2.3.7 From 389638dc9139b61b461f05a0ec08d815b26a9f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 8 Sep 2016 10:50:38 +0300 Subject: [PATCH 062/100] Update to 2.3.8 --- ...gkrellm.pc-when-created-e.g.-coreuti.patch | 39 ------------------- gkrellm.spec | 10 ++--- sources | 2 +- 3 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch diff --git a/0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch b/0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch deleted file mode 100644 index c234d47..0000000 --- a/0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3c3114b7af67c09d7830814fc09bad966533174c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Thu, 14 Jul 2016 11:51:16 +0300 -Subject: [PATCH] Fix newlines in gkrellm.pc when created e.g. coreutils echo - -Some versions of echo output a literal \n, not a newline, for \n in -arguments. ---- - Makefile | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index 35871b0..588d5fa 100644 ---- a/Makefile -+++ b/Makefile -@@ -131,13 +131,13 @@ all gkrellm: gkrellm.pc - (cd server && ${MAKE} gkrellmd) - - gkrellm.pc: Makefile -- echo 'prefix=$(INSTALLROOT)\n'\ -- 'Name: GKrellM\n'\ -- 'Description: Extensible GTK system monitoring application\n'\ -- 'Version: $(VERSION)\n'\ -- 'Requires: gtk+-2.0 >= 2.4.0\n'\ -- 'Cflags: -I$(INCLUDEDIR)\n'\ -- '$(GKRELLM_PC_EXTRA)' > gkrellm.pc -+ echo 'prefix=$(INSTALLROOT)' > gkrellm.pc -+ echo 'Name: GKrellM' >> gkrellm.pc -+ echo 'Description: Extensible GTK system monitoring application' >> gkrellm.pc -+ echo 'Version: $(VERSION)' >> gkrellm.pc -+ echo 'Requires: gtk+-2.0 >= 2.4.0' >> gkrellm.pc -+ echo 'Cflags: -I$(INCLUDEDIR)' >> gkrellm.pc -+ echo '$(GKRELLM_PC_EXTRA)' >> gkrellm.pc - - install: install_gkrellm.pc - (cd po && ${MAKE} install) --- -2.5.5 - diff --git a/gkrellm.spec b/gkrellm.spec index 78a3c22..a14f219 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: gkrellm -Version: 2.3.7 -Release: 2%{?dist} +Version: 2.3.8 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -13,8 +13,6 @@ Source3: gkrellm.png Source4: gnome-gkrellm.appdata.xml Source5: make-git-snapshot.sh Source6: http://cdn.debian.net/debian/pool/main/g/gkrellm/gkrellm_2.3.6~rc1-1.debian.tar.xz -# Sent upstream 2016-07-14 -Patch0: 0001-Fix-newlines-in-gkrellm.pc-when-created-e.g.-coreuti.patch Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch @@ -59,7 +57,6 @@ Development files for the GNU Krell Monitors. %prep %setup -q -a 6 -%patch0 -p1 -z .newlines %patch1 -p1 -z .config %patch2 -p1 -z .sansfont %patch3 -p1 -z .width @@ -169,6 +166,9 @@ fi %changelog +* Thu Sep 8 2016 Ville Skyttä - 2.3.8-1 +- Update to 2.3.8 + * Thu Jul 14 2016 Ville Skyttä - 2.3.7-2 - Patch to fix gkrellm.pc (#1356479) - Optimize gkrellm.png with zopflipng diff --git a/sources b/sources index dca2a35..ea14bea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 9422afbd251fc0c917860f055f276fb3 gkrellm_2.3.6~rc1-1.debian.tar.xz -88e3ec4f1d98ffc674447db533db6713 gkrellm-2.3.7.tar.bz2 +0360b7dbb4715ff434d04016369eb314 gkrellm-2.3.8.tar.bz2 From 9eb4e3ea4739858cd5ede81535ee0cd7bdd4059c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 12 Oct 2016 12:32:25 +0300 Subject: [PATCH 063/100] Update to 2.3.9 --- gkrellm.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index a14f219..6280838 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: gkrellm -Version: 2.3.8 +Version: 2.3.9 Release: 1%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ @@ -12,7 +12,7 @@ Source2: gkrellm.desktop Source3: gkrellm.png Source4: gnome-gkrellm.appdata.xml Source5: make-git-snapshot.sh -Source6: http://cdn.debian.net/debian/pool/main/g/gkrellm/gkrellm_2.3.6~rc1-1.debian.tar.xz +Source6: http://cdn.debian.net/debian/pool/main/g/gkrellm/gkrellm_2.3.8-1.debian.tar.xz Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch @@ -166,6 +166,9 @@ fi %changelog +* Wed Oct 12 2016 Ville Skyttä - 2.3.9-1 +- Update to 2.3.9 + * Thu Sep 8 2016 Ville Skyttä - 2.3.8-1 - Update to 2.3.8 diff --git a/sources b/sources index ea14bea..90f9967 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9422afbd251fc0c917860f055f276fb3 gkrellm_2.3.6~rc1-1.debian.tar.xz -0360b7dbb4715ff434d04016369eb314 gkrellm-2.3.8.tar.bz2 +30743dfdb4e30bfbbf78efa41e819b1f gkrellm_2.3.8-1.debian.tar.xz +118d3fdb3ac03f62423367988054d2ad gkrellm-2.3.9.tar.bz2 From be030b5689ce8417e00ec813adf23a5fdaa438ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 24 Oct 2016 09:51:28 +0300 Subject: [PATCH 064/100] Update to 2.3.10 --- gkrellm.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 6280838..4339b64 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: gkrellm -Version: 2.3.9 +Version: 2.3.10 Release: 1%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ @@ -166,6 +166,9 @@ fi %changelog +* Mon Oct 24 2016 Ville Skyttä - 2.3.10-1 +- Update to 2.3.10 + * Wed Oct 12 2016 Ville Skyttä - 2.3.9-1 - Update to 2.3.9 diff --git a/sources b/sources index 90f9967..fc2e2e5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 30743dfdb4e30bfbbf78efa41e819b1f gkrellm_2.3.8-1.debian.tar.xz -118d3fdb3ac03f62423367988054d2ad gkrellm-2.3.9.tar.bz2 +ccc0b6af434542a2374e34a135ae68da gkrellm-2.3.10.tar.bz2 From 2531759c550bbb07b797474cfc5b72cde37c7b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 28 Oct 2016 09:39:14 +0300 Subject: [PATCH 065/100] %changelog spelling and whitespace fixes --- gkrellm.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 4339b64..76e6fff 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -355,7 +355,7 @@ fi - Drop integrated lmsensors and sysfs sensors patches * Thu Oct 05 2006 Christian Iseli 2.2.9-10 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Fri Sep 22 2006 Hans de Goede 2.2.9-9 - Fixup .desktop so that gkrellm actually gets shown in the menu (bz 206775) @@ -369,7 +369,7 @@ fi - Don't make -devel package require the main one as it doesn't need it - Install .desktop file with --vendor gnome to not break existing kde panel buttons, etc. -- Drop "StartupNotify=false" from .desktop to not interfere with kde's +- Drop "StartupNotify=false" from .desktop to not interfere with kde's internal startup notification - use gkrellmd as group in default gkrellmd.conf @@ -389,7 +389,7 @@ fi * Fri Jul 7 2006 Hans de Goede 2.2.9-4 - Moving to Fedora Extras, initial FE submission - Various specfile improvements / cleanups -- Remove gkrellm-wireless (will be submitted as a seperate package) +- Remove gkrellm-wireless (will be submitted as a separate package) - Use libsensors instead of DIY code to read lm_sensors sensors - Don't strip the binaries when installing so we get a usable -debuginfo rpm @@ -401,7 +401,7 @@ fi * Mon Apr 03 2006 Karsten Hopp 2.2.9-1 - update to 2.2.9 -- remove explicit UID/GUIs from useradd/groupadd (#186974) +- remove explicit UID/GUIs from useradd/groupadd (#186974) * Tue Feb 28 2006 Karsten Hopp 2.2.7-7 - BuildRequires: libSM-devel @@ -446,10 +446,10 @@ fi * Wed Mar 02 2005 Karsten Hopp 2.2.4-3 - build with gcc-4 -* Thu Feb 03 2005 Karsten Hopp 2.2.4-2 +* Thu Feb 03 2005 Karsten Hopp 2.2.4-2 - BuildRequires openssl-devel (#137548) -* Tue Nov 16 2004 Karsten Hopp 2.2.4-1 +* Tue Nov 16 2004 Karsten Hopp 2.2.4-1 - update * Mon Sep 06 2004 Karsten Hopp 2.2.2-2 @@ -470,14 +470,14 @@ fi - #123846 bogus dep - Cleanup deps, build deps, and docs -* Mon Mar 15 2004 Karsten Hopp 2.1.28-3 +* Mon Mar 15 2004 Karsten Hopp 2.1.28-3 - remove Provides: gkrellm-devel from main package (#117105) -* Thu Mar 11 2004 Karsten Hopp 2.1.28-2 +* Thu Mar 11 2004 Karsten Hopp 2.1.28-2 - don't run gkrellmd as nobody, use a unique UID (#116314) - fix chkconfig at package removal -* Wed Mar 10 2004 Karsten Hopp 2.1.28-1 +* Wed Mar 10 2004 Karsten Hopp 2.1.28-1 - update - add runlevel links with chkconfig (#107481) - use slightly patched config file from the tarball for gkrellmd From 6539ee1a5bf14b8b4d6e982942589b43c3396923 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 11:02:27 +0000 Subject: [PATCH 066/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 76e6fff..dcf8688 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -166,6 +166,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.3.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Oct 24 2016 Ville Skyttä - 2.3.10-1 - Update to 2.3.10 From 5c3ea81197f3dd5ea015fe1849922ae996084112 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 10:13:58 +0000 Subject: [PATCH 067/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index dcf8688..8eef641 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -166,6 +166,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.3.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.3.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9fdd9ef7b3a6428a39da42acf2ace40d158e3fdf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:43:39 +0000 Subject: [PATCH 068/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 8eef641..833c465 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -166,6 +166,9 @@ fi %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.3.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.3.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 0fd2f229108c95fa9df2bcf3ea1f83941b1cdcf2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:40:33 +0000 Subject: [PATCH 069/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 833c465..799b8e7 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -166,6 +166,9 @@ fi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.3.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 2.3.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 04158be475f38e074cc4bfc3785cd6119b5533e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:28:31 +0000 Subject: [PATCH 070/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 799b8e7..1b0ec76 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -166,6 +166,9 @@ fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.3.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.3.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6c13c66b0ddcff3b04272130aed1eb3ea8d9fb7a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:38:16 +0200 Subject: [PATCH 071/100] Add missing BuildRequires on gcc make[1]: cc: Command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1604115 Signed-off-by: Igor Gnatenko --- gkrellm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gkrellm.spec b/gkrellm.spec index 1b0ec76..c7b0b4b 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -16,6 +16,7 @@ Source6: http://cdn.debian.net/debian/pool/main/g/gkrellm/gkrellm_2.3.8-1 Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch +BuildRequires: gcc BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib From 7e727663bfdc069cc720ff3b290cd05bbc1ef48b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Oct 2018 00:21:02 +0100 Subject: [PATCH 072/100] Drop old sys-v mingration bits --- gkrellm.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index c7b0b4b..be5d277 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -38,7 +38,7 @@ Additional features are: Summary: The GNU Krell Monitors Server # systemd >= 186 for scriptlet macros BuildRequires: systemd >= 186 -Requires(pre): shadow-utils systemd-sysv chkconfig +Requires(pre): shadow-utils systemd Requires(post,preun,postun): systemd @@ -125,11 +125,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/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 -if [ $1 -gt 1 ] && [ ! -e %{_unitdir}/gkrellmd.service ] && \ - [ -e %{_initddir}/gkrellmd ] ; then - systemd-sysv-convert --save gkrellmd &>/dev/null - chkconfig --del gkrellmd &>/dev/null -fi : %post daemon @@ -167,6 +162,9 @@ fi %changelog +* Sun Oct 14 2018 Peter Robinson 2.3.10-7 +- Drop old sys-v mingration bits + * Fri Jul 13 2018 Fedora Release Engineering - 2.3.10-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9d5a70c8cd97a8a8bcc1b2f048ccc21501f3afd8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 12:49:00 +0100 Subject: [PATCH 073/100] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- gkrellm.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index be5d277..842b7d8 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -108,19 +108,6 @@ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/appdata appstream-util validate-relax --nonet \ $RPM_BUILD_ROOT%{_datadir}/appdata/gnome-%{name}.appdata.xml - -%post -p -posix.utime("%{_datadir}/icons/hicolor") - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %pre daemon getent group gkrellmd >/dev/null || groupadd -r gkrellmd getent passwd gkrellmd >/dev/null || \ From 8e74da1adde93448bfffe83c860bab8c4eae683f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:32:08 +0000 Subject: [PATCH 074/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 842b7d8..31ef69e 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -149,6 +149,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.3.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Oct 14 2018 Peter Robinson 2.3.10-7 - Drop old sys-v mingration bits From e10c88af634afad834d60646a57dd96ad77bac4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:33:08 +0000 Subject: [PATCH 075/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 31ef69e..1bc0114 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -149,6 +149,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.3.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.3.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2adcd2384b31e6db9eb000954268dbc4287c6be6 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 25 Aug 2019 17:38:14 -0400 Subject: [PATCH 076/100] Update to 2.3.11 --- 04_fix_manpage_hyphen.patch | 147 +++++++++++++++++++++++++++++++++ 05_bts437033_fix_strip.patch | 17 ++++ 10_fix_glib_underlinkage.patch | 15 ++++ gkrellm.spec | 22 ++--- sources | 3 +- 5 files changed, 191 insertions(+), 13 deletions(-) create mode 100644 04_fix_manpage_hyphen.patch create mode 100644 05_bts437033_fix_strip.patch create mode 100644 10_fix_glib_underlinkage.patch diff --git a/04_fix_manpage_hyphen.patch b/04_fix_manpage_hyphen.patch new file mode 100644 index 0000000..dd06644 --- /dev/null +++ b/04_fix_manpage_hyphen.patch @@ -0,0 +1,147 @@ +Author: Sandro Tosi +Description: fix errors in manpage +Index: gkrellm/gkrellm.1 +=================================================================== +--- gkrellm.orig/gkrellm.1 2010-10-21 21:13:40.792904598 +0200 ++++ gkrellm/gkrellm.1 2010-10-21 21:13:48.004905141 +0200 +@@ -145,7 +145,7 @@ + .I "Btn 2" + Slide + .B gkrellm +-window shut (Btn1 if -m2 option). ++window shut (Btn1 if \-m2 option). + .TP + .I "Btn 3" + Popup main menu. +@@ -281,8 +281,8 @@ + move to an + .I (x,y) + position on the screen at startup. Standard X window geometry position +-(not size) formats are parsed, ie +x+y -x+y +x-y -x-y. Except, negative +-geometry positions are not recognized (ie +-x--y ). ++(not size) formats are parsed, ie +x+y \-x+y +x\-y \-x\-y. Except, negative ++geometry positions are not recognized (ie +-x\-\-y ). + .TP + .B \-wm + Forces +@@ -438,7 +438,7 @@ + .PP + .RS + .nf +-ln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem ++ln \-s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem + .fi + .RE + .IP +@@ -589,7 +589,7 @@ + .PP + .RS + .nf +-sudo /bin/mount -t msdos /dev/fd0 /mnt/A ++sudo /bin/mount \-t msdos /dev/fd0 /mnt/A + sudo /bin/umount /mnt/A + .fi + .RE +@@ -701,7 +701,7 @@ + .PP + .RS + .nf +-mbmon -r -P port-number ++mbmon \-r \-P port\-number + .fi + .RE + .PP +@@ -741,7 +741,7 @@ + .PP + .RS + .nf +-gkrellm --without-libsensors ++gkrellm \-\-without\-libsensors + .fi + .RE + .PP +@@ -814,7 +814,7 @@ + .PP + .RS + .nf +-gkrellm -d 0x80 ++gkrellm \-d 0x80 + .fi + .RE + .PP +@@ -1036,7 +1036,7 @@ + compute in5 (1 + 160/35.7)*@ - (160/35.7)*in0, ... + + so the correction factor is (1 + 160/35.7) = 5.48 +-and the correction offset is -(160/35.7) = -4.48 ++and the correction offset is \-(160/35.7) = \-4.48 + and the voltage reference Vref is in0 + .fi + .RE +@@ -1053,16 +1053,16 @@ + in2 (22.1/30 + 1) * @ 1.737 0 - + in3 (2.8/1.9) * @ 1.474 0 - + in4 (160/30.1 + 1) * @ 6.316 0 - +- in5 (160/35.7)*(@-in0) + @ 5.482 -4.482 in0 +- in6 (36/16.2)*(@-in0) + @ 3.222 -2.222 in0 ++ in5 (160/35.7)*(@\-in0) + @ 5.482 \-4.482 in0 ++ in6 (36/16.2)*(@\-in0) + @ 3.222 \-2.222 in0 + + LM78 in3 ((6.8/10)+1)*@ 1.68 0 - + in4 ((28/10)+1)*@ 3.8 0 - +- in5 -(210/60.4)*@ -3.477 0 - +- in6 -(90.9/60.4)*@ -1.505 0 - ++ in5 \-(210/60.4)*@ \-3.477 0 - ++ in6 \-(90.9/60.4)*@ \-1.505 0 - + +-w83782 in5 (5.14 * @) - 14.91 5.14 -14.91 - +- in6 (3.14 * @) - 7.71 3.14 -7.71 - ++w83782 in5 (5.14 * @) \- 14.91 5.14 \-14.91 - ++ in6 (3.14 * @) \- 7.71 3.14 \-7.71 - + + .fi + .RE +@@ -1077,7 +1077,7 @@ + the command must be run in a terminal window such as xterm, eterm, + or Gnome terminal. For example running the "top" command would take: + .TP +-xterm -e top ++xterm \-e top + .PP + You can use the command launching feature to run commands related to + monitoring functions, or you may use it to have a convenient launch +@@ -1094,13 +1094,13 @@ + gnomecal, evolution, or ical + .TP + .I CPU: +-xterm -e top or gps or gtop ++xterm \-e top or gps or gtop + .TP + .I inet: +-gftp or xterm -e ftpwho ++gftp or xterm \-e ftpwho + .TP + .I net: +-mozilla, galeon, skipstone, or xterm -e slrn -C- ++mozilla, galeon, skipstone, or xterm \-e slrn \-C\- + .PP + And so on... Tooltips can be set up for these commands. + +@@ -1122,7 +1122,7 @@ + alert warn command could just speak the current temperature with: + .nf + +- sh -c "echo warning C P U is at $s degrees | esddsp festival --tts" ++ sh \-c "echo warning C P U is at $s degrees | esddsp festival \-\-tts" + + .fi + Assuming you have esd running. +@@ -1158,7 +1158,7 @@ + .PP + .RS + .nf +-gkrellm -t path_to_theme ++gkrellm \-t path_to_theme + .fi + .RE + .PP diff --git a/05_bts437033_fix_strip.patch b/05_bts437033_fix_strip.patch new file mode 100644 index 0000000..1fc0417 --- /dev/null +++ b/05_bts437033_fix_strip.patch @@ -0,0 +1,17 @@ +Author: Sandro Tosi +Description: correctly handle stripping as per Debian policy +Index: gkrellm/Makefile +=================================================================== +--- gkrellm.orig/Makefile 2010-10-21 21:13:40.728904771 +0200 ++++ gkrellm/Makefile 2010-10-21 21:14:27.764905757 +0200 +@@ -152,8 +152,8 @@ + + install: install_gkrellm.pc + (cd po && ${MAKE} install) +- (cd src && ${MAKE} install) +- (cd server && ${MAKE} install) ++ (cd src && ${MAKE} install STRIP="") ++ (cd server && ${MAKE} install STRIP="") + + uninstall: + (cd po && ${MAKE} uninstall) diff --git a/10_fix_glib_underlinkage.patch b/10_fix_glib_underlinkage.patch new file mode 100644 index 0000000..1fcdaa5 --- /dev/null +++ b/10_fix_glib_underlinkage.patch @@ -0,0 +1,15 @@ +Description: add missing library to be linked to + +Index: gkrellm-2.3.5/src/Makefile +=================================================================== +--- gkrellm-2.3.5.orig/src/Makefile 2010-10-02 12:21:01.000000000 -0400 ++++ gkrellm-2.3.5/src/Makefile 2013-04-08 07:34:13.851640490 -0400 +@@ -75,7 +75,7 @@ + ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT + + LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\ +- $(NTLM_LIBS) $(MATH_LIB) ++ $(NTLM_LIBS) $(MATH_LIB) -lgmodule-2.0 + + ifeq ($(debug),1) + FLAGS += -g diff --git a/gkrellm.spec b/gkrellm.spec index 1bc0114..287d82f 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: gkrellm -Version: 2.3.10 -Release: 9%{?dist} +Version: 2.3.11 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -12,10 +12,13 @@ Source2: gkrellm.desktop Source3: gkrellm.png Source4: gnome-gkrellm.appdata.xml Source5: make-git-snapshot.sh -Source6: http://cdn.debian.net/debian/pool/main/g/gkrellm/gkrellm_2.3.8-1.debian.tar.xz Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch +# Debian patches from https://sources.debian.org/patches/gkrellm/2.3.10-2/ +Patch10: 04_fix_manpage_hyphen.patch +Patch11: 05_bts437033_fix_strip.patch +Patch12: 10_fix_glib_underlinkage.patch BuildRequires: gcc BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib @@ -57,14 +60,7 @@ Development files for the GNU Krell Monitors. %prep -%setup -q -a 6 -%patch1 -p1 -z .config -%patch2 -p1 -z .sansfont -%patch3 -p1 -z .width -rm debian/patches/01_gkrellmd.conf.patch -for i in debian/patches/*_*.patch; do - patch -p1 --fuzz=0 < $i -done +%autosetup -p1 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html \ src/gkrellm.h server/gkrellmd.h; do @@ -149,6 +145,10 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Sun Aug 25 2019 Adam Goode - 2.3.11-1 +- Update to 2.3.11 (#1742316) +- Include Debian patches directly instead of via source + * Thu Jul 25 2019 Fedora Release Engineering - 2.3.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index fc2e2e5..30e626a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -30743dfdb4e30bfbbf78efa41e819b1f gkrellm_2.3.8-1.debian.tar.xz -ccc0b6af434542a2374e34a135ae68da gkrellm-2.3.10.tar.bz2 +SHA512 (gkrellm-2.3.11.tar.bz2) = e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9 From c9d789d67f5b768df973eb088e2461e53b7b5da6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 22:03:33 +0000 Subject: [PATCH 077/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 287d82f..5875f00 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -145,6 +145,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Aug 25 2019 Adam Goode - 2.3.11-1 - Update to 2.3.11 (#1742316) - Include Debian patches directly instead of via source From 109b594a8f922eac9c8b27762951f2fadd0d6b34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 20:09:18 +0000 Subject: [PATCH 078/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 5875f00..a039fa6 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -145,6 +145,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.3.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 961ccffc008842833174f863858cdf4525e9cf09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:53:27 +0000 Subject: [PATCH 079/100] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index a039fa6..a438f2e 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -145,6 +145,10 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.3.11-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.3.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 12858b924663aa74a9c7d55292a89fbf11766f15 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Dec 2020 23:23:45 +0000 Subject: [PATCH 080/100] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- gkrellm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gkrellm.spec b/gkrellm.spec index a438f2e..2ac27e0 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -41,6 +41,7 @@ Additional features are: Summary: The GNU Krell Monitors Server # systemd >= 186 for scriptlet macros BuildRequires: systemd >= 186 +BuildRequires: make Requires(pre): shadow-utils systemd Requires(post,preun,postun): systemd From 2a3aaf3b2acb040b1335fe01a6fbd67407014dae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:12:50 +0000 Subject: [PATCH 081/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 2ac27e0..f9a2376 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 2.3.11-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9b753a88ff5d597b8435130e0d39484521d5baf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:44 +0100 Subject: [PATCH 082/100] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- gkrellm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index f9a2376..8046de2 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,10 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.3.11-6 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 2.3.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8146720b7ebeb2b158ae8dbdb5d397cf1fba0b94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:45:43 +0000 Subject: [PATCH 083/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 8046de2..3eae4ea 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.3.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.3.11-6 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 59e8c8c3f6dd2cbbde406b7f53fe1d0753b871d8 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:02:41 +0200 Subject: [PATCH 084/100] Rebuilt with OpenSSL 3.0.0 --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 3eae4ea..0cadb6b 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.3.11-8 +- Rebuilt with OpenSSL 3.0.0 + * Thu Jul 22 2021 Fedora Release Engineering - 2.3.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f171363416b6c3796a0fc98640a646d961fc8d29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 06:08:29 +0000 Subject: [PATCH 085/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 0cadb6b..0fbfe5f 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.3.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 2.3.11-8 - Rebuilt with OpenSSL 3.0.0 From 317cc10e26cefbe8e778784062264c3243b6a31b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:22:57 +0000 Subject: [PATCH 086/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 0fbfe5f..6d0437d 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.3.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.3.11-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f1829c7c02d4b93e0f023614fa7e358e8c0d0a9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 05:02:03 +0000 Subject: [PATCH 087/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 6d0437d..e54430a 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.3.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.3.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 720d8e34a06861a1f4aa673837a8689d4d661a1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 23:08:58 +0000 Subject: [PATCH 088/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index e54430a..11174b2 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.3.11-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 2.3.11-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b9fbbea3dca5be0a3f43951e11af746c15c31b99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:29:12 +0000 Subject: [PATCH 089/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 11174b2..45a53fe 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.3.11-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.3.11-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7ec65a5e2a57463751eea6d0f809db1bd6cfe074 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 14:58:43 +0000 Subject: [PATCH 090/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 45a53fe..ed729cd 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.3.11-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.3.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f3cd2d6e721207ef782a449b0251c4cf33be29ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:31:00 +0000 Subject: [PATCH 091/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index ed729cd..4a87f08 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.3.11-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.3.11-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0b25e2029a978b07d3fa7b5dd95f6dfa6caf3a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 11:57:32 +0200 Subject: [PATCH 092/100] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- gkrellm.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 4a87f08..2a5080c 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,9 +2,10 @@ Name: gkrellm Version: 2.3.11 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Multiple stacked system monitors in one process -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: http://www.gkrellm.net/ Source0: http://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2 Source1: gkrellmd.service @@ -146,6 +147,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 25 2024 Miroslav Suchý - 2.3.11-16 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 2.3.11-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c6e19dc5fde627e428911cc11ae6d21ecd8836fa Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 25 Jul 2024 23:50:12 -0700 Subject: [PATCH 093/100] Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276464) --- gkrellm.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 2a5080c..3f5324b 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Multiple stacked system monitors in one process # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -23,6 +23,9 @@ Patch12: 10_fix_glib_underlinkage.patch BuildRequires: gcc BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra%{?_isa} +%endif %description GKrellM charts CPU, load, Disk, and all active net interfaces @@ -147,6 +150,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Fri Jul 26 2024 Benjamin Gilbert - 2.3.11-17 +- Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276464) + * Thu Jul 25 2024 Miroslav Suchý - 2.3.11-16 - convert license to SPDX From ecc7a19801db8a8aba8f478df389e37f11ac6a63 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 18 Dec 2024 12:50:51 -0800 Subject: [PATCH 094/100] Rebuild for new libntlm soname bump. Rebuild for new libntlm soname bump. Rebuild for new libntlm soname bump. --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 3f5324b..12bd05c 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Multiple stacked system monitors in one process # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -150,6 +150,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Wed Dec 18 2024 Kevin Fenzi - 2.3.11-18 +- Rebuild for new libntlm soname bump. + * Fri Jul 26 2024 Benjamin Gilbert - 2.3.11-17 - Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276464) From 2e57b233bde72622bca003da52b58dcc3e761e61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:10:10 +0000 Subject: [PATCH 095/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 12bd05c..70be7d5 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Multiple stacked system monitors in one process # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -150,6 +150,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.3.11-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Dec 18 2024 Kevin Fenzi - 2.3.11-18 - Rebuild for new libntlm soname bump. From 5d19a0e18c7ed292fd8de99c4712622e7ce4f642 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Mon, 20 Jan 2025 01:41:49 -0500 Subject: [PATCH 096/100] New upstream release and modernize spec file --- 04_fix_manpage_hyphen.patch | 147 ---- 05_bts437033_fix_strip.patch | 17 - 10_fix_glib_underlinkage.patch | 15 - gkrellm-2.2.4-sansfont.patch | 17 - ...config.patch => gkrellm-2.4.0-config.patch | 18 - ...7-width.patch => gkrellm-2.4.0-width.patch | 2 +- gkrellm.desktop | 11 - gkrellm.png | Bin 1862 -> 0 bytes gkrellm.spec | 647 +----------------- gkrellmd.service | 10 - gnome-gkrellm.appdata.xml | 33 - sources | 2 +- 12 files changed, 34 insertions(+), 885 deletions(-) delete mode 100644 04_fix_manpage_hyphen.patch delete mode 100644 05_bts437033_fix_strip.patch delete mode 100644 10_fix_glib_underlinkage.patch delete mode 100644 gkrellm-2.2.4-sansfont.patch rename gkrellm-2.3.5-config.patch => gkrellm-2.4.0-config.patch (55%) rename gkrellm-2.2.7-width.patch => gkrellm-2.4.0-width.patch (94%) delete mode 100644 gkrellm.desktop delete mode 100644 gkrellm.png delete mode 100644 gkrellmd.service delete mode 100644 gnome-gkrellm.appdata.xml diff --git a/04_fix_manpage_hyphen.patch b/04_fix_manpage_hyphen.patch deleted file mode 100644 index dd06644..0000000 --- a/04_fix_manpage_hyphen.patch +++ /dev/null @@ -1,147 +0,0 @@ -Author: Sandro Tosi -Description: fix errors in manpage -Index: gkrellm/gkrellm.1 -=================================================================== ---- gkrellm.orig/gkrellm.1 2010-10-21 21:13:40.792904598 +0200 -+++ gkrellm/gkrellm.1 2010-10-21 21:13:48.004905141 +0200 -@@ -145,7 +145,7 @@ - .I "Btn 2" - Slide - .B gkrellm --window shut (Btn1 if -m2 option). -+window shut (Btn1 if \-m2 option). - .TP - .I "Btn 3" - Popup main menu. -@@ -281,8 +281,8 @@ - move to an - .I (x,y) - position on the screen at startup. Standard X window geometry position --(not size) formats are parsed, ie +x+y -x+y +x-y -x-y. Except, negative --geometry positions are not recognized (ie +-x--y ). -+(not size) formats are parsed, ie +x+y \-x+y +x\-y \-x\-y. Except, negative -+geometry positions are not recognized (ie +-x\-\-y ). - .TP - .B \-wm - Forces -@@ -438,7 +438,7 @@ - .PP - .RS - .nf --ln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem -+ln \-s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem - .fi - .RE - .IP -@@ -589,7 +589,7 @@ - .PP - .RS - .nf --sudo /bin/mount -t msdos /dev/fd0 /mnt/A -+sudo /bin/mount \-t msdos /dev/fd0 /mnt/A - sudo /bin/umount /mnt/A - .fi - .RE -@@ -701,7 +701,7 @@ - .PP - .RS - .nf --mbmon -r -P port-number -+mbmon \-r \-P port\-number - .fi - .RE - .PP -@@ -741,7 +741,7 @@ - .PP - .RS - .nf --gkrellm --without-libsensors -+gkrellm \-\-without\-libsensors - .fi - .RE - .PP -@@ -814,7 +814,7 @@ - .PP - .RS - .nf --gkrellm -d 0x80 -+gkrellm \-d 0x80 - .fi - .RE - .PP -@@ -1036,7 +1036,7 @@ - compute in5 (1 + 160/35.7)*@ - (160/35.7)*in0, ... - - so the correction factor is (1 + 160/35.7) = 5.48 --and the correction offset is -(160/35.7) = -4.48 -+and the correction offset is \-(160/35.7) = \-4.48 - and the voltage reference Vref is in0 - .fi - .RE -@@ -1053,16 +1053,16 @@ - in2 (22.1/30 + 1) * @ 1.737 0 - - in3 (2.8/1.9) * @ 1.474 0 - - in4 (160/30.1 + 1) * @ 6.316 0 - -- in5 (160/35.7)*(@-in0) + @ 5.482 -4.482 in0 -- in6 (36/16.2)*(@-in0) + @ 3.222 -2.222 in0 -+ in5 (160/35.7)*(@\-in0) + @ 5.482 \-4.482 in0 -+ in6 (36/16.2)*(@\-in0) + @ 3.222 \-2.222 in0 - - LM78 in3 ((6.8/10)+1)*@ 1.68 0 - - in4 ((28/10)+1)*@ 3.8 0 - -- in5 -(210/60.4)*@ -3.477 0 - -- in6 -(90.9/60.4)*@ -1.505 0 - -+ in5 \-(210/60.4)*@ \-3.477 0 - -+ in6 \-(90.9/60.4)*@ \-1.505 0 - - --w83782 in5 (5.14 * @) - 14.91 5.14 -14.91 - -- in6 (3.14 * @) - 7.71 3.14 -7.71 - -+w83782 in5 (5.14 * @) \- 14.91 5.14 \-14.91 - -+ in6 (3.14 * @) \- 7.71 3.14 \-7.71 - - - .fi - .RE -@@ -1077,7 +1077,7 @@ - the command must be run in a terminal window such as xterm, eterm, - or Gnome terminal. For example running the "top" command would take: - .TP --xterm -e top -+xterm \-e top - .PP - You can use the command launching feature to run commands related to - monitoring functions, or you may use it to have a convenient launch -@@ -1094,13 +1094,13 @@ - gnomecal, evolution, or ical - .TP - .I CPU: --xterm -e top or gps or gtop -+xterm \-e top or gps or gtop - .TP - .I inet: --gftp or xterm -e ftpwho -+gftp or xterm \-e ftpwho - .TP - .I net: --mozilla, galeon, skipstone, or xterm -e slrn -C- -+mozilla, galeon, skipstone, or xterm \-e slrn \-C\- - .PP - And so on... Tooltips can be set up for these commands. - -@@ -1122,7 +1122,7 @@ - alert warn command could just speak the current temperature with: - .nf - -- sh -c "echo warning C P U is at $s degrees | esddsp festival --tts" -+ sh \-c "echo warning C P U is at $s degrees | esddsp festival \-\-tts" - - .fi - Assuming you have esd running. -@@ -1158,7 +1158,7 @@ - .PP - .RS - .nf --gkrellm -t path_to_theme -+gkrellm \-t path_to_theme - .fi - .RE - .PP diff --git a/05_bts437033_fix_strip.patch b/05_bts437033_fix_strip.patch deleted file mode 100644 index 1fc0417..0000000 --- a/05_bts437033_fix_strip.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: Sandro Tosi -Description: correctly handle stripping as per Debian policy -Index: gkrellm/Makefile -=================================================================== ---- gkrellm.orig/Makefile 2010-10-21 21:13:40.728904771 +0200 -+++ gkrellm/Makefile 2010-10-21 21:14:27.764905757 +0200 -@@ -152,8 +152,8 @@ - - install: install_gkrellm.pc - (cd po && ${MAKE} install) -- (cd src && ${MAKE} install) -- (cd server && ${MAKE} install) -+ (cd src && ${MAKE} install STRIP="") -+ (cd server && ${MAKE} install STRIP="") - - uninstall: - (cd po && ${MAKE} uninstall) diff --git a/10_fix_glib_underlinkage.patch b/10_fix_glib_underlinkage.patch deleted file mode 100644 index 1fcdaa5..0000000 --- a/10_fix_glib_underlinkage.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: add missing library to be linked to - -Index: gkrellm-2.3.5/src/Makefile -=================================================================== ---- gkrellm-2.3.5.orig/src/Makefile 2010-10-02 12:21:01.000000000 -0400 -+++ gkrellm-2.3.5/src/Makefile 2013-04-08 07:34:13.851640490 -0400 -@@ -75,7 +75,7 @@ - ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT - - LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\ -- $(NTLM_LIBS) $(MATH_LIB) -+ $(NTLM_LIBS) $(MATH_LIB) -lgmodule-2.0 - - ifeq ($(debug),1) - FLAGS += -g diff --git a/gkrellm-2.2.4-sansfont.patch b/gkrellm-2.2.4-sansfont.patch deleted file mode 100644 index 460eb5e..0000000 --- a/gkrellm-2.2.4-sansfont.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- gkrellm-2.2.4/src/gui.c.font 2005-05-17 15:37:16.000000000 +0200 -+++ gkrellm-2.2.4/src/gui.c 2005-05-17 15:37:46.000000000 +0200 -@@ -1575,11 +1575,11 @@ - if (!_GK.theme_path || !g_file_test(_GK.theme_path, G_FILE_TEST_IS_DIR)) - gkrellm_dup_string(&_GK.theme_path, ""); - if (!large_font.string) -- gkrellm_dup_string(&large_font.string, "Serif 11"); -+ gkrellm_dup_string(&large_font.string, "Sans 11"); - if (!normal_font.string) -- gkrellm_dup_string(&normal_font.string, "Serif 9"); -+ gkrellm_dup_string(&normal_font.string, "Sans 9"); - if (!small_font.string) -- gkrellm_dup_string(&small_font.string, "Serif 8"); -+ gkrellm_dup_string(&small_font.string, "Sans 8"); - } - - diff --git a/gkrellm-2.3.5-config.patch b/gkrellm-2.4.0-config.patch similarity index 55% rename from gkrellm-2.3.5-config.patch rename to gkrellm-2.4.0-config.patch index c623059..4d85e99 100644 --- a/gkrellm-2.3.5-config.patch +++ b/gkrellm-2.4.0-config.patch @@ -23,21 +23,3 @@ diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd # Create a PID file for the running gkrellmd. Default is no PID file. # NOTE: Option ignored on Windows -@@ -76,7 +77,7 @@ - # 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. - # --#io-timeout 5 -+io-timeout 5 - - # Configure gkrellm clients to attempt automatic reconnects to a - # gkrellmd server every reconnect-timeout seconds after a disconnected -@@ -85,7 +86,7 @@ - # 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. - # --#reconnect-timeout 5 -+reconnect-timeout 5 - - # Server side local mailbox counts can be sent to gkrellm clients. List here - # paths to mbox, MH mail, or Maildir style mailboxes. diff --git a/gkrellm-2.2.7-width.patch b/gkrellm-2.4.0-width.patch similarity index 94% rename from gkrellm-2.2.7-width.patch rename to gkrellm-2.4.0-width.patch index c7fc220..3140f13 100644 --- a/gkrellm-2.2.7-width.patch +++ b/gkrellm-2.4.0-width.patch @@ -1,7 +1,7 @@ --- gkrellm-2.2.7/src/gkrellm.h.width 2005-06-09 12:48:34.000000000 +0200 +++ gkrellm-2.2.7/src/gkrellm.h 2005-06-09 12:48:37.000000000 +0200 @@ -518,7 +518,7 @@ - GkrellmCallback; + GkrellmPanel; -#define CHART_WIDTH_MAX 1000 diff --git a/gkrellm.desktop b/gkrellm.desktop deleted file mode 100644 index 984b936..0000000 --- a/gkrellm.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=GKrellM System Monitor -Comment=Monitor for CPU, memory, disks, network, mail -Exec=gkrellm -Icon=gkrellm -Terminal=false -Type=Application -Categories=System; -StartupNotify=true -StartupWMClass=gkrellm -Keywords=system;monitor;cpu;memory;disks;network; diff --git a/gkrellm.png b/gkrellm.png deleted file mode 100644 index ce3be278eb1dd01a8f5ad6f073612d4de9cd6fd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1862 zcmV-M2f6r(P)kd!8a65(EGi}< zE*>H-9yu;9EiW28Fd-~4BqB5tNHiimHZLtUHa0g6LpUNyIwnUtEG0TRIzB2vJ}fjo zE+jrODn2(cLJCqsDl$SkHA5>uLn}^0F)BnrJw_g0Mk-oL4qi$YQc5mXOBPm3Nk&XE zTuu^RP9AnnHb+i2UQReJQc_Y>CU{ghTvSa+RUUj+Hf>otZdp@LS`u_xKQ&%LI$$(> zU_EqTU|?Y)h+!;(WI{}2LUUwBLS`OvW=cM29(HIdh-n&+YDQjbM}ll6jBG)QZc0jS zZf3uCiZ!r`RI-Y4T8mz$j9ie7PPUFFzm6=lj(&2HTeXp7sF7u}l3|CF zRlAll$d+WDmTIw=Zm*hN!kT7~nr51sX?mP)fSw-4o<7c=YM!2Osh)CHpKxiPc(tG_ zv!HO4q9V$oZNZ{?h^2U^rF(Ryc$}wzwyKhXs+x|fo|>yl)U1PRtcJR-Qr50|&8~}e zu9AAMHQKO~m9dPxvWA|rlFGA-tF|J}wqDw{j-I)hi@BQ1x=P}@QqsDH*1DRay-wS` zkk-C3*1m1uzM6)>qME>?(Z+V-#;U5us=COl*vf+B%AVfJwARjQ;?B0R(ZRdYlIGH< z=F+~#(!Si&m+RHE=-8g@+QR7C%EH~q>)z7l-@WhRw({cA%HrJC=GgG&+TQ2F_Uhu^ z?b7z{&i3)$`tjxV_3rui>ihWe`26|&ql}Zh00001bW%=J06^y0W&i*L07*naRCodH z&jXCK+Z_ks=bSmC9V}|ww!%iWZQG4%+qP}ncCT&oTh6!h`qXWl8&^+$@t^+hKU08f zx@e9^zzrO2?OJG&M)l(Y5R||JeD=3qGYLHtJ!4{?bm)Z zZ`O)qB&I(TpL^D|hW*LPcsgGhiz}BKtPd}idhaPdR?mH>^4hs$e^Y;_jk+jKN^rUM}O`d4e{W(q6KyT&&lwYj-n$m zh&j@%?ELzVXEl)Y+8%AM4bUVEnu>q@(2;B(*ebxiAGX}978eu?d*yDsor|J5xUasr zt&YSR4Gmoe`hVCQt*l)uOvkf0n51cpgJJ01%kCdaB7^~PKXf5L(4dAr22kfM#uvsWTPaHcgMqm#5{+F4nl`+dFtr{q>9)X5XsT}K*w`kMr06d_7vlXaz&X&~16Rya^)i#;f{H$g zAwa^EKb(BxvYC+BdFk_VzF_aDltP`F9+2tRm)tAJA*sjfXD>@?@PI46YC0Yd2JgJb z>ZkAU-5>n=4o4hw!W~Yy!)*P)9cHVG#cXvptIxSZ`mf~|Ng~TNIaEJnWwe)Fu0M->T|>a?S`ef5m`8Se$&l%Bf(f%b7eQ9ZJ={2?KG>lH+s1g=-! zp^KC+xOsgmasWn(jZOGP2(i13Ti|eC5pZRXtty2(-+|bzEt=G%u1n1jtzO9C@I&Df zzCeJ>mO4!U$b-JMy0_Mh(y$z2g?5N9_`i$hPXaaM6mN^d`2YX_07*qoM6N<$f^6G> A5C8xG diff --git a/gkrellm.spec b/gkrellm.spec index 70be7d5..1203e23 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,31 +1,17 @@ -%global _hardened_build 1 - Name: gkrellm -Version: 2.3.11 -Release: 19%{?dist} +Version: 2.4.0 +Release: %autorelease Summary: Multiple stacked system monitors in one process -# Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later -URL: http://www.gkrellm.net/ -Source0: http://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2 -Source1: gkrellmd.service -Source2: gkrellm.desktop -Source3: gkrellm.png -Source4: gnome-gkrellm.appdata.xml +URL: https://gkrellm.srcbox.net/ +Source0: https://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2 Source5: make-git-snapshot.sh -Patch1: gkrellm-2.3.5-config.patch -Patch2: gkrellm-2.2.4-sansfont.patch -Patch3: gkrellm-2.2.7-width.patch -# Debian patches from https://sources.debian.org/patches/gkrellm/2.3.10-2/ -Patch10: 04_fix_manpage_hyphen.patch -Patch11: 05_bts437033_fix_strip.patch -Patch12: 10_fix_glib_underlinkage.patch +Patch1: gkrellm-2.4.0-config.patch +Patch3: gkrellm-2.4.0-width.patch BuildRequires: gcc BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib -%if 0%{?fedora} >= 41 Requires: gdk-pixbuf2-modules-extra%{?_isa} -%endif %description GKrellM charts CPU, load, Disk, and all active net interfaces @@ -67,7 +53,7 @@ Development files for the GNU Krell Monitors. %prep %autosetup -p1 -for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html \ +for i in gkrellmd.1 gkrellm.1 README Changelog.OLD Changelog-plugins.html \ src/gkrellm.h server/gkrellmd.h; do sed -i -e "s@/usr/lib/gkrellm2*/plugins@%{_libdir}/gkrellm2/plugins@" $i sed -i -e "s@/usr/local/lib/gkrellm2*/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i @@ -75,39 +61,33 @@ done %build -make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ +make %{?_smp_mflags} PREFIX=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ + INCLUDEDIR=%{_includedir} \ + CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-error=incompatible-pointer-types" \ LDFLAGS="$RPM_LD_FLAGS" %install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/gkrellm2/themes -mkdir -p $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins +mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes +mkdir -p %{buildroot}%{_libdir}/gkrellm2/plugins -make install \ - LOCALEDIR=$RPM_BUILD_ROOT%{_datadir}/locale \ - INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} \ - SINSTALLDIR=$RPM_BUILD_ROOT%{_sbindir} \ - MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \ - PKGCONFIGDIR=$RPM_BUILD_ROOT%{_libdir}/pkgconfig \ - INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} -install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/gkrellmd.service -install -Dpm 644 server/gkrellmd.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/gkrellmd.conf +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} \ + LOCALEDIR=%{buildroot}%{_datadir}/locale \ + INSTALLDIR=%{buildroot}%{_bindir} \ + SINSTALLDIR=%{buildroot}%{_sbindir} \ + MANDIR=%{buildroot}%{_mandir}/man1 \ + PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig \ + INCLUDEDIR=%{buildroot}%{_includedir} \ + CFGDIR=%{buildroot}%{_sysconfdir} %find_lang %name -# below is the desktop file and icon stuff. -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor gnome \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE2} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -install -p -m 644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/appdata -appstream-util validate-relax --nonet \ - $RPM_BUILD_ROOT%{_datadir}/appdata/gnome-%{name}.appdata.xml +# AppData file MUST be named with the same root as the .desktop file. +mv %{buildroot}%{_datadir}/applications/gkrellm.desktop \ + %{buildroot}%{_datadir}/applications/net.srcbox.gkrellm.GKrellM.desktop + +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml + %pre daemon getent group gkrellmd >/dev/null || groupadd -r gkrellmd @@ -127,14 +107,14 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %files -f %{name}.lang %license COPYRIGHT -%doc Changelog README Themes.html +%doc CHANGELOG.md Changelog.OLD README Themes.html %{_bindir}/%{name} %{_libdir}/gkrellm2 %{_datadir}/gkrellm2 %{_mandir}/man1/%{name}.1* -%{_datadir}/appdata/gnome-%{name}.appdata.xml -%{_datadir}/applications/gnome-%{name}.desktop -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_metainfodir}/*.metainfo.xml +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png %files devel %license %{_licensedir}/%{name}* @@ -150,567 +130,4 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog -* Thu Jan 16 2025 Fedora Release Engineering - 2.3.11-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Dec 18 2024 Kevin Fenzi - 2.3.11-18 -- Rebuild for new libntlm soname bump. - -* Fri Jul 26 2024 Benjamin Gilbert - 2.3.11-17 -- Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276464) - -* Thu Jul 25 2024 Miroslav Suchý - 2.3.11-16 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 2.3.11-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 2.3.11-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.3.11-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 2.3.11-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 2.3.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.3.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2.3.11-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Sep 14 2021 Sahana Prasad - 2.3.11-8 -- Rebuilt with OpenSSL 3.0.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 2.3.11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.3.11-6 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.3.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 2.3.11-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.3.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 2.3.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Aug 25 2019 Adam Goode - 2.3.11-1 -- Update to 2.3.11 (#1742316) -- Include Debian patches directly instead of via source - -* Thu Jul 25 2019 Fedora Release Engineering - 2.3.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.3.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Oct 14 2018 Peter Robinson 2.3.10-7 -- Drop old sys-v mingration bits - -* Fri Jul 13 2018 Fedora Release Engineering - 2.3.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.3.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 2.3.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.3.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.3.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 24 2016 Ville Skyttä - 2.3.10-1 -- Update to 2.3.10 - -* Wed Oct 12 2016 Ville Skyttä - 2.3.9-1 -- Update to 2.3.9 - -* Thu Sep 8 2016 Ville Skyttä - 2.3.8-1 -- Update to 2.3.8 - -* Thu Jul 14 2016 Ville Skyttä - 2.3.7-2 -- Patch to fix gkrellm.pc (#1356479) -- Optimize gkrellm.png with zopflipng - -* Sat Jun 4 2016 Ville Skyttä - 2.3.7-1 -- Update to 2.3.7 -- Make gkrellmd.conf noreplace again - -* Fri Feb 26 2016 Hans de Goede - 2.3.6-0.1.rc1.git20160226 -- Update to a 2.3.6-rc git snapshot for misc. fixes (inspired by Debian) -- Add a bunch of patches from Debian -- Add appdata - -* Wed Feb 03 2016 Fedora Release Engineering - 2.3.5-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Oct 9 2015 Ville Skyttä - 2.3.5-23 -- Mark COPYRIGHT as %%license - -* Wed Jun 17 2015 Fedora Release Engineering - 2.3.5-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 2.3.5-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jul 12 2014 Ville Skyttä - 2.3.5-20 -- Start daemon after lm_sensors (#1117750, DaveG) -- Specfile cleanups - -* Sat Jun 07 2014 Fedora Release Engineering - 2.3.5-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Jan 10 2014 Ville Skyttä - 2.3.5-18 -- Patch daemon to allow binding to a listen address that doesn't exist yet. -- Use systemd macros in scriptlets (#850128). - -* Tue Dec 31 2013 Ville Skyttä - 2.3.5-17 -- Run icon through optipng (#1047215). - -* Wed Dec 11 2013 Ville Skyttä - 2.3.5-16 -- Use main package's doc dir for -devel and -daemon. - -* Fri Dec 6 2013 Ville Skyttä - 2.3.5-15 -- Fix build with -Werror=format-security (#1037086). - -* Sat Aug 03 2013 Fedora Release Engineering - 2.3.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 2.3.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Feb 8 2013 Ville Skyttä - 2.3.5-12 -- Systemd unit: add Documentation, remove obsolete After=syslog.target. -- Fix bogus dates in %%changelog. - -* Thu Jul 19 2012 Fedora Release Engineering - 2.3.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 23 2012 Ville Skyttä - 2.3.5-10 -- Build with hardening flags on. - -* Sun Jan 15 2012 Hans de Goede - 2.3.5-8 -- Explicitly link against gmodule-2.0 to fix building with latest glib - -* Fri Jan 13 2012 Fedora Release Engineering - 2.3.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Nov 13 2011 Ville Skyttä - 2.3.5-7 -- Build with $RPM_LD_FLAGS. -- Clean up specfile stuff no longer needed with Fedora or EL6+. - -* Mon Jun 20 2011 Ville Skyttä - 2.3.5-5 -- Migrate daemon to systemd (#661656). -- Do icon dir timestamp update in %%post with lua. - -* Tue Feb 08 2011 Fedora Release Engineering - 2.3.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 16 2010 Hans de Goede - 2.3.5-3 -- Add COPYRIGHT file to -devel and -daemon sub-packages - -* Sun Oct 24 2010 Ville Skyttä - 2.3.5-2 -- Add StartupNotify and StartupWMClass to gkrellm.desktop. - -* Sun Oct 10 2010 Hans de Goede 2.3.5-1 -- New upstream release 2.3.5 - -* Mon Jun 21 2010 Ville Skyttä - 2.3.4-3 -- Make -devel gtk2-devel dependency ISA qualified. - -* Sun Feb 14 2010 Ville Skyttä - 2.3.4-2 -- Fix build with --no-add-needed (#564850). -- Fix plugin dir defaults in installed headers. -- Build with NTLM support. - -* Tue Jan 5 2010 Hans de Goede 2.3.4-1 -- New upstream release 2.3.4 - -* Tue Dec 22 2009 Hans de Goede 2.3.3-1 -- New upstream release 2.3.3 -- Fixes the gkrellm client crash when the gkrellm server reboots (#545327) -- Drop a number of upstreamed patches - -* Sun Dec 20 2009 Hans de Goede 2.3.2-8 -- Don't crash on laptops with dead batteries (#545987) -- Don't crash with transparent themes (#549005) - -* Fri Nov 27 2009 Hans de Goede 2.3.2-7 -- Fix crash when using multiple simap/spop mailboxes (#541824) - -* Fri Aug 21 2009 Tomas Mraz - 2.3.2-6 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering - 2.3.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Mar 17 2009 Ville Skyttä - 2.3.2-4 -- Sync icon cache update scriptlets with current Fedora guidelines. - -* Tue Feb 24 2009 Fedora Release Engineering - 2.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Jan 16 2009 Tomas Mraz 2.3.2-2 -- rebuild with new openssl - -* Thu Oct 23 2008 Hans de Goede 2.3.2-1 -- New upstream release 2.3.2 -- Drop upstreamed memleak patch - -* Thu Oct 2 2008 Hans de Goede 2.3.1-6 -- Fix a small memory leak (which would accumulate over time) thanks to - Daniel Colascione for the patch (rh 464040) - -* Wed Sep 10 2008 Hans de Goede 2.3.1-5 -- Build against openssl instead of gnutls-openssl fixing symbol conflicts when - using pam_ldap (which uses openssl), this fixes rh 446860 - -* Wed Jun 25 2008 Tomas Mraz 2.3.1-4 -- rebuild with new gnutls - -* Wed Feb 13 2008 Hans de Goede 2.3.1-3 -- Fix building with latest glibc -- Rebuild for gcc 4.3 - -* Tue Dec 4 2007 Ville Skyttä - 2.3.1-2 -- Clean up desktop-file-utils 0.14 warnings. - -* Mon Dec 3 2007 Hans de Goede 2.3.1-1 -- New upstream release 2.3.1 -- Drop upstreamed gnutls and lm_sensors-3.0.0 patches - -* Wed Oct 24 2007 Hans de Goede 2.3.0-5 -- Add support for lm_sensors-3.0.0 - -* Wed Sep 5 2007 Ville Skyttä - 2.3.0-4 -- Rewrite gkrellmd init script: better LSB compliance, hddtemp - interoperability, avoidance of X error messages, general cleanup. - -* Tue Sep 4 2007 Ville Skyttä - 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 2.3.0-2 -- Update License tag for new Licensing Guidelines compliance - -* Sun Jul 22 2007 Hans de Goede 2.3.0-1 -- New upstream release 2.3.0 - -* Fri Jul 20 2007 Hans de Goede 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 2.2.10-2 -- Add special case for via 686 volt sensors (bug 213304) - -* Tue Oct 31 2006 Hans de Goede 2.2.10-1 -- New upstream release 2.2.10 -- Drop integrated lmsensors and sysfs sensors patches - -* Thu Oct 05 2006 Christian Iseli 2.2.9-10 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Fri Sep 22 2006 Hans de Goede 2.2.9-9 -- Fixup .desktop so that gkrellm actually gets shown in the menu (bz 206775) - -* Mon Aug 28 2006 Hans de Goede 2.2.9-8 -- FE6 Rebuild - -* Sun Jul 16 2006 Hans de Goede 2.2.9-7 -- Add -r to groupadd -- Add || : to the gkrellmd service related scripts (deviation from the wiki). -- Don't make -devel package require the main one as it doesn't need it -- Install .desktop file with --vendor gnome to not break existing kde panel - buttons, etc. -- Drop "StartupNotify=false" from .desktop to not interfere with kde's - internal startup notification -- use gkrellmd as group in default gkrellmd.conf - -* Sat Jul 15 2006 Hans de Goede 2.2.9-6 -- Various specfile improvements by Ville Skyttä (ville.skytta@iki.fi) -- Make the daemon package scripts match the ScriptletSnippets wiki page -- Add LSB aliases (try-restart, force-reload) to the -daemon initscript -- Add %%{?dist} to the release for consistency with other packages I maintain - -* Sat Jul 15 2006 Hans de Goede 2.2.9-5 -- Remove Obsoletes/Provides gkrellm-server -- Don't remove user on uninstall -- Only build with lm_sensors support on x86 / x86_64 since lm_sensors is not - available on other archs. -- Use %%{_sysconfdir} instead of /etc in %%install - -* Fri Jul 7 2006 Hans de Goede 2.2.9-4 -- Moving to Fedora Extras, initial FE submission -- Various specfile improvements / cleanups -- Remove gkrellm-wireless (will be submitted as a separate package) -- Use libsensors instead of DIY code to read lm_sensors sensors -- Don't strip the binaries when installing so we get a usable -debuginfo rpm - -* Mon May 22 2006 Karsten Hopp 2.2.9-3 -- fix libdir patch - -* Mon May 15 2006 Karsten Hopp 2.2.9-2 -- fix header file conflict between 32bit and 64bit archs - -* Mon Apr 03 2006 Karsten Hopp 2.2.9-1 -- update to 2.2.9 -- remove explicit UID/GUIs from useradd/groupadd (#186974) - -* Tue Feb 28 2006 Karsten Hopp 2.2.7-7 -- BuildRequires: libSM-devel - -* Wed Feb 15 2006 Karsten Hopp 2.2.7-6 -- fix chkconfig requires - -* Fri Feb 10 2006 Jesse Keating - 2.2.7-5.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 2.2.7-5.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Fri Nov 18 2005 Bill Nottingham 2.2.7-5 -- Fix references to obsolete /usr/X11R6 path - -* Wed Nov 9 2005 Tomas Mraz 2.2.7-4 -- rebuilt with new openssl - -* Tue Sep 06 2005 Karsten Hopp 2.2.7-3 -- fix path to gkrellm2 plugins on 64bit archs (#164066) - -* Thu Aug 18 2005 Florian La Roche -- the the kernel dep form a Requires: into a Conflicts: - -* Thu Jun 09 2005 Karsten Hopp 2.2.7-1 -- update to 2.2.7 -- add Requires: /sbin/chkconfig for -daemon subpackage -- allow gkrellm width up to 1600 pixel -- change spec file to valid UTF-8 (#159578) - -* Tue May 17 2005 Karsten Hopp 2.2.4-5 -- use Sans fonts (Ville Skytta, #157899) - -* Fri Apr 01 2005 Karsten Hopp 2.2.4-4 -- Include gkrellm2/plugins directories (Michael Schwendt) - #153073 - -* Wed Mar 02 2005 Karsten Hopp 2.2.4-3 -- build with gcc-4 - -* Thu Feb 03 2005 Karsten Hopp 2.2.4-2 -- BuildRequires openssl-devel (#137548) - -* Tue Nov 16 2004 Karsten Hopp 2.2.4-1 -- update - -* Mon Sep 06 2004 Karsten Hopp 2.2.2-2 -- change group of wireless subpackage (#131699) -- add icon - -* Tue Aug 03 2004 Karsten Hopp 2.2.2-1 -- update to 2.2.2 to fix pixbuf memory leak - -* Wed Jun 23 2004 Karsten Hopp 2.2.1-1 -- update to latest stable release - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Mon May 31 2004 Warren Togami 2.2.0-1 -- upgrade to 2.2.0 -- #123846 bogus dep -- Cleanup deps, build deps, and docs - -* Mon Mar 15 2004 Karsten Hopp 2.1.28-3 -- remove Provides: gkrellm-devel from main package (#117105) - -* Thu Mar 11 2004 Karsten Hopp 2.1.28-2 -- don't run gkrellmd as nobody, use a unique UID (#116314) -- fix chkconfig at package removal - -* Wed Mar 10 2004 Karsten Hopp 2.1.28-1 -- update -- add runlevel links with chkconfig (#107481) -- use slightly patched config file from the tarball for gkrellmd -- add wireless plugin - -* Wed Mar 03 2004 Karsten Hopp 2.1.26-2 -- fix -devel provision (#117105) -- remove stringfreeze hack - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Wed Feb 25 2004 Karsten Hopp 2.1.26-1 -- update to 2.1.26, which fixes sensor data being 10x to high (#115850) -- requires kernel >= 2.6.2 - -* Sat Feb 21 2004 Florian La Roche -- mv /etc/init.d -> /etc/rc.d/init.d - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Fri Jan 09 2004 Karsten Hopp 2.1.24-1 -- update to 2.1.24 - -* Mon Oct 13 2003 Karsten Hopp 2.1.21-1 -- update: -- fix temperature reads from /proc/acpi -- Use username instead of userid in session management userid property. - Fixes no session restarts in KDE 3.1.4. -- de.po update - -* Thu Oct 09 2003 Karsten Hopp 2.1.20-3 -- make it compatible with 3d party packages - -* Thu Oct 09 2003 Karsten Hopp 2.1.20-2 -- added patches from Ville Skyttä : - - Add icon for desktop entry - - Install daemon in %%{_sbindir} - - Include themes and plugins dirs in main package - - Make -daemon obsolete -server - - devel subpackage (disabled because of string freeze) - - -* Wed Oct 08 2003 Karsten Hopp 2.1.20-1 -- update to make it work with kernel 2.6 - -* Wed Oct 01 2003 Karsten Hopp 2.1.19-1 -- Update to 2.1.19, includes fix for #106073 - -* Tue Jul 08 2003 Karsten Hopp 2.1.14-3 -- run as user nobody -- fix file ownership - -* Mon Jul 07 2003 Karsten Hopp 2.1.14-2 -- add init script and config file for gkrellmd -- daemon subpackage -- fix pkgconfig file - -* Thu Jun 26 2003 Karsten Hopp 2.1.14-1 -- update to fix buffer overflow in gkrellmd_client_read - -* Wed Jun 18 2003 Karsten Hopp 2.1.13-1 -- update - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Mon May 05 2003 Karsten Hopp 2.1.9-2 -- rebuild - -* Thu Apr 10 2003 Karsten Hopp 2.1.9-1 -- update to 2.1.9 -- daily/weekly/monthly transfer stats - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 14 2003 Karsten Hopp 2.1.5-2 -- rename menu entry (#81876) - -* Sun Jan 12 2003 Karsten Hopp 2.1.5-1 -- update (#81620) - -* Mon Dec 16 2002 Tim Powers 2.1.3-2 -- rebuild - -* Wed Dec 11 2002 Karsten Hopp -- 2.1.3-1 -- Battery monitor can display multiple batteries -- Net timer lost the minutes display with large connect times -- use disk stats from /proc/partitions if available - -* Tue Dec 03 2002 Karsten Hopp 2.1.2-1 -- updated translations -- .desktop file (#78562) -- minor bugfixes - -* Mon Nov 11 2002 Karsten Hopp -- update to 2.1 (glib2, gtk2) - -* Wed Jul 17 2002 Karsten Hopp -- update -- own /usr/include/gkrellm directory - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Tue Jun 11 2002 Karsten Hopp -- Update to 1.2.11 - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Wed Feb 27 2002 Karsten Hopp -- Update to 1.2.9 - -* Wed Jan 23 2002 Karsten Hopp -- Update to 1.2.6 - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Thu Dec 13 2001 Karsten Hopp -- update to 1.2.5-1 -- nls patch not required anymore - -* Mon Nov 26 2001 Karsten Hopp -- enable nls - -* Mon Nov 26 2001 Karsten Hopp -- update to 1.2.4 - -* Fri Jul 6 2001 Trond Eivind Glomsrød -- s/Copyright/License/ -- Add %%defattr -- langify -- Don't define name, ver and rel at the top of the spec file - -* Wed Jun 27 2001 Karsten Hopp -- fix _mandir -- fix BuildRequires - -* Wed Jun 27 2001 SATO Satoru -- clean up (use system-defined macros) -- enable NLS - -* Wed Mar 14 2001 Rob Lineweaver -- fixed new manpage inclusion for newer RPM versions -- source is 1.0.7 -- compiled for PPC and i386 - -* Fri Jan 19 2001 Kevin Ford -- general cleanup of spec file - -* Thu Jan 18 2001 Kevin Ford -- Updated spec file to work with both v3 & v4 rpm -- moved changelog to bottom of spec file -- added defines for common items - -* Thu Apr 6 2000 Bill Wilson -- added INCLUDEDIR to the make install - -* Fri Oct 29 1999 Gary Thomas -- .spec file still broken - -* Thu Oct 7 1999 David Mihm -- fixed spec. +%autochangelog diff --git a/gkrellmd.service b/gkrellmd.service deleted file mode 100644 index dcbac9f..0000000 --- a/gkrellmd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=GNU Krell Monitors server -Documentation=man:gkrellmd(1) -After=hddtemp.service lm_sensors.service - -[Service] -ExecStart=/usr/sbin/gkrellmd - -[Install] -WantedBy=multi-user.target diff --git a/gnome-gkrellm.appdata.xml b/gnome-gkrellm.appdata.xml deleted file mode 100644 index a9e893a..0000000 --- a/gnome-gkrellm.appdata.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - gnome-gkrellm.desktop - CC0-1.0 - GPL-2.0+ - GKrellM -

Monitor for CPU, memory, disks, network, mail - -

- GKrellM is a single process stack of system monitors which supports - applying themes to match its appearance to your window manager, Gtk, - or any other theme. -

-

Features:

-
    -
  • Hostname/systemname display
    • -
  • Clock/calendar
    • -
  • Temperature, fan, and voltage sensor monitors
    • -
  • Process monitor with a chart for load and forks
    • -
  • Display of number of current processes and users
    • -
  • Disk monitor that can chart individual disks or a composite disk
    • -
  • Internet monitor (http, ftp, ...)
    • -
  • Net interface monitors, Data rx/tx LEDs
    • -
  • And much more
    • -
- - https://billw2.github.io/gkrellm/gkrellm.html - - https://billw2.github.io/gkrellm/gkrellm.png - https://billw2.github.io/gkrellm/gkrellm0.png - - jwrdegoede_at_fedoraproject.org - diff --git a/sources b/sources index 30e626a..9513bac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gkrellm-2.3.11.tar.bz2) = e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9 +SHA512 (gkrellm-2.4.0.tar.bz2) = 770acfe5ee23b74ffe5becc89d3735e9e8688ac338b052e1c2f86cb722b7867b1f8c262a969ef3140eb32912cf0426ac13bf3743e2a9149eec2a962655e05a9f From 59cf897abccf93463acf1e3460cc16aa27160da6 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Mon, 20 Jan 2025 01:59:40 -0500 Subject: [PATCH 097/100] Don't rename desktop file, it's referenced elsewhere --- gkrellm.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 1203e23..a1d2b08 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -81,10 +81,6 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} \ CFGDIR=%{buildroot}%{_sysconfdir} %find_lang %name -# AppData file MUST be named with the same root as the .desktop file. -mv %{buildroot}%{_datadir}/applications/gkrellm.desktop \ - %{buildroot}%{_datadir}/applications/net.srcbox.gkrellm.GKrellM.desktop - desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml From 2b578a6ef9aba7d44b88846f7fb0c6aed3f42fc5 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Mon, 20 Jan 2025 09:48:37 -0500 Subject: [PATCH 098/100] Fix systemd unit file to point to correct gkrellmd location --- gkrellm.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index a1d2b08..e65dc71 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -61,10 +61,12 @@ done %build -make %{?_smp_mflags} PREFIX=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} \ - CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-error=incompatible-pointer-types" \ - LDFLAGS="$RPM_LD_FLAGS" +make %{?_smp_mflags} PREFIX=%{_prefix} \ + PKGCONFIGDIR=%{_libdir}/pkgconfig \ + INCLUDEDIR=%{_includedir} \ + SINSTALLDIR=%{_sbindir} \ + CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-error=incompatible-pointer-types" \ + LDFLAGS="$RPM_LD_FLAGS" %install From d4eb3dfb8efe2275742b69a936199713dd9fc301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 15:35:18 +0100 Subject: [PATCH 099/100] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- gkrellm.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index e65dc71..26746cf 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -32,7 +32,7 @@ Summary: The GNU Krell Monitors Server # systemd >= 186 for scriptlet macros BuildRequires: systemd >= 186 BuildRequires: make -Requires(pre): shadow-utils systemd +Requires(pre): systemd Requires(post,preun,postun): systemd @@ -59,6 +59,11 @@ for i in gkrellmd.1 gkrellm.1 README Changelog.OLD Changelog-plugins.html \ sed -i -e "s@/usr/local/lib/gkrellm2*/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i done +# Create a sysusers.d config file +cat >gkrellm.sysusers.conf </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 %systemd_post gkrellmd.service @@ -125,6 +127,7 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %{_sbindir}/gkrellmd %{_mandir}/man1/gkrellmd.* %config(noreplace) %{_sysconfdir}/gkrellmd.conf +%{_sysusersdir}/gkrellm.conf %changelog From 4caa22f9317bbca584ffb63905ebdd61799dea43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:26:30 +0000 Subject: [PATCH 100/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild