From 952c9149c4a0ff6be022fc6e22e430c1bf711f2c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:59 +0000 Subject: [PATCH 1/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 88c93de..3a5e3f7 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vmpsd -# $Id$ +# $Id: Makefile,v 1.1 2009/09/09 16:20:41 kevin Exp $ NAME := vmpsd 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 2fbe32e88f6b8d565efeb0a147ac2d4a46c0fe1e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:27:34 +0000 Subject: [PATCH 2/8] Initialize branch EL-6 for vmpsd --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 43f9386acbf15a2c212205ea9c255cb68ca7173b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:06:44 +0000 Subject: [PATCH 3/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 3a5e3f7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vmpsd -# $Id: Makefile,v 1.1 2009/09/09 16:20:41 kevin Exp $ -NAME := vmpsd -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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index b6de702..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -vmpsd-1_4_01-6:HEAD:vmpsd-1.4.01-6.src.rpm:1252585116 From 7ab36331ec3a0fd76caa45a26ecbac3c1fc7dce1 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Thu, 28 Apr 2011 20:36:21 +0800 Subject: [PATCH 4/8] Update 1.4.02 --- .gitignore | 1 + sources | 2 +- vmpsd.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8062fd7..6339ac2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vmpsd-1.4.01.tar.gz +/vmpsd-1.4.02.tar.gz diff --git a/sources b/sources index 3f070fe..69802aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b95f6390f0a340f4f99d4e8f72201cb4 vmpsd-1.4.01.tar.gz +d62bf43a28088e2eaa4a7037a2c850e1 vmpsd-1.4.02.tar.gz diff --git a/vmpsd.spec b/vmpsd.spec index d3b277f..d762d70 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,6 +1,6 @@ Name: vmpsd -Version: 1.4.01 -Release: 6%{?dist} +Version: 1.4.02 +Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS Group: System Environment/Daemons @@ -72,6 +72,12 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Apr 28 2011 Colin Coe - 1.4.02-1 +- Rebase to latest upstream + +* Mon Feb 07 2011 Fedora Release Engineering - 1.4.01-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Sep 7 2009 Colin Coe - 1.4.01-6%{?dist} - Remove condrestart from post section as it's now in the postun section - Stop packaging the INSTALL file From 45e8d95bc96711d9a9e97cd0aebddfd73e044359 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Mon, 2 May 2011 19:14:54 +0800 Subject: [PATCH 5/8] Rebase to v1.4.03 --- vmpsd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vmpsd.spec b/vmpsd.spec index d762d70..579b545 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,5 +1,5 @@ Name: vmpsd -Version: 1.4.02 +Version: 1.4.03 Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS @@ -23,7 +23,7 @@ specific VLANs based on MAC address of connecting device. OpenVMPS is a GPL implementation of VMPS. %prep -%setup -qn %{name} +%setup -qn %{name}-%{version} %build %configure @@ -72,6 +72,9 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Mon May 2 2011 Colin Coe - 1.4.03-1 +- Rebase to latest upstream to resolve BZ699728 + * Thu Apr 28 2011 Colin Coe - 1.4.02-1 - Rebase to latest upstream From 50bb211f1e4bfd8d4b1a9c9958ec11c0d0ebe383 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Mon, 2 May 2011 19:41:46 +0800 Subject: [PATCH 6/8] Rebase to v1.4.03 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6339ac2..1e2e3f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vmpsd-1.4.01.tar.gz /vmpsd-1.4.02.tar.gz +/vmpsd-1.4.03.tar.gz diff --git a/sources b/sources index 69802aa..445ce60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d62bf43a28088e2eaa4a7037a2c850e1 vmpsd-1.4.02.tar.gz +6c8a318495b4affdea52e76b52c51b34 vmpsd-1.4.03.tar.gz From 9d4c5866c14ff864ed8c99b605202ecd7a2fb3f9 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Wed, 11 Apr 2012 19:59:42 +0800 Subject: [PATCH 7/8] Rebase to v1.4.04 --- .gitignore | 1 + sources | 2 +- vmpsd.spec | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1e2e3f4..48ffa52 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vmpsd-1.4.01.tar.gz /vmpsd-1.4.02.tar.gz /vmpsd-1.4.03.tar.gz +/vmpsd-1.4.04.tar.gz diff --git a/sources b/sources index 445ce60..8d3133a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c8a318495b4affdea52e76b52c51b34 vmpsd-1.4.03.tar.gz +27d8a178c3372b61e74898cec43856b8 vmpsd-1.4.04.tar.gz diff --git a/vmpsd.spec b/vmpsd.spec index 579b545..cfc4b62 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,5 +1,5 @@ Name: vmpsd -Version: 1.4.03 +Version: 1.4.04 Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS @@ -72,6 +72,12 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Wed Apr 11 2012 Colin Coe - 1.4.04-1 +- Rebase to latest upstream to resolve BZ754963 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.4.03-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon May 2 2011 Colin Coe - 1.4.03-1 - Rebase to latest upstream to resolve BZ699728 From 3762dbebe1769524503b1230a846ad4a9ee17925 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Sun, 2 Jun 2013 23:12:30 +0800 Subject: [PATCH 8/8] Rebase to upstream --- .gitignore | 1 + sources | 2 +- vmpsd.spec | 11 ++++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 48ffa52..07991ff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ vmpsd-1.4.01.tar.gz /vmpsd-1.4.02.tar.gz /vmpsd-1.4.03.tar.gz /vmpsd-1.4.04.tar.gz +/vmpsd-1.4.05.tar.gz diff --git a/sources b/sources index 8d3133a..934cfcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27d8a178c3372b61e74898cec43856b8 vmpsd-1.4.04.tar.gz +f1a04421ff0f52067fae72adcceeb1ab vmpsd-1.4.05.tar.gz diff --git a/vmpsd.spec b/vmpsd.spec index cfc4b62..dbbda89 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,5 +1,5 @@ Name: vmpsd -Version: 1.4.04 +Version: 1.4.05 Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS @@ -72,6 +72,15 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Sat May 25 2013 Fedora Release Engineering - 1.4.05-1 +- Rebase to upstream to resolve BZ955285 + +* Fri Feb 15 2013 Fedora Release Engineering - 1.4.04-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.4.04-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Apr 11 2012 Colin Coe - 1.4.04-1 - Rebase to latest upstream to resolve BZ754963