[telepathy-mission-control] Fix the build
Kalev Lember
kalev at fedoraproject.org
Mon Aug 26 18:25:43 UTC 2013
commit 160832baf6a8f051c73466d57a5974656ca884ca
Author: Kalev Lember <kalevlember at gmail.com>
Date: Mon Aug 26 20:07:36 2013 +0200
Fix the build
Switch to using chrpath --delete instead of the libtool sed hack for
removing rpaths. The libtool hack broke g-ir-scanner that needs rpaths
during the build.
telepathy-mission-control.spec | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/telepathy-mission-control.spec b/telepathy-mission-control.spec
index b4645c1..71f73bc 100644
--- a/telepathy-mission-control.spec
+++ b/telepathy-mission-control.spec
@@ -2,7 +2,7 @@
Name: telepathy-mission-control
Version: 5.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: Central control for Telepathy connection manager
@@ -11,6 +11,7 @@ License: LGPLv2
URL: http://telepathy.freedesktop.org/wiki/Mission_Control
Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+BuildRequires: chrpath
BuildRequires: glib2-devel
BuildRequires: libxslt-devel
BuildRequires: libgnome-keyring-devel
@@ -49,10 +50,6 @@ files for developing applications that use %{name}.
%build
%configure --disable-static --enable-gnome-keyring --enable-gtk-doc --enable-mcd-plugins --with-connectivity=nm --enable-upower
-# Remove rpath.
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -61,6 +58,11 @@ make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
+
+# Remove lib64 rpaths
+chrpath --delete %{buildroot}%{_libexecdir}/mission-control-5
+
+# Remove .la files
find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -95,6 +97,9 @@ fi
%changelog
+* Mon Aug 26 2013 Kalev Lember <kalevlember at gmail.com> - 1:5.15.0-2
+- Fix the build
+
* Sun Aug 4 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1:5.15.0-1
- Update to 5.15.0
More information about the scm-commits
mailing list