Rebase to v1.4.03

dist-git conversion
2011-05-02 19:47:58 +08:00 · 2011-05-02 19:18:09 +08:00 · 2010-07-29 15:06:42 +00:00 · 2010-02-17 03:25:45 +00:00
6 changed files with 15 additions and 27 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-vmpsd-1.4.01.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,2 @@
+vmpsd-1.4.01.tar.gz
+/vmpsd-1.4.03.tar.gz
--- a/21
+++ b/21
@ -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)
--- a/import.log
+++ b/import.log
@ -1 +0,0 @@
-vmpsd-1_4_01-6:HEAD:vmpsd-1.4.01-6.src.rpm:1252585116
--- a/2
+++ b/2
@ -1 +1 @@
-b95f6390f0a340f4f99d4e8f72201cb4  vmpsd-1.4.01.tar.gz
+6c8a318495b4affdea52e76b52c51b34  vmpsd-1.4.03.tar.gz
--- 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 <colin.coe@gmail.com> - 1.4.03-1
+- Rebase to latest upstream to resolve BZ699728
+
+* Thu Apr 28 2011 Colin Coe <colin.coe@gmail.com> - 1.4.02-1
+- Rebase to latest upstream
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.01-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Sep 7 2009 Colin Coe <colin.coe@gmail.com> - 1.4.01-6%{?dist}
 - Remove condrestart from post section as it's now in the postun section
 - Stop packaging the INSTALL file
Author	SHA1	Message	Date
Colin Coe	e889496fa4	Rebase to v1.4.03	2011-05-02 19:47:58 +08:00
Colin Coe	65e4b80625	Rebase to v1.4.03	2011-05-02 19:18:09 +08:00
Fedora Release Engineering	e7bf1d2704	dist-git conversion	2010-07-29 15:06:42 +00:00
Jesse Keating	6399be5a0d	Initialize branch F-13 for vmpsd	2010-02-17 03:25:45 +00:00
				`@ -1 +0,0 @@`
				`vmpsd-1_4_01-6:HEAD:vmpsd-1.4.01-6.src.rpm:1252585116`