rpms/xmonad/F-11 .cvsignore,1.1,1.2 xmonad.spec,1.3,1.4

[Jens Petersen]

Author: petersen

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

Modified Files:
	.cvsignore xmonad.spec 
Log Message:
backport from devel for ghc-6.10.3 rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmonad/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 May 2009 20:56:25 -0000	1.1
+++ .cvsignore	2 Jun 2009 13:29:42 -0000	1.2
@@ -0,0 +1 @@
+xmonad-0.8.1.tar.gz


Index: xmonad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmonad/F-11/xmonad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmonad.spec	7 May 2009 02:47:53 -0000	1.3
+++ xmonad.spec	2 Jun 2009 13:29:43 -0000	1.4
@@ -1,8 +1,4 @@
 %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
@@ -12,7 +8,7 @@
 
 Name:           xmonad
 Version:        0.8.1
-Release:        12%{?dist}.1
+Release:        14%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -25,13 +21,13 @@ 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 = %{ghc_version}
+BuildRequires:  ghc, ghc-rpm-macros
 BuildRequires:  ghc-X11-devel >= %{X11_version}
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}, ghc-X11-prof >= %{X11_version}
+BuildRequires:  ghc-prof, ghc-X11-prof >= %{X11_version}
 %endif
 Requires:       ghc-%{name}-devel = %{version}-%{release}
 # required until there is a command to open some system default
@@ -96,12 +92,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}
@@ -164,9 +154,8 @@ fi
 
 
 %if %{with doc}
-%files -n ghc-%{name}-doc
+%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -177,8 +166,12 @@ fi
 
 
 %changelog
-* Thu May  7 2009 Jens Petersen <petersen at redhat.com> - 0.8.1-12.fc11.1
-- backport to cabal2spec-0.12
+* Tue Jun  2 2009 Jens Petersen <petersen at redhat.com> - 0.8.1-14
+- ppc runghc workaround no longer needed
+
+* Sat May 16 2009 Jens Petersen <petersen at redhat.com> - 0.8.1-13
+- buildrequires ghc-rpm-macros (cabal2spec-0.16)
+- rebuild for ghc-6.10.3
 
 * Wed May  6 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-12
 - applies changes from jens' patch