From 36c876bf444ffc5df32c661381b959a25092130b Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Wed, 11 Apr 2012 20:17:32 +0800 Subject: [PATCH 1/2] Rebase to v1.4.04 --- .gitignore | 1 + sources | 2 +- vmpsd.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 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 faeb7ec..cfc4b62 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,6 +1,6 @@ Name: vmpsd -Version: 1.4.03 -Release: 2%{?dist} +Version: 1.4.04 +Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS Group: System Environment/Daemons @@ -72,6 +72,9 @@ 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 From 7c548d3d70acd7f570b2167b57ca8de56e5e1530 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Sat, 25 May 2013 21:13:18 +0800 Subject: [PATCH 2/2] Rebase to upstream to resolve BZ955285 --- .gitignore | 1 + sources | 2 +- vmpsd.spec | 5 ++++- 3 files changed, 6 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..4fd2a4a 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,9 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Sat May 25 2013 Fedora Release Engineering - 1.4.05-1 +- Rebase to upstream to resolve BZ955285 + * Wed Apr 11 2012 Colin Coe - 1.4.04-1 - Rebase to latest upstream to resolve BZ754963