Rebase to upstream

Rebase to v1.4.04
Rebase to v1.4.03
2013-06-02 23:12:30 +08:00 · 2012-04-11 19:59:42 +08:00 · 2011-05-02 19:41:46 +08:00 · 2011-05-02 19:14:54 +08:00 · 2011-04-28 20:36:21 +08:00 · 2010-07-29 15:06:44 +00:00
6 changed files with 33 additions and 27 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-vmpsd-1.4.01.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,5 @@
+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
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: vmpsd
-# $Id$
-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
-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
+f1a04421ff0f52067fae72adcceeb1ab  vmpsd-1.4.05.tar.gz
--- a/vmpsd.spec
+++ b/vmpsd.spec
@ -1,6 +1,6 @@
 Name:		vmpsd 
-Version:	1.4.01
-Release:	6%{?dist}
+Version:	1.4.05
+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,30 @@ fi
 %{_mandir}/man1/%{name}.1.gz

 %changelog
+* Sat May 25 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.05-1
+- Rebase to upstream to resolve BZ955285
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Apr 11 2012 Colin Coe <colin.coe@gmail.com> - 1.4.04-1
+- Rebase to latest upstream to resolve BZ754963
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* 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	3762dbebe1	Rebase to upstream	2013-06-02 23:12:30 +08:00
Colin Coe	9d4c5866c1	Rebase to v1.4.04	2012-04-11 19:59:42 +08:00
Colin Coe	50bb211f1e	Rebase to v1.4.03	2011-05-02 19:41:46 +08:00
Colin Coe	45e8d95bc9	Rebase to v1.4.03	2011-05-02 19:14:54 +08:00
Colin Coe	7ab36331ec	Update 1.4.02	2011-04-28 20:36:21 +08:00
Fedora Release Engineering	43f9386acb	dist-git conversion	2010-07-29 15:06:44 +00:00
Dennis Gilmore	2fbe32e88f	Initialize branch EL-6 for vmpsd	2010-05-08 02:27:34 +00:00
Bill Nottingham	952c9149c4	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:14:59 +00:00
				`@ -1 +0,0 @@`
				`vmpsd-1_4_01-6:HEAD:vmpsd-1.4.01-6.src.rpm:1252585116`