From 4cae2a2bc955e7fcef36eea591d54e620d943091 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:38:39 +0000 Subject: [PATCH 1/7] Initialize branch FC-6 for xfce4-systemload-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 d3a091b8bb02b3286e03a6872bdbfc04f65f98a1 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 22 Dec 2006 02:51:52 +0000 Subject: [PATCH 2/7] update to 0.4.1 --- .cvsignore | 2 +- sources | 2 +- xfce4-systemload-plugin.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index d99a984..1bf2065 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-systemload-plugin-0.4.0.tar.bz2 +xfce4-systemload-plugin-0.4.1.tar.gz diff --git a/sources b/sources index a5a5a42..75a1511 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70d4b15f0745adc34703272449fcef93 xfce4-systemload-plugin-0.4.0.tar.bz2 +f777818db18c2918fde19ad93cd715e0 xfce4-systemload-plugin-0.4.1.tar.gz diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index 03b0645..36f5f02 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -1,12 +1,12 @@ Name: xfce4-systemload-plugin -Version: 0.4.0 -Release: 3%{?dist} +Version: 0.4.1 +Release: 1%{?dist} Summary: Systemload monitor 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 +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel @@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Fri Dec 22 2006 Christoph Wickert - 0.4.1-1 +- Update to 0.4.1. + * Thu Oct 05 2006 Christoph Wickert - 0.4.0-3 - Bump release for devel checkin. From 7801f5358847cd14bb3972d114ab593f83a811c6 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 22 Dec 2006 02:54:42 +0000 Subject: [PATCH 3/7] small fix in BuildRequires --- xfce4-systemload-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index 36f5f02..47f1e0e 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -9,7 +9,7 @@ URL: http://goodies.xfce.org/ Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel +BuildRequires: xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.99.1, libxml2-devel BuildRequires: gettext, perl(XML::Parser) Requires: xfce4-panel >= 4.3.99.1 From 47551d42b2583f13591ef9c8ec65e39e8fa4b60e Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 27 Jan 2007 21:28:04 +0000 Subject: [PATCH 4/7] update to 0.4.2 on Xfce 4.4 --- .cvsignore | 2 +- sources | 2 +- xfce4-systemload-plugin.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1bf2065..1b3f687 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-systemload-plugin-0.4.1.tar.gz +xfce4-systemload-plugin-0.4.2.tar.bz2 diff --git a/sources b/sources index 75a1511..a962e66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f777818db18c2918fde19ad93cd715e0 xfce4-systemload-plugin-0.4.1.tar.gz +cc5777bb1621704927513eb8eef5f07c xfce4-systemload-plugin-0.4.2.tar.bz2 diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index 47f1e0e..291284d 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -1,17 +1,17 @@ Name: xfce4-systemload-plugin -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: Systemload monitor 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.gz +URL: http://goodies.xfce.org/projects/panel-plugins/%{name} +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.99.1, libxml2-devel BuildRequires: gettext, perl(XML::Parser) -Requires: xfce4-panel >= 4.3.99.1 +Requires: xfce4-panel >= 4.3.99.2 %description A system-load monitor plugin for the Xfce panel. It displays the current CPU @@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Mon Jan 22 2007 Christoph Wickert - 0.4.2-1 +- Update to 0.4.2 on Xfce 4.4. + * Fri Dec 22 2006 Christoph Wickert - 0.4.1-1 - Update to 0.4.1. From 04e2cf9050db27c0862c7c9bea69e20d83b8cef4 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 28 Apr 2007 17:41:14 +0000 Subject: [PATCH 5/7] Rebuild for Xfce 4.4.1 --- xfce4-systemload-plugin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index 291284d..f89d114 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-systemload-plugin Version: 0.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Systemload monitor 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.99.1, libxfcegui4-devel >= 4.3.99.1, libxml2-devel BuildRequires: gettext, perl(XML::Parser) -Requires: xfce4-panel >= 4.3.99.2 +Requires: xfce4-panel >= 4.4.0 %description A system-load monitor plugin for the Xfce panel. It displays the current CPU @@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Apr 28 2007 Christoph Wickert - 0.4.2-2 +- Rebuild for Xfce 4.4.1 + * Mon Jan 22 2007 Christoph Wickert - 0.4.2-1 - Update to 0.4.2 on Xfce 4.4. From 6de2bc306e1f2eedca7662d69f79170d0857078f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:09 +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 7b006cd..4414bc1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-systemload-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 1a423f1a143171b70981867993a430120bd4659a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:47:48 +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 4414bc1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-systemload-plugin -# $Id$ -NAME := xfce4-systemload-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