From 1e723e8bb537a7016ddf3f798138fa450d376bc1 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 21 Jun 2010 09:13:53 -0700 Subject: [PATCH] refresh --- meta | 7 +++--- patches/refresh-temp | 52 -------------------------------------------- patches/rel-1.0.1 | 46 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 47 insertions(+), 58 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index d026f74..70ecc64 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 266272b644258f8307aca5f06210b943abe749f4 -Head: c7c12c99d69aebcd5defe6e53779473dfd87e029 +Previous: ae4a2c1491d8a27ff1035e4a56539dca1d429c41 +Head: 9481b303832db81034b6e0752566d86b8b729771 Applied: fix-pkg: 70ba851bc652bc2eb8bdcf1d4138703b0db287c2 - rel-1.0.1: ee6b00e876c3292024163920d2a92d485536413e - refresh-temp: c7c12c99d69aebcd5defe6e53779473dfd87e029 + rel-1.0.1: 9481b303832db81034b6e0752566d86b8b729771 Unapplied: Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 83da7c5..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,52 +0,0 @@ -Bottom: 0b2115751401c86f009f07809c320f5c586325d2 -Top: daa73408825627cbc7a8b403b0cfab48dd1e187a -Author: Sean Hefty -Date: 2010-06-21 09:13:53 -0700 - -Refresh of rel-1.0.1 - ---- - -diff --git a/acm_notes.txt b/acm_notes.txt -index bf38961..2bd7afb 100644 ---- a/acm_notes.txt -+++ b/acm_notes.txt -@@ -23,7 +23,7 @@ implementation limits network traffic, SA interactions, and centralized - services. ACM supports multiple resolution protocols in order to handle - different fabric topologies. - --This release 1.0.0 is limited in its handling of dynamic changes. -+This release 1.0.1 is limited in its handling of dynamic changes. - - The IB ACM package is comprised of two components: the ib_acm service - and a test/configuration utility - ib_acme. Both are userspace components -diff --git a/configure.in b/configure.in -index da59fdd..71b3eb5 100644 ---- a/configure.in -+++ b/configure.in -@@ -1,11 +1,11 @@ - dnl Process this file with autoconf to produce a configure script. - - AC_PREREQ(2.57) --AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org) -+AC_INIT(ibacm, 1.0.1, linux-rdma@vger.kernel.org) - AC_CONFIG_SRCDIR([src/acm.c]) - AC_CONFIG_AUX_DIR(config) - AM_CONFIG_HEADER(config.h) --AM_INIT_AUTOMAKE(ibacm, 1.0.0) -+AM_INIT_AUTOMAKE(ibacm, 1.0.1) - - AM_PROG_LIBTOOL - -diff --git a/ibacm.spec.in b/ibacm.spec.in -index 85bd6d6..9eabeb0 100644 ---- a/ibacm.spec.in -+++ b/ibacm.spec.in -@@ -1,7 +1,7 @@ - %define ver @VERSION@ - - Name: ibacm --Version: 1.0.0 -+Version: 1.0.1 - Release: 1%{?dist} - Summary: InfiniBand Communication Manager Assistant diff --git a/patches/rel-1.0.1 b/patches/rel-1.0.1 index 89bc9e0..8ea283e 100644 --- a/patches/rel-1.0.1 +++ b/patches/rel-1.0.1 @@ -1,5 +1,5 @@ Bottom: 0b2115751401c86f009f07809c320f5c586325d2 -Top: 0b2115751401c86f009f07809c320f5c586325d2 +Top: daa73408825627cbc7a8b403b0cfab48dd1e187a Author: Sean Hefty Date: 2010-06-21 09:13:20 -0700 @@ -10,4 +10,46 @@ Signed-off-by: Sean Hefty --- - +diff --git a/acm_notes.txt b/acm_notes.txt +index bf38961..2bd7afb 100644 +--- a/acm_notes.txt ++++ b/acm_notes.txt +@@ -23,7 +23,7 @@ implementation limits network traffic, SA interactions, and centralized + services. ACM supports multiple resolution protocols in order to handle + different fabric topologies. + +-This release 1.0.0 is limited in its handling of dynamic changes. ++This release 1.0.1 is limited in its handling of dynamic changes. + + The IB ACM package is comprised of two components: the ib_acm service + and a test/configuration utility - ib_acme. Both are userspace components +diff --git a/configure.in b/configure.in +index da59fdd..71b3eb5 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,11 +1,11 @@ + dnl Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.57) +-AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org) ++AC_INIT(ibacm, 1.0.1, linux-rdma@vger.kernel.org) + AC_CONFIG_SRCDIR([src/acm.c]) + AC_CONFIG_AUX_DIR(config) + AM_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE(ibacm, 1.0.0) ++AM_INIT_AUTOMAKE(ibacm, 1.0.1) + + AM_PROG_LIBTOOL + +diff --git a/ibacm.spec.in b/ibacm.spec.in +index 85bd6d6..9eabeb0 100644 +--- a/ibacm.spec.in ++++ b/ibacm.spec.in +@@ -1,7 +1,7 @@ + %define ver @VERSION@ + + Name: ibacm +-Version: 1.0.0 ++Version: 1.0.1 + Release: 1%{?dist} + Summary: InfiniBand Communication Manager Assistant -- 2.41.0