rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

replace devel ghc requires with ghc-compiler

Browse Source
This commit is contained in:
Jens Petersen 2011-11-01 21:18:49 +09:00
parent 0b163b3d06
commit 7229f10396
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-rpm-macros.ghc
View File

@ -84,9 +84,9 @@ install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\
%{nil} %{nil}
# devel pkg basic requires # devel pkg basic requires
%ghc_devel_requires Requires: ghc = %{ghc_version}\ %ghc_devel_requires Requires: ghc-compiler = %{ghc_version}\
Requires(post): ghc = %{ghc_version}\ Requires(post): ghc-compiler = %{ghc_version}\
Requires(postun): ghc = %{ghc_version}\ Requires(postun): ghc-compiler = %{ghc_version}\
%if %{undefined ghc_without_shared}\ %if %{undefined ghc_without_shared}\
Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\ Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\
%endif %endif

6
ghc-rpm-macros.spec
View File

@ -3,7 +3,7 @@
%global macros_file %{_sysconfdir}/rpm/macros.ghc %global macros_file %{_sysconfdir}/rpm/macros.ghc
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.13.13 Version: 0.14
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -53,13 +53,15 @@ EOF
%files %files
%defattr(-,root,root,-)
%doc COPYING AUTHORS %doc COPYING AUTHORS
%config(noreplace) %{macros_file} %config(noreplace) %{macros_file}
%{_prefix}/lib/rpm/ghc-deps.sh %{_prefix}/lib/rpm/ghc-deps.sh
%changelog %changelog
* Tue Nov 1 2011 Jens Petersen <petersen@redhat.com> - 0.14-1
- replace devel ghc requires with ghc-compiler
* Mon Oct 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.13-1 * Mon Oct 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.13-1
- add ghc_bootstrapping to ghc_bootstrap for packages other than ghc - add ghc_bootstrapping to ghc_bootstrap for packages other than ghc
- make ghc-deps.sh also work when bootstrapping a new ghc version - make ghc-deps.sh also work when bootstrapping a new ghc version