[mate-panel] Add autoreconf -fi to work around rpath

Dan Mashal vicodan at fedoraproject.org
Thu Feb 13 08:32:27 UTC 2014


commit 2e06677ae4da37336473b7fbec353cc0d443ff4f
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Feb 13 00:32:56 2014 -0800

    Add autoreconf -fi to work around rpath

 mate-panel.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index dd56c7e..4cd5232 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -14,7 +14,7 @@
 
 Name:           mate-panel
 Version:        %{branch}.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 #Release:        0.2%{?git_rel}%{?dist}
 Summary:        MATE Desktop panel and applets
 #libs are LGPLv2+ applications GPLv2+
@@ -38,7 +38,6 @@ Requires:       hicolor-icon-theme
 # rhbz (#1007219)
 Requires:       caja-schemas
 
-BuildRequires:  chrpath
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gobject-introspection-devel
@@ -91,6 +90,9 @@ Development files for mate-panel
            --with-gtk=2.0                         \
            --enable-introspection
 
+# To work around rpath
+autoreconf -fi
+
 # remove unused-direct-shlib-dependency
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
@@ -104,10 +106,10 @@ find %{buildroot} -name '*.la' -exec rm -rf {} ';'
 find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 
 # https://github.com/mate-desktop/mate-panel/issues/165
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/mate-panel/fish-applet
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/mate-panel/notification-area-applet
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/mate-panel/clock-applet
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/mate-panel/wnck-applet
+#chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/mate-panel/fish-applet
+#chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/mate-panel/notification-area-applet
+#chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/mate-panel/clock-applet
+#chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/mate-panel/wnck-applet
 
 desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications \
@@ -171,6 +173,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu Feb 13 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.2-2
+- Add autoreconf -fi to work around rpath.
+
 * Sun Feb 09 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.2-1
 - Update to 1.7.2
 


More information about the scm-commits mailing list