rpms/ghc-ghc-paths/F-11 ghc-ghc-paths.spec,1.1,1.2

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-ghc-paths/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17837

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


Index: ghc-ghc-paths.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-ghc-paths/F-11/ghc-ghc-paths.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-ghc-paths.spec	9 Mar 2009 05:10:56 -0000	1.1
+++ ghc-ghc-paths.spec	29 May 2009 22:50:17 -0000	1.2
@@ -1,8 +1,4 @@
 %global pkg_name ghc-paths
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -12,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.1.0.5
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Interface to GHC's installation directories
 
 Group:          Development/Libraries
@@ -22,12 +18,12 @@ Source0:        http://hackage.haskell.o
 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
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -79,7 +75,7 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -128,9 +124,8 @@ fi
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -141,6 +136,12 @@ fi
 
 
 %changelog
+* Sun May 24 2009 Jens Petersen <petersen at redhat.com> - 0.1.0.5-7
+- buildrequires ghc-rpm-macros (cabal2spec-0.16)
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.1.0.5-6
+- update to cabal2spec-0.14
+
 * Mon Mar  9 2009 Jens Petersen <petersen at redhat.com> - 0.1.0.5-5
 - package renamed from ghc-paths
 - update to cabal2spec-0.12