refresh

diff --git a/meta b/meta
index 5758d970a278a56f9b9720080ffbdeec49c6d7d3..49f4d2f36ff1ed4241f95c91af412a4c8a774bb9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 2906de0f10b03bdc0aa73b56bb39350e248dad2e
-Head: 80410c8eb3dba109017cc8af851f7d289aa12f00
+Previous: 04dd923e14ba7ee3b13c0559655940b0aeab55a1
+Head: 9953927e2ba662867fb28d2147c6bca10883689b
 Applied:
-  build-preload: 4801f885faea4ed70daa1b2d4b4644d51ca3dcdd
-  refresh-temp: 80410c8eb3dba109017cc8af851f7d289aa12f00
+  build-preload: 9953927e2ba662867fb28d2147c6bca10883689b
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index 55905e42c867b5c86fdda6da9ed88ec812bc0025..c848c6f40a309378f7a14f9919ed29317ff92429 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    05ed8795786ee984cd507b9a4687494434370278
+Top:    50465fe288254c5dcda8e29f166d42b7cdbb4d2d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -64,7 +64,7 @@ index 51b2f89..23d97f4 100644
  
  dist-hook: librdmacm.spec
 diff --git a/librdmacm.spec.in b/librdmacm.spec.in
-index 7248137..fe4ae97 100644
+index 7248137..4652bbc 100644
 --- a/librdmacm.spec.in
 +++ b/librdmacm.spec.in
 @@ -44,6 +44,7 @@ rm -rf $RPM_BUILD_ROOT
@@ -86,8 +86,9 @@ index 7248137..fe4ae97 100644
  
  %files devel
  %defattr(-,root,root)
- %{_libdir}/lib*.so
-+%{_libdir}/rsocket/lib*.so
+-%{_libdir}/lib*.so
++%{_libdir}/librdmacm*.so
++%{_libdir}/rsocket/librspreload*.so
  %{_libdir}/*.a
 +%{_libdir}/rsocket/*.a
  %{_includedir}/*

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6a1e94a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 05ed8795786ee984cd507b9a4687494434370278
-Top:    50465fe288254c5dcda8e29f166d42b7cdbb4d2d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 12:03:11 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/librdmacm.spec.in b/librdmacm.spec.in
-index fe4ae97..4652bbc 100644
---- a/librdmacm.spec.in
-+++ b/librdmacm.spec.in
-@@ -60,8 +60,8 @@ rm -rf $RPM_BUILD_ROOT
- 
- %files devel
- %defattr(-,root,root)
--%{_libdir}/lib*.so
--%{_libdir}/rsocket/lib*.so
-+%{_libdir}/librdmacm*.so
-+%{_libdir}/rsocket/librspreload*.so
- %{_libdir}/*.a
- %{_libdir}/rsocket/*.a
- %{_includedir}/*