[libuv] don't sed the soname in the spec anymore; the patch takes care of it now

T.C. Hollingsworth patches at fedoraproject.org
Mon May 13 21:50:13 UTC 2013


commit ed8c209f76eb213759ac4b17c33e123bb9fe855a
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Mon May 13 14:47:29 2013 -0700

    don't sed the soname in the spec anymore; the patch takes care of it now

 libuv.spec |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/libuv.spec b/libuv.spec
index ec32025..92c9f59 100644
--- a/libuv.spec
+++ b/libuv.spec
@@ -7,7 +7,7 @@
 Name: libuv
 Epoch:   1
 Version: 0.10.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Platform layer for node.js
 
 Group: Development/Tools
@@ -48,22 +48,12 @@ export CFLAGS='%{optflags}'
 export CXXFLAGS='%{optflags}'
 ./gyp_uv -Dcomponent=shared_library -Dlibrary=shared_library
 
-# Modify the build so it produces a versioned shared library
-pushd out
-mv libuv.target.mk libuv.target.mk.orig
-sed "s/libuv.so/libuv.so.%{sover}/g" libuv.target.mk.orig > libuv.target.mk
-mv run-benchmarks.target.mk run-benchmarks.target.mk.orig
-sed "s/libuv.so/libuv.so.%{sover}/g" run-benchmarks.target.mk.orig > run-benchmarks.target.mk
-mv run-tests.target.mk run-tests.target.mk.orig
-sed "s/libuv.so/libuv.so.%{sover}/g" run-tests.target.mk.orig > run-tests.target.mk
-popd
-
 make %{?_smp_mflags} V=1 -C out BUILDTYPE=Release
 
 %install
 # Copy the shared lib into the libdir
 mkdir -p %{buildroot}/%{_libdir}/
-cp out/Release/obj.target/libuv.so.%{sover} %{buildroot}/%{_libdir}/libuv.so.%{sover}
+cp out/Release/obj.target/libuv.so %{buildroot}/%{_libdir}/libuv.so.%{sover}
 pushd %{buildroot}/%{_libdir}/
 ln -s libuv.so.%{sover} libuv.so.0
 ln -s libuv.so.%{sover} libuv.so
@@ -113,6 +103,9 @@ sed -e "s#@prefix@#%{_prefix}#g" \
 %{_includedir}/uv-private
 
 %changelog
+* Mon May 13 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1:0.10.5-3
+- don't sed the soname in the spec anymore; the patch takes care of it now
+
 * Mon May 13 2013 Stephen Gallagher <sgallagh at redhat.com> - 1:0.10.5-2
 - Add patch to properly report soname version information
   This patch will be included upstream in 0.10.6 and can be dropped then.


More information about the scm-commits mailing list