[leksah] drop deps.patch and link against self with ghc_fix_dynamic_rpath
Jens Petersen
petersen at fedoraproject.org
Wed Jan 30 07:37:37 UTC 2013
commit e7b0ded2386288380f8fb9d818a68520cf234c5b
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Jan 30 16:37:25 2013 +0900
drop deps.patch and link against self with ghc_fix_dynamic_rpath
deps.patch | 23 -----------------------
leksah.spec | 10 +++++++---
2 files changed, 7 insertions(+), 26 deletions(-)
---
diff --git a/leksah.spec b/leksah.spec
index 10eda56..101eb92 100644
--- a/leksah.spec
+++ b/leksah.spec
@@ -10,7 +10,7 @@ Haskell written in Haskell. Leksah uses GTK+ as GUI Toolkit.
Name: %{pkg_name}
Version: 0.12.1.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Haskell IDE
# LICENSE file is GPLv2 while sources only mention GPL, hence GPL+.
@@ -21,7 +21,6 @@ Source1: %{name}.desktop
Source2: %{name}_loadsession.desktop
Source3: %{name}.xml
Patch1: haddock.patch
-Patch2: deps.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -69,7 +68,6 @@ Requires: leksah-server
%prep
%setup -q
%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
cabal-tweak-dep-ver QuickCheck "<2.5" "<2.6"
@@ -88,6 +86,8 @@ desktop-file-install --add-category="Development" --add-category="X-Development
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
install --mode=0644 -D %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages
+%ghc_fix_dynamic_rpath %{name}
+
%ghc_package
@@ -150,6 +150,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Wed Jan 30 2013 Jens Petersen <petersen at redhat.com> - 0.12.1.3-9
+- drop deps.patch and link leksah against itself
+- use new ghc_fix_dynamic_rpath macro
+
* Sat Nov 17 2012 Jens Petersen <petersen at redhat.com> - 0.12.1.3-8
- update with cabal-rpm
More information about the scm-commits
mailing list