rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.13, 1.14 ghc-rpm-macros.spec, 1.15, 1.16

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
use -n in ghc_requires and ghc_prof_requires for when no pkg_name


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ghc-rpm-macros.ghc	10 Jan 2010 14:59:10 -0000	1.13
+++ ghc-rpm-macros.ghc	11 Jan 2010 03:13:01 -0000	1.14
@@ -51,7 +51,7 @@ install --mode=0644 %{pkg_name}-%{versio
 Requires(post): ghc = %{ghc_version}\
 Requires(postun): ghc = %{ghc_version}\
 %if %{with shared}\
-Requires:       ghc-%{pkg_name} = %{version}-%{release}\
+Requires:       ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}} = %{version}-%{release}\
 %endif
 
 %ghc_doc_requires Requires:       ghc-doc = %{ghc_version}\
@@ -59,7 +59,7 @@ Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
 %ghc_prof_requires Requires:       ghc-prof = %{ghc_version}\
-Requires:       ghc-%{pkg_name}-devel = %{version}-%{release}
+Requires:       ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}}-devel = %{version}-%{release}
 
 %ghc_lib_package(n:c:h:)\
 %define ghc_pkg_name %{-n:ghc-%{-n*}}%{!-n:ghc-%{pkg_name}}\


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ghc-rpm-macros.spec	10 Jan 2010 14:59:10 -0000	1.15
+++ ghc-rpm-macros.spec	11 Jan 2010 03:13:01 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 0.5.2-1
+- use -n in ghc_requires and ghc_prof_requires for when no pkg_name
+
 * Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 0.5.1-1
 - add ghcdocbasedir
 - revert ghcdocdir to match upstream ghc