refresh

diff --git a/meta b/meta
index b13a21e429abee3d90f4523d6fdf4fade6b19c01..14e158a9a93eff1b23e5ad26c58e633fce38c4ce 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 11ca1325ea038c1e72d377d8d252d1366993d98a
-Head: c108928b4d8bd864b591b51cb2512fe1e3d7e6e9
+Previous: db31e895e8012180c37e26cc267669ea4267d466
+Head: 70ba851bc652bc2eb8bdcf1d4138703b0db287c2
 Applied:
-  ibacm-fixup-package-name-and-i: de4c3bcb9875281c22a667856847d7a5e5546f9d
-  refresh-temp: c108928b4d8bd864b591b51cb2512fe1e3d7e6e9
+  ibacm-fixup-package-name-and-i: 70ba851bc652bc2eb8bdcf1d4138703b0db287c2
 Unapplied:
 Hidden:

diff --git a/patches/ibacm-fixup-package-name-and-i b/patches/ibacm-fixup-package-name-and-i
index 0e170175ed7d32cfad21a4cda48c3376b951899f..86f80c35960d30e24816953a26b3db6933519364 100644 (file)
--- a/patches/ibacm-fixup-package-name-and-i
+++ b/patches/ibacm-fixup-package-name-and-i
@@ -1,5 +1,5 @@
 Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80
-Top:    daa73408825627cbc7a8b403b0cfab48dd1e187a
+Top:    0b2115751401c86f009f07809c320f5c586325d2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-06-21 09:08:39 -0700
 
@@ -26,21 +26,8 @@ index 46f68d4..b0d5fff 100644
  
  man_MANS = \
        man/ib_acme.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\r
- different fabric topologies.\r
- \r
--This release 1.0.0 is limited in its handling of dynamic changes.\r
-+This release 1.0.1 is limited in its handling of dynamic changes.\r
- \r
- The IB ACM package is comprised of two components: the ib_acm service\r
- and a test/configuration utility - ib_acme.  Both are userspace components\r
 diff --git a/configure.in b/configure.in
-index 9311602..71b3eb5 100644
+index 9311602..da59fdd 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -1,11 +1,11 @@
@@ -48,12 +35,12 @@ index 9311602..71b3eb5 100644
  \r
  AC_PREREQ(2.57)\r
 -AC_INIT(ib_acm, 1.0.0, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.1, linux-rdma@vger.kernel.org)\r
++AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org)\r
  AC_CONFIG_SRCDIR([src/acm.c])\r
  AC_CONFIG_AUX_DIR(config)\r
  AM_CONFIG_HEADER(config.h)\r
 -AM_INIT_AUTOMAKE(ib_acm, 1.0.0)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.1)\r
++AM_INIT_AUTOMAKE(ibacm, 1.0.0)\r
  \r
  AM_PROG_LIBTOOL\r
  \r
@@ -70,19 +57,17 @@ index 9311602..71b3eb5 100644
  \r
  dnl Checks for header files.\r
 diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 2c10e1c..9eabeb0 100644
+index 2c10e1c..85bd6d6 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  %define ver @VERSION@
  
 -Name: ib_acm
--Version: 1.0.0
 +Name: ibacm
-+Version: 1.0.1
+ Version: 1.0.0
  Release: 1%{?dist}
  Summary: InfiniBand Communication Manager Assistant
- 
 @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildRequires: libibverbs-devel >= 1.1-1
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5e7751f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,52 +0,0 @@
-Bottom: daa73408825627cbc7a8b403b0cfab48dd1e187a
-Top:    0b2115751401c86f009f07809c320f5c586325d2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-06-21 09:12:32 -0700
-
-Refresh of ibacm-fixup-package-name-and-i
-
----
-
-diff --git a/acm_notes.txt b/acm_notes.txt
-index 2bd7afb..bf38961 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\r
- different fabric topologies.\r
- \r
--This release 1.0.1 is limited in its handling of dynamic changes.\r
-+This release 1.0.0 is limited in its handling of dynamic changes.\r
- \r
- The IB ACM package is comprised of two components: the ib_acm service\r
- and a test/configuration utility - ib_acme.  Both are userspace components\r
-diff --git a/configure.in b/configure.in
-index 71b3eb5..da59fdd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,11 +1,11 @@
- dnl Process this file with autoconf to produce a configure script.\r
- \r
- AC_PREREQ(2.57)\r
--AC_INIT(ibacm, 1.0.1, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org)\r
- AC_CONFIG_SRCDIR([src/acm.c])\r
- AC_CONFIG_AUX_DIR(config)\r
- AM_CONFIG_HEADER(config.h)\r
--AM_INIT_AUTOMAKE(ibacm, 1.0.1)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.0)\r
- \r
- AM_PROG_LIBTOOL\r
- \r
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 9eabeb0..85bd6d6 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,7 +1,7 @@
- %define ver @VERSION@
- 
- Name: ibacm
--Version: 1.0.1
-+Version: 1.0.0
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant