[bluetile] fix dependency inheritance between executables by building with cabal 1.8 API
Jens Petersen
petersen at fedoraproject.org
Mon Jan 28 02:20:37 UTC 2013
commit bed51f2d614f32e7963a5fa68ae645a2c341226c
Author: Jens Petersen <petersen at redhat.com>
Date: Mon Jan 28 11:20:26 2013 +0900
fix dependency inheritance between executables by building with cabal 1.8 API
bluetile-0.6-Cabal-version.patch | 29 +++++++++++++++++++++++++++++
bluetile.spec | 8 +++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/bluetile-0.6-Cabal-version.patch b/bluetile-0.6-Cabal-version.patch
new file mode 100644
index 0000000..1e37972
--- /dev/null
+++ b/bluetile-0.6-Cabal-version.patch
@@ -0,0 +1,29 @@
+--- bluetile-0.6/bluetile.cabal~ 2011-11-27 07:55:01.000000000 +0900
++++ bluetile-0.6/bluetile.cabal 2013-01-28 10:44:56.158550511 +0900
+@@ -38,7 +38,7 @@
+ etc/bluetilerc,
+ etc/bluetilerc_user_template
+ Build-Type: Custom
+-Cabal-Version: >=1.6
++Cabal-Version: >=1.8
+ Source-Repository head
+ type: darcs
+ location: http://code.haskell.org/~jav/bluetile/
+@@ -69,7 +69,7 @@
+ Buildable: True
+ Hs-Source-Dirs: bluetiledock
+ Main-is: BluetileDock.hs
+- Build-Depends: base>=3, base<5, unix, glade, gtk, X11>=1.4
++ Build-Depends: base>=3, base<5, filepath, unix, glade, gtk, X11>=1.4
+ pkgconfig-depends: gtk+-2.0
+ C-sources: bluetiledock/gdk_property_change_wrapper.c
+ if true
+@@ -91,7 +91,7 @@
+ Buildable: True
+ Hs-Source-Dirs: bluetilegreet
+ Main-is: BluetileGreet.hs
+- Build-Depends: base>=3, base<5, directory, filepath, glade, gtk
++ Build-Depends: base>=3, base<5, directory, filepath, unix, glade, gtk
+ if true
+ Ghc-Options: -Wall
+ if impl(ghc >= 6.12.1)
diff --git a/bluetile.spec b/bluetile.spec
index 85ed673..e2c44f9 100644
--- a/bluetile.spec
+++ b/bluetile.spec
@@ -3,13 +3,14 @@
Name: bluetile
Version: 0.6
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Tiling window manager for GNOME
License: BSD
URL: http://hackage.haskell.org/package/%{name}
Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
Source1: gnome-bluetile-session
+Patch1: bluetile-0.6-Cabal-version.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -47,6 +48,7 @@ conventions and providing both mouse and keyboard access for all features.
%prep
%setup -q
+%patch1 -p1 -b .orig
%build
@@ -80,6 +82,10 @@ install -p -m 0644 man/bluetile.1 %{buildroot}%{_mandir}/man1
%changelog
+* Mon Jan 28 2013 Jens Petersen <petersen at redhat.com> - 0.6-12
+- build with Cabal >= 1.8 to stop the dependency inheritance between
+ the executables (see https://github.com/haskell/cabal/issues/822)
+
* Fri Jan 18 2013 Jens Petersen <petersen at redhat.com> - 0.6-11
- rebuild
More information about the scm-commits
mailing list