[at-spi2-core] Fix the rpath issue for building gobject-introspection properly as suggested from upstream
Peter Robinson
pbrobinson at fedoraproject.org
Tue Jan 10 15:39:00 UTC 2012
commit 4ab8249201cd759903919fc329840bc5fdbc0ac2
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Tue Jan 10 15:38:46 2012 +0000
Fix the rpath issue for building gobject-introspection properly as suggested from upstream
at-spi2-core.spec | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index 6f37767..f91fbb5 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -1,6 +1,6 @@
Name: at-spi2-core
Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Protocol definitions and daemon for D-Bus at-spi
Group: System Environment/Libraries
@@ -19,10 +19,6 @@ BuildRequires: libXi-devel
BuildRequires: autoconf automake libtool
BuildRequires: intltool
-# XXX Ugly Hack
-# Needed for https://bugzilla.gnome.org/show_bug.cgi?id=640303
-BuildRequires: at-spi2-core
-
Requires: dbus
%description
@@ -49,8 +45,8 @@ API documentation for libatspi.
%build
%configure --with-dbus-daemondir=/bin
-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
+
+sed -i -e 's+sys_lib_dlsearch_path_spec="/lib /usr/lib+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64+' configure
make %{?_smp_mflags}
@@ -85,6 +81,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libatspi.la
%{_libdir}/pkgconfig/atspi-2.pc
%changelog
+* Tue Jan 10 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 2.3.3-2
+- Fix the rpath issue for building gobject-introspection properly as suggested from upstream
+
* Tue Dec 20 2011 Matthias Clasen <mclasen at redhat.com> - 2.3.3-1
- Update to 2.3.3
More information about the scm-commits
mailing list