rpms/xmonad/F-11 xmonad.spec,1.1,1.2

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/xmonad/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6232

Modified Files:
	xmonad.spec 
Log Message:
backport to cabal2spec-0.12



Index: xmonad.spec
===================================================================
RCS file: /cvs/extras/rpms/xmonad/F-11/xmonad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmonad.spec	6 May 2009 22:00:28 -0000	1.1
+++ xmonad.spec	7 May 2009 02:39:40 -0000	1.2
@@ -1,4 +1,8 @@
 %global X11_version 1.4.3
+%global ghc_version 6.10.1
+
+%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
+%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -8,7 +12,7 @@
 
 Name:           xmonad
 Version:        0.8.1
-Release:        12%{?dist}
+Release:        12%{?dist}.1
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -21,16 +25,14 @@ Patch0:         xmonad-config-manpage.pa
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
+BuildRequires:  ghc = %{ghc_version}
 BuildRequires:  ghc-X11-devel >= %{X11_version}
 %if %{with doc}
-BuildRequires:  ghc-doc
+BuildRequires:  ghc-doc = %{ghc_version}
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof, ghc-X11-prof >= %{X11_version}
+BuildRequires:  ghc-prof = %{ghc_version}, ghc-X11-prof >= %{X11_version}
 %endif
-# for latest macros.ghc
-BuildRequires:  ghc >= 6.10.2-3
 Requires:       ghc-%{name}-devel = %{version}-%{release}
 # required until there is a command to open some system default
 # xterminal
@@ -94,12 +96,6 @@ This package contains profiling librarie
 %patch0 -p1 -b .orig
 
 %build
-%ifarch ppc
-# hack around mysterious runghc fail
-%global cabal ./cabal
-ghc --make Setup -o cabal
-%endif
-
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
@@ -162,8 +158,9 @@ fi
 
 
 %if %{with doc}
-%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
+%files -n ghc-%{name}-doc
 %defattr(-,root,root,-)
+%{pkg_docdir}
 %endif
 
 
@@ -174,6 +171,9 @@ fi
 
 
 %changelog
+* Thu May  7 2009 Jens Petersen <petersen at redhat.com> - 0.8.1-12.fc11.1
+- backport to cabal2spec-0.12
+
 * Wed May  6 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-12
 - applies changes from jens' patch
 - renames xmonad.desktop entry