[caja] Add autoreconf -fi as a work around for rpath
Dan Mashal
vicodan at fedoraproject.org
Wed Feb 12 20:02:11 UTC 2014
commit ba5141b230bc7a858a79d8d21ed560ce34773c7d
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Wed Feb 12 12:02:31 2014 -0800
Add autoreconf -fi as a work around for rpath
caja.spec | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/caja.spec b/caja.spec
index 4d32cda..d8f9bc4 100644
--- a/caja.spec
+++ b/caja.spec
@@ -14,8 +14,8 @@
Name: caja
Summary: File manager for MATE
-Version: %{branch}.2
-Release: 1%{?dist}
+Version: %{branch}.3
+Release: 2%{?dist}
#Release: 0.6%{?git_rel}%{?dist}
License: GPLv2+ and LGPLv2+
Group: User Interface/Desktops
@@ -38,7 +38,6 @@ Patch2: caja_rearranged-caja-sidebar-to-1.4-style.patch
Patch3: caja_x-caja-window-debug.patch
Patch4: caja_x-caja-window-surpress.patch
-BuildRequires: chrpath
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
BuildRequires: exempi-devel
@@ -57,9 +56,11 @@ Requires: gamin
Requires: filesystem
Requires: redhat-menus
Requires: gvfs
+
# the main binary links against libcaja-extension.so
# don't depend on soname, rather on exact version
Requires: %{name}-extensions%{?_isa} = %{version}-%{release}
+
# needed for using mate-text-editor as stanalone in another DE
Requires: %{name}-schemas%{?_isa} = %{version}-%{release}
@@ -89,7 +90,7 @@ Obsoletes: mate-file-manager-extensions < %{version}-%{release}
%description extensions
This package provides the libraries used by caja extensions.
-# needed for using mate-text-editor as stanalone in another DE
+# needed for using mate-text-editor (pluma) as stanalone in another DE
%package schemas
Summary: Mate-file-manager schemas
License: LGPLv2+
@@ -139,6 +140,8 @@ sed -i -e 's,Exec=caja -n,Exec=/usr/bin/caja-autostart,g' data/caja.desktop.in.i
--with-gtk=2.0 \
--disable-update-mimedb
+# To work around rpath
+autoreconf -fi
#drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
@@ -156,11 +159,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/.icon-theme.cache
# https://github.com/mate-desktop/caja/issues/207
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/caja-convert-metadata
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-connect-server
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-autorun-software
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-file-management-properties
+#chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/caja-convert-metadata
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-connect-server
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-autorun-software
+#chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-file-management-properties
mkdir -p $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0
@@ -248,6 +251,9 @@ fi
%changelog
+* Wed Feb 12 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.2-2
+- Add autoreconf -fi to fix rpath issues.
+
* 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