rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.10, 1.11 ghc-rpm-macros.spec, 1.12, 1.13

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
- add cabal_configure_dynamic
- add ghc_requires, ghc_doc_requires, ghc_prof_requires




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ghc-rpm-macros.ghc	15 Dec 2009 21:50:31 -0000	1.10
+++ ghc-rpm-macros.ghc	23 Dec 2009 14:42:16 -0000	1.11
@@ -3,6 +3,8 @@
 %cabal_configure \
 %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{ghcdocdir} --libsubdir='$compiler/$pkgid' %{?with_shared:--enable-shared}
 
+%cabal_configure_dynamic %cabal_configure --ghc-option=-dynamic
+
 %cabal_makefile \
 %cabal makefile -f cabal-rpm.mk \
 make -f cabal-rpm.mk %{_smp_mflags} \
@@ -40,3 +42,16 @@ echo '%{ghcdocdir}' >> %1-doc.files \
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/ghc-%(ghc --numeric-version)/package.conf.d \
 install --mode=0644 %{?pkg_name}%{!?pkg_name:%name}-%{version}.conf $RPM_BUILD_ROOT%{_libdir}/ghc-%{ghc_version}/package.conf.d
  
+%ghc_requires Requires:       ghc = %{ghc_version}\
+Requires(post): ghc = %{ghc_version}\
+Requires(postun): ghc = %{ghc_version}\
+%if %{with shared}\
+Requires:       ghc-%{?pkg_name}%{!?pkg_name:%name} = %{version}-%{release}\
+%endif
+
+%ghc_doc_requires Requires:       ghc-doc = %{ghc_version}\
+Requires(post): ghc-doc = %{ghc_version}\
+Requires(postun): ghc-doc = %{ghc_version}
+
+%ghc_prof_requires Requires:       ghc-prof = %{ghc_version}\
+Requires:       ghc-%{?pkg_name}%{!?pkg_name:%name}-devel = %{version}-%{release}


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ghc-rpm-macros.spec	15 Dec 2009 21:50:31 -0000	1.12
+++ ghc-rpm-macros.spec	23 Dec 2009 14:42:16 -0000	1.13
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.3.1
+Version:	0.4.0
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Jens Petersen <petersen at redhat.com> - 0.4.0-1
+- add cabal_configure_dynamic
+- add ghc_requires, ghc_doc_requires, ghc_prof_requires
+
 * Tue Dec 15 2009 Jens Petersen <petersen at redhat.com> - 0.3.1-1
 - use ghc_version_override to override ghc_version
 - fix pkg .conf filelist match