[libmatekbd] Add autoreconf -fi to work around rpath issue

Dan Mashal vicodan at fedoraproject.org
Fri Feb 14 02:19:35 UTC 2014


commit 1ffdabcce9dbbde555d38f0f29c787cedad831de
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Feb 13 18:20:10 2014 -0800

    Add autoreconf -fi to work around rpath issue

 libmatekbd.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/libmatekbd.spec b/libmatekbd.spec
index d695cab..68c0aed 100644
--- a/libmatekbd.spec
+++ b/libmatekbd.spec
@@ -1,18 +1,17 @@
 Name:           libmatekbd
 Version:        1.7.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for mate kbd
 License:        LGPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 
-BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
 BuildRequires:  gsettings-desktop-schemas-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  libICE-devel
 BuildRequires:  libxklavier-devel
 BuildRequires:  mate-common
-BuildRequires:  libICE-devel
 
 %description
 Libraries for matekbd
@@ -29,7 +28,10 @@ Development libraries for libmatekbd
 
 
 %build
-%configure \
+# To work around rpath issue
+autoreconf -fi
+
+%configure                   \
    --disable-static          \
    --with-gtk=2.0            \
    --disable-schemas-compile \
@@ -43,9 +45,6 @@ make %{?_smp_mflags} V=1
 
 find %{buildroot} -name '*.la' -exec rm -fv {} ';'
 
-#https://github.com/mate-desktop/libmatekbd/issues/14
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libmatekbdui.so.4.2.0
-
 # remove needless gsettings convert file
 rm -f  %{buildroot}%{_datadir}/MateConf/gsettings/matekbd.convert
 
@@ -79,6 +78,10 @@ fi
 %{_libdir}/libmatekbd.so
 
 %changelog
+* Thu Feb 13 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.2-2
+- Add autoreconf to workaround rpath issue
+- Sort BRs
+
 * Sat Jan 18 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.2-1
 - update to 1.7.2
 - use modern 'make install' macro


More information about the scm-commits mailing list