[yap] Fix soname injection

Petr Pisar ppisar at fedoraproject.org
Tue Jan 4 10:46:10 UTC 2011


commit 366fe0f9bc1936b3f42a6a00c48f5fcb9b707514
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Dec 22 14:16:43 2010 +0100

    Fix soname injection

 yap.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/yap.spec b/yap.spec
index 53ccd5f..3ab40f0 100644
--- a/yap.spec
+++ b/yap.spec
@@ -73,9 +73,9 @@ find -name CVS -print0 | xargs -0 rm -rf
 # remove redundant rpath
 sed -i '/-Wl,-R/d' configure
 # add soname to library
-sed -i 's/@YAPLIB@/@YAPLIB at .%{version}/g' Makefile.in
-sed -i 's/@DYNYAPLIB@/@DYNYAPLIB at .%{version}/g' Makefile.in
-sed -i 's/@DYNLIB_LD@/@DYNLIB_LD@ -Wl,-soname=@YAPLIB at .%{version} /g' Makefile.in
+sed -i 's/\(@YAPLIB@\)/\1.%{version}/g' Makefile.in
+sed -i 's/\(@DYNYAPLIB@\)/\1.%{version}/g' Makefile.in
+sed -i 's/\(@YAPLIB_LD@\)/\1 -Wl,-soname=@YAPLIB at .%{version} /g' Makefile.in
 
 find -name Makefile.in | xargs sed -i 's|$(ROOTDIR)/lib|$(ROOTDIR)/%{_lib}|'
 find -name Makefile.in | xargs sed -i 's|$(EROOTDIR)/lib|$(EROOTDIR)/%{_lib}|'
@@ -201,6 +201,7 @@ rm -rf $RPM_BUILD_ROOT
 - Convert TO_DO into UTF-8
 - Make COPYING non-executable
 - Remove empty myddas_top_level.yap file
+- Fix soname injection
 
 * Wed Dec 08 2010 Petr Pisar <ppisar at redhat.com> - 5.1.3-3
 - Hack SWI-compatible libraries build system to be compilable (bug #660965)


More information about the scm-commits mailing list