bruno pushed to hedgewars (f20). "Fix rpath problem (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 00:07:07 UTC 2015
>From e59ac5792980fad89806d0c541aba7369ccde8f4 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno at wolff.to>
Date: Tue, 7 Apr 2015 14:35:41 -0500
Subject: Fix rpath problem
rpaths that shouldn't have been there were breaking things for some
people.
diff --git a/hedgewars.spec b/hedgewars.spec
index 59b16d2..33d2d45 100644
--- a/hedgewars.spec
+++ b/hedgewars.spec
@@ -1,6 +1,6 @@
Name: hedgewars
Version: 0.9.21.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Funny turn-based artillery game, featuring fighting Hedgehogs!
Group: Amusements/Games
License: GPL+
@@ -10,6 +10,7 @@ Source0: http://download.gna.org/hedgewars/hedgewars-src-%{version}.tar.b
# The hedgewars physfs helper library needs to be installed in the correct
# library directory according to arch
Patch5: hedgewars-multilib.patch
+Patch6: rpath-fix.patch
BuildRequires: fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
BuildRequires: SDL_ttf-devel openssl-devel cmake desktop-file-utils
BuildRequires: libpng-devel physfs-devel
@@ -57,6 +58,7 @@ A standalone server that can be used for LAN play or a private internet server.
#%setup -q -n %{name}-src-%{version}
%setup -q -n hedgewars-src-0.9.21
%patch5 -p0
+%patch6 -p0
# Make sure that we don't use bundled libraries
rm -r misc/liblua misc/libphysfs
@@ -149,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Apr 07 2015 Bruno Wolff III <bruno at wolff.to> - 0.9.21.1-4
+- Fix rpath issue
+
* Mon Feb 16 2015 Bruno Wolff III <bruno at wolff.to> - 0.9.21.1-3
- Use ghc-bytestring-shiw
diff --git a/rpath-fix.patch b/rpath-fix.patch
new file mode 100644
index 0000000..eaac5dc
--- /dev/null
+++ b/rpath-fix.patch
@@ -0,0 +1,9 @@
+--- cmake_modules/paths.cmake.orig 2015-04-07 13:52:49.439413468 -0500
++++ cmake_modules/paths.cmake 2015-04-07 13:55:02.617339698 -0500
+@@ -66,5 +66,5 @@
+ # - the second is the same directory of the executable (so it runs in bin/)
+ # - the third one is the full path of the system dir
+ #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
+- set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
++ #set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
+ endif(APPLE)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/hedgewars.git/commit/?h=f20&id=e59ac5792980fad89806d0c541aba7369ccde8f4
More information about the scm-commits
mailing list