rpms/ghc-tar/devel ghc-tar.spec,1.1,1.2

[Yaakov Meir Nemoy]

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9183

Modified Files:
	ghc-tar.spec 
Log Message:
Updated to latest cabal2spec


Index: ghc-tar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/devel/ghc-tar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-tar.spec	23 Aug 2009 15:56:10 -0000	1.1
+++ ghc-tar.spec	23 Aug 2009 16:10:23 -0000	1.2
@@ -1,8 +1,4 @@
 %global pkg_name tar
-%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.3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -22,12 +18,13 @@ 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
+BuildRequires:  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
@@ -67,7 +64,8 @@ Requires: %{name}-devel = %{version}-%{r
 Requires: ghc-prof = %{ghc_version}
 
 %description prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -76,7 +74,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
@@ -125,9 +123,8 @@ fi
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -138,5 +135,8 @@ fi
 
 
 %changelog
+* Sun Aug 23 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-2
+- updated to latest cabal2spec output
+
 * Tue Mar  3 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-1
 - initial packaging for Fedora created by cabal2spec