rpms/ghc/devel ghc-rpm-macros.ghc, 1.14, 1.15 ghc.spec, 1.81, 1.82 ghc-rpm-requires, 1.1, NONE

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-rpm-macros.ghc ghc.spec 
Removed Files:
	ghc-rpm-requires 
Log Message:
- define ghc_version in macros.ghc in place of ghcrequires
- drop ghc-requires script for now




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ghc-rpm-macros.ghc	19 Apr 2009 04:28:22 -0000	1.14
+++ ghc-rpm-macros.ghc	24 Apr 2009 07:28:14 -0000	1.15
@@ -35,4 +35,4 @@
 
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
-%ghcrequires() %{expand:%(/usr/lib/rpm/ghc-requires %*)}
+%ghc_version %(ghc --numeric-version)


Index: ghc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ghc.spec	19 Apr 2009 04:28:22 -0000	1.81
+++ ghc.spec	24 Apr 2009 07:28:14 -0000	1.82
@@ -16,7 +16,7 @@
 
 Name: ghc
 Version: 6.10.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -26,8 +26,6 @@
 Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
 # /etc/rpm/macros.ghc
 Source2: ghc-rpm-macros.ghc
-# /usr/lib/rpm/ghc-requires
-Source3: ghc-rpm-requires
 URL: http://haskell.org/ghc/
 # libedit-devel > 2.11-2 correctly requires ncurses-devel
 Requires: gcc, gmp-devel, libedit-devel > 2.11-2
@@ -223,6 +221,10 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-3
+- define ghc_version in macros.ghc in place of ghcrequires
+- drop ghc-requires script for now
+
 * Sun Apr 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-2
 - add ghc-requires rpm script to generate ghc version dependencies
   (thanks to Till Maas)


--- ghc-rpm-requires DELETED ---