From 6399be5a0dd5d874a460e6cc8dab2d38d3f63358 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:25:45 +0000 Subject: [PATCH 1/4] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From e7bf1d2704e7dd0a437cf0935cc2163d0275cf2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:06:42 +0000 Subject: [PATCH 2/4] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 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 65e4b80625b68445719a8d53b1bb5dcfa2c817a8 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Mon, 2 May 2011 19:18:09 +0800 Subject: [PATCH 3/4] Rebase to v1.4.03 --- vmpsd.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/vmpsd.spec b/vmpsd.spec index d3b277f..579b545 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,6 +1,6 @@ Name: vmpsd -Version: 1.4.01 -Release: 6%{?dist} +Version: 1.4.03 +Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS Group: System Environment/Daemons @@ -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,15 @@ 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 + +* 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 e889496fa4b2ffd459e0b79bd854ef0dea762e68 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Mon, 2 May 2011 19:47:58 +0800 Subject: [PATCH 4/4] Rebase to v1.4.03 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8062fd7..f453d1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vmpsd-1.4.01.tar.gz +/vmpsd-1.4.03.tar.gz diff --git a/sources b/sources index 3f070fe..445ce60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b95f6390f0a340f4f99d4e8f72201cb4 vmpsd-1.4.01.tar.gz +6c8a318495b4affdea52e76b52c51b34 vmpsd-1.4.03.tar.gz