rpms/ghc-X11/devel ghc-X11.spec,1.9,1.10

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-X11.spec 
Log Message:
just try defining ghc_version (take5)


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ghc-X11.spec	23 Apr 2009 08:13:03 -0000	1.9
+++ ghc-X11.spec	23 Apr 2009 08:24:55 -0000	1.10
@@ -3,9 +3,7 @@
 %bcond_without doc
 %bcond_without prof
 
-# placate mock
-%{!?ghcrequires: %{expand:%%define ghcrequires()\
-Requires: %1}}
+%{expand: %%define ghc_ver %(ghc --numeric-version)}
 
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -41,7 +39,9 @@
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-%{expand:%%ghcrequires ghc post preun}
+Requires:       ghc = %{ghc_version}
+Requires(post): ghc = %{ghc_version}
+Requires(preun): ghc = %{ghc_version}
 Requires:       libXinerama-devel, libX11-devel, libXext-devel
 
 %description devel
@@ -53,7 +53,9 @@
 %package doc
 Summary: Documentation for %{name}
 Group: Development/Libraries
-%{expand:%%ghcrequires ghc-doc post postun}
+Requires:       ghc-doc = %{ghc_version}
+Requires(post): ghc-doc = %{ghc_version}
+Requires(postun): ghc-doc = %{ghc_version}
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -62,10 +64,10 @@
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-%{expand:%%ghcrequires ghc-prof}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       ghc-prof = %{ghc_version}
 
 %description prof
 This package contains profiling libraries for %{name}.
@@ -140,8 +142,8 @@
 %changelog
 * Mon Apr 20 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-7
 - rebuild with ghc-6.10.2
-- update to latest cabal2spec template and macros.ghc without ghc_version
-- maybe define ghcrequires for mock
+- update to latest cabal2spec template and macros.ghc
+- get ghc_version from ghc
 
 * Sat Apr  4 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-6
 - rebuild bump to raise EVR manually, to match with F-10 branch