[leksah/f18] Fix bug #863499. Bring back deps.patch to make leksah executable independent of leksah shared librar
narasim
narasim at fedoraproject.org
Fri Oct 12 02:02:16 UTC 2012
commit 3d94dca4f94e7f35ab96e3ea8ff343f9a931ab1d
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date: Fri Oct 12 02:00:50 2012 +0000
Fix bug #863499. Bring back deps.patch to make leksah executable independent of leksah shared library
new file: deps.patch
modified: leksah.spec
deps.patch | 23 +++++++++++++++++++++++
leksah.spec | 9 ++++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/deps.patch b/deps.patch
new file mode 100644
index 0000000..6b0ab4d
--- /dev/null
+++ b/deps.patch
@@ -0,0 +1,23 @@
+--- leksah-orig-0.12.1.3/leksah.cabal 2012-06-25 06:15:29.000000000 +0000
++++ leksah-0.12.1.3/leksah.cabal 2012-10-12 01:56:49.897788202 +0000
+@@ -199,8 +199,18 @@
+ gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
+ QuickCheck >=2.4.2 && <2.5
+ else
+- hs-source-dirs: main
+- build-depends: leksah ==0.12.1.3, base >=4.0.0.0 && <= 5
++ hs-source-dirs: src, main
++ build-depends: Cabal >=1.6.0.1 && <1.15, base >=4.0.0.0 && <= 5, binary >=0.5.0.0 && <0.6,
++ bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,
++ filepath >=1.1.0.1 && <1.4, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,
++ gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.2, old-time >=1.0.0.1 && <1.2,
++ parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
++ regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.5,
++ time >=0.1 && <1.5, ltk >= 0.12.1.0 && <0.13, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,
++ hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.2 && <0.13, network >= 2.2 && <3.0,
++ ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
++ gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
++ QuickCheck >=2.4.2 && <2.5
+
+ default-language: Haskell98
+ main-is: Main.hs
diff --git a/leksah.spec b/leksah.spec
index f4aade6..3dea888 100644
--- a/leksah.spec
+++ b/leksah.spec
@@ -11,7 +11,7 @@ Haskell written in Haskell. Leksah uses GTK+ as GUI Toolkit.
Name: %{pkg_name}
Version: 0.12.1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Haskell IDE
Group: Development/Tools
# LICENSE file is GPLv2 while sources only mention GPL, hence GPL+.
@@ -50,6 +50,7 @@ Requires: leksah-server
# patches
Patch1: haddock.patch
+Patch2: deps.patch
%description
%{common_description}
@@ -58,6 +59,7 @@ Patch1: haddock.patch
%prep
%setup -q
%patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
%build
@@ -138,6 +140,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Oct 12 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.1.3-6
+- Bring back deps.patch to fix bug #863499 . Without this patch, leksah binary depends \
+on its shared library. Loader is not able to resolve this at runtime because \
+the rpath information for leksah shared library is incorrect.
+
* Tue Oct 02 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.1.3-5
- Rebuild for ghc-7.4.1
More information about the scm-commits
mailing list