[mate-control-center] Add autoreconf -fi to work around rpath
Dan Mashal
vicodan at fedoraproject.org
Thu Feb 13 08:27:47 UTC 2014
commit 38d4ccbb06096af3627ce500840e694f3c371673
Author: Dan Mashal <dan.mashal at gmail.com>
Date: Thu Feb 13 00:28:15 2014 -0800
Add autoreconf -fi to work around rpath
mate-control-center.spec | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index 79d36ba..e8aa4b1 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -14,7 +14,7 @@
Name: mate-control-center
Version: %{branch}.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MATE Desktop control-center
License: LGPLv2+ and GPLv2+
URL: http://mate-desktop.org
@@ -25,7 +25,6 @@ URL: http://mate-desktop.org
# Source for snapshot-builds.
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
-BuildRequires: chrpath
BuildRequires: dconf-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
@@ -80,12 +79,15 @@ Development files for mate-control-center
%setup -q%{!?rel_build:n %{name}-%{commit}}
%build
-%configure \
- --disable-static \
+%configure \
+ --disable-static \
--disable-schemas-compile \
- --disable-update-mimedb \
+ --disable-update-mimedb \
--disable-scrollkeeper
+# To work around rpath
+autoreconf -fi
+
# remove unused-direct-shlib-dependency
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -99,20 +101,20 @@ find %{buildroot} -name '*.la' -exec rm -rf {} ';'
find %{buildroot} -name '*.a' -exec rm -rf {} ';'
# https://github.com/mate-desktop/mate-control-center/issues/84
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/libmarco.so
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-appearance-properties
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-keyboard-properties
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-at-properties
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-font-viewer
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-control-center
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-keybinding-properties
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-default-applications-properties
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-window-properties
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-thumbnail-font
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-about-me
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-mouse-properties
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-display-properties
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-network-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/libmarco.so
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-appearance-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-keyboard-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-at-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-font-viewer
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-control-center
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-keybinding-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-default-applications-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-window-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-thumbnail-font
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-about-me
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-mouse-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-display-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-network-properties
desktop-file-install \
--delete-original \
@@ -188,6 +190,12 @@ fi
%changelog
+* Thu Feb 13 2014 Dan Mashal <dan.mashal at fedoraproject.org> 1.7.0-2
+- Add autoreconf to work around rpath.
+
+* Sun Feb 09 2014 Dan Mashal <dan.mashal at fedoraproject.org> 1.7.0-1
+- Update to 1.7.0 release.
+
* Sat Dec 21 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.0-0.2.git20131113.922d0e0
- make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser
- use BR marco-devel
More information about the scm-commits
mailing list