From fcb0d3983e373e1f19eae293ab333c5134c76872 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:36:24 +0000 Subject: [PATCH 1/7] Initialize branch FC-6 for xfce4-diskperf-plugin --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From c89f2dab226133a72051005e9d98877736fc0fdc Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 25 Nov 2006 02:13:13 +0000 Subject: [PATCH 2/7] fix for #215863 --- xfce4-diskperf-plugin-01_random_fixes.patch | 53 +++++++++++++++++++++ xfce4-diskperf-plugin.spec | 7 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 xfce4-diskperf-plugin-01_random_fixes.patch diff --git a/xfce4-diskperf-plugin-01_random_fixes.patch b/xfce4-diskperf-plugin-01_random_fixes.patch new file mode 100644 index 0000000..5968d97 --- /dev/null +++ b/xfce4-diskperf-plugin-01_random_fixes.patch @@ -0,0 +1,53 @@ +diff -Nur xfce4-diskperf-plugin-2.0/panel-plugin/main.c xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c +--- xfce4-diskperf-plugin-2.0/panel-plugin/main.c 2005-10-11 22:18:15.000000000 +0300 ++++ xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c 2006-10-07 10:15:34.000000000 +0300 +@@ -141,6 +141,8 @@ + + /**************************************************************/ + ++static int timerNeedsUpdate = 0; ++ + static int DisplayPerf (struct diskperf_t *p_poPlugin) + /* Get the last disk perfomance data, compute the statistics and update + the panel-docked monitor bars */ +@@ -273,6 +275,12 @@ + + DisplayPerf (poPlugin); + ++ if (timerNeedsUpdate) { ++ g_source_remove (poPlugin->iTimerId); ++ poPlugin->iTimerId = 0; ++ timerNeedsUpdate = 0; ++ } ++ + if (!poPlugin->iTimerId) + poPlugin->iTimerId = g_timeout_add (poConf->iPeriod_ms, + (GSourceFunc) SetTimer, poPlugin); +@@ -773,6 +781,7 @@ + struct param_t *poConf = &(poPlugin->oConf.oParam); + float r; + ++ timerNeedsUpdate = 1; + TRACE ("SetPeriod()\n"); + r = gtk_spin_button_get_value (GTK_SPIN_BUTTON (p_wSc)); + poConf->iPeriod_ms = (r * 1000) + 0.5; /* rounded */ +@@ -1096,8 +1105,6 @@ + { + diskperf_t *diskperf = diskperf_create_control (plugin); + +- diskperf_read_config (plugin, diskperf); +- + g_signal_connect (plugin, "free-data", G_CALLBACK (diskperf_free), + diskperf); + +@@ -1120,7 +1127,9 @@ + gtk_container_add (GTK_CONTAINER (plugin), diskperf->oMonitor.wEventBox); + + CreateMonitorBars (diskperf, xfce_panel_plugin_get_orientation (plugin)); +- ++ ++ diskperf_read_config (plugin, diskperf); ++ DevPerfInit(); + SetTimer (diskperf); + } + diff --git a/xfce4-diskperf-plugin.spec b/xfce4-diskperf-plugin.spec index c6dc463..519fb0e 100644 --- a/xfce4-diskperf-plugin.spec +++ b/xfce4-diskperf-plugin.spec @@ -1,12 +1,13 @@ Name: xfce4-diskperf-plugin Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Disk performance plugin for the Xfce panel Group: User Interface/Desktops License: BSD URL: http://goodies.xfce.org/ Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-01_random_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel @@ -19,6 +20,7 @@ second) based on data provided by the kernel. %prep %setup -q +%patch0 -p1 -b .random_fixes %build %configure --disable-static @@ -38,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Nov 25 2006 Christoph Wickert - 2.0-4 +- Add patch to fix bug bugzilla.xfce.org #1842 (#215863) + * Thu Oct 05 2006 Christoph Wickert - 2.0-3 - Bump release for devel checkin. From ebc1cae5541232430ff5296faf7ab2300abed138 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 20 Jan 2007 15:44:04 +0000 Subject: [PATCH 3/7] Update to 2.1.0 --- .cvsignore | 2 +- sources | 2 +- xfce4-diskperf-plugin-01_random_fixes.patch | 53 --------------------- xfce4-diskperf-plugin.spec | 21 ++++---- 4 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 xfce4-diskperf-plugin-01_random_fixes.patch diff --git a/.cvsignore b/.cvsignore index 21ab433..03ed5b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-diskperf-plugin-2.0.tar.bz2 +xfce4-diskperf-plugin-2.1.0.tar.bz2 diff --git a/sources b/sources index 95c729f..ebe4e50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be819b14db68369f541a02f9a27e9dc5 xfce4-diskperf-plugin-2.0.tar.bz2 +fc74a0c7d2b9486cdb704a072cd72b83 xfce4-diskperf-plugin-2.1.0.tar.bz2 diff --git a/xfce4-diskperf-plugin-01_random_fixes.patch b/xfce4-diskperf-plugin-01_random_fixes.patch deleted file mode 100644 index 5968d97..0000000 --- a/xfce4-diskperf-plugin-01_random_fixes.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Nur xfce4-diskperf-plugin-2.0/panel-plugin/main.c xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c ---- xfce4-diskperf-plugin-2.0/panel-plugin/main.c 2005-10-11 22:18:15.000000000 +0300 -+++ xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c 2006-10-07 10:15:34.000000000 +0300 -@@ -141,6 +141,8 @@ - - /**************************************************************/ - -+static int timerNeedsUpdate = 0; -+ - static int DisplayPerf (struct diskperf_t *p_poPlugin) - /* Get the last disk perfomance data, compute the statistics and update - the panel-docked monitor bars */ -@@ -273,6 +275,12 @@ - - DisplayPerf (poPlugin); - -+ if (timerNeedsUpdate) { -+ g_source_remove (poPlugin->iTimerId); -+ poPlugin->iTimerId = 0; -+ timerNeedsUpdate = 0; -+ } -+ - if (!poPlugin->iTimerId) - poPlugin->iTimerId = g_timeout_add (poConf->iPeriod_ms, - (GSourceFunc) SetTimer, poPlugin); -@@ -773,6 +781,7 @@ - struct param_t *poConf = &(poPlugin->oConf.oParam); - float r; - -+ timerNeedsUpdate = 1; - TRACE ("SetPeriod()\n"); - r = gtk_spin_button_get_value (GTK_SPIN_BUTTON (p_wSc)); - poConf->iPeriod_ms = (r * 1000) + 0.5; /* rounded */ -@@ -1096,8 +1105,6 @@ - { - diskperf_t *diskperf = diskperf_create_control (plugin); - -- diskperf_read_config (plugin, diskperf); -- - g_signal_connect (plugin, "free-data", G_CALLBACK (diskperf_free), - diskperf); - -@@ -1120,7 +1127,9 @@ - gtk_container_add (GTK_CONTAINER (plugin), diskperf->oMonitor.wEventBox); - - CreateMonitorBars (diskperf, xfce_panel_plugin_get_orientation (plugin)); -- -+ -+ diskperf_read_config (plugin, diskperf); -+ DevPerfInit(); - SetTimer (diskperf); - } - diff --git a/xfce4-diskperf-plugin.spec b/xfce4-diskperf-plugin.spec index 519fb0e..3e32402 100644 --- a/xfce4-diskperf-plugin.spec +++ b/xfce4-diskperf-plugin.spec @@ -1,18 +1,17 @@ Name: xfce4-diskperf-plugin -Version: 2.0 -Release: 4%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Disk performance plugin for the Xfce panel Group: User Interface/Desktops License: BSD -URL: http://goodies.xfce.org/ +URL: http://goodies.xfce.org/panel-plugins/{%name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-01_random_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel -BuildRequires: perl(XML::Parser) -Requires: xfce4-panel >= 4.3.99.1 +BuildRequires: xfce4-panel-devel >= 4.3.90, libxfcegui4-devel >= 4.3.90, libxml2-devel +BuildRequires: gettext, perl(XML::Parser) +Requires: xfce4-panel >= 4.3.99.2 %description The DiskPerf plugin displays disk/partition performance (bytes transfered per @@ -20,7 +19,6 @@ second) based on data provided by the kernel. %prep %setup -q -%patch0 -p1 -b .random_fixes %build %configure --disable-static @@ -29,17 +27,22 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Jan 20 2007 Christoph Wickert - 2.1.0-1 +- Update to 2.1.0. +- Remove patch for #215863, fixed upstream. + * Sat Nov 25 2006 Christoph Wickert - 2.0-4 - Add patch to fix bug bugzilla.xfce.org #1842 (#215863) From 7813f4541101b7d70ad9f620f95ba8baf292e582 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 27 Jan 2007 20:33:03 +0000 Subject: [PATCH 4/7] rebuild for xfce 4.4 --- xfce4-diskperf-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-diskperf-plugin.spec b/xfce4-diskperf-plugin.spec index 3e32402..88a45ed 100644 --- a/xfce4-diskperf-plugin.spec +++ b/xfce4-diskperf-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-diskperf-plugin Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Disk performance plugin for the Xfce panel Group: User Interface/Desktops @@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Mon Jan 22 2007 Christoph Wickert - 2.1.0-2 +- Rebuild for Xfce 4.4. + * Sat Jan 20 2007 Christoph Wickert - 2.1.0-1 - Update to 2.1.0. - Remove patch for #215863, fixed upstream. From 0e2024370782a8fb5e85292fbc29d5a46105512c Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 28 Apr 2007 16:48:38 +0000 Subject: [PATCH 5/7] Rebuild for Xfce 4.4.1 --- xfce4-diskperf-plugin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xfce4-diskperf-plugin.spec b/xfce4-diskperf-plugin.spec index 88a45ed..f587517 100644 --- a/xfce4-diskperf-plugin.spec +++ b/xfce4-diskperf-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-diskperf-plugin Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Disk performance plugin for the Xfce panel Group: User Interface/Desktops @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90, libxfcegui4-devel >= 4.3.90, libxml2-devel BuildRequires: gettext, perl(XML::Parser) -Requires: xfce4-panel >= 4.3.99.2 +Requires: xfce4-panel >= 4.4.0 %description The DiskPerf plugin displays disk/partition performance (bytes transfered per @@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Apr 28 2007 Christoph Wickert - 2.1.0-3 +- Rebuild for Xfce 4.4.1 + * Mon Jan 22 2007 Christoph Wickert - 2.1.0-2 - Rebuild for Xfce 4.4. From 068cc7cf20280857a6531a00edefc1f0094da0a4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:14 +0000 Subject: [PATCH 6/7] 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 f11ece5..dad03de 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-diskperf-plugin 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 2b04df5c998b5b66cde51141825567d5e520d148 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:44:10 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 dad03de..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-diskperf-plugin -# $Id$ -NAME := xfce4-diskperf-plugin -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) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6