use -n in ghc_requires and ghc_prof_requires for when no pkg_name
This commit is contained in:
parent
c97ee70960
commit
5f3759a686
@ -51,7 +51,7 @@ install --mode=0644 %{pkg_name}-%{version}.conf $RPM_BUILD_ROOT%{_libdir}/ghc-%{
|
|||||||
Requires(post): ghc = %{ghc_version}\
|
Requires(post): ghc = %{ghc_version}\
|
||||||
Requires(postun): ghc = %{ghc_version}\
|
Requires(postun): ghc = %{ghc_version}\
|
||||||
%if %{with shared}\
|
%if %{with shared}\
|
||||||
Requires: ghc-%{pkg_name} = %{version}-%{release}\
|
Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}} = %{version}-%{release}\
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ghc_doc_requires Requires: ghc-doc = %{ghc_version}\
|
%ghc_doc_requires Requires: ghc-doc = %{ghc_version}\
|
||||||
@ -59,7 +59,7 @@ Requires(post): ghc-doc = %{ghc_version}\
|
|||||||
Requires(postun): ghc-doc = %{ghc_version}
|
Requires(postun): ghc-doc = %{ghc_version}
|
||||||
|
|
||||||
%ghc_prof_requires Requires: ghc-prof = %{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:)\
|
%ghc_lib_package(n:c:h:)\
|
||||||
%define ghc_pkg_name %{-n:ghc-%{-n*}}%{!-n:ghc-%{pkg_name}}\
|
%define ghc_pkg_name %{-n:ghc-%{-n*}}%{!-n:ghc-%{pkg_name}}\
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 0.5.1
|
Version: 0.5.2
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Macros for building packages for GHC
|
Summary: Macros for building packages for GHC
|
||||||
|
|
||||||
@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 11 2010 Jens Petersen <petersen@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@redhat.com> - 0.5.1-1
|
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 0.5.1-1
|
||||||
- add ghcdocbasedir
|
- add ghcdocbasedir
|
||||||
- revert ghcdocdir to match upstream ghc
|
- revert ghcdocdir to match upstream ghc
|
||||||
|
Loading…
Reference in New Issue
Block a user