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

require ghc-rpm-macros-0.3.1 and use ghc_version_override

Browse Source
This commit is contained in:
Jens Petersen 2009-12-16 07:58:28 +00:00
parent bedcaee130
commit 0f975a5111
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghc.spec
View File

@ -40,7 +40,7 @@ Obsoletes: ghc682, ghc681, haddock09
# introduced for f11 and can be removed for f13: # introduced for f11 and can be removed for f13:
Obsoletes: haddock < %{haddock_version}, ghc-haddock-devel < %{haddock_version} Obsoletes: haddock < %{haddock_version}, ghc-haddock-devel < %{haddock_version}
Provides: haddock = %{haddock_version} Provides: haddock = %{haddock_version}
BuildRequires: ghc, happy, ghc-rpm-macros >= 0.3.0 BuildRequires: ghc, happy, ghc-rpm-macros >= 0.3.1
BuildRequires: gmp-devel, ncurses-devel BuildRequires: gmp-devel, ncurses-devel
Requires: gcc, gmp-devel Requires: gcc, gmp-devel
%if %{with shared} %if %{with shared}
@ -211,7 +211,7 @@ cat rpm-lib-dir.files rpm-lib.files > ghc-libs.files
cat rpm-dev-dir.files rpm-base.files > ghc.files cat rpm-dev-dir.files rpm-base.files > ghc.files
# subpackage ghc library # subpackage ghc library
%define ghc_version %{version} %define ghc_version_override %{version}
%ghc_gen_filelists ghc-ghc %{version} %ghc_gen_filelists ghc-ghc %{version}
# these are handled as alternatives # these are handled as alternatives
@ -347,13 +347,14 @@ fi
%endif %endif
%changelog %changelog
* Sat Dec 12 2009 Jens Petersen <petersen@redhat.com> - 6.12.1-0.3 * Wed Dec 16 2009 Jens Petersen <petersen@redhat.com> - 6.12.1-0.3
- exclude ghc .conf file from package.conf.d in base package - exclude ghc .conf file from package.conf.d in base package
- use ghc_reindex_haddock - use ghc_reindex_haddock
- add scripts for ghc-ghc-devel and ghc-ghc-doc - add scripts for ghc-ghc-devel and ghc-ghc-doc
- add doc bcond - add doc bcond
- add ghc-6.12.1-gen_contents_index-haddock-path.patch to adjust haddock path - add ghc-6.12.1-gen_contents_index-haddock-path.patch to adjust haddock path
since we removed html/ from libraries path since we removed html/ from libraries path
- require ghc-rpm-macros-0.3.1 and use ghc_version_override
* Sat Dec 12 2009 Jens Petersen <petersen@redhat.com> - 6.12.1-0.2 * Sat Dec 12 2009 Jens Petersen <petersen@redhat.com> - 6.12.1-0.2
- remove redundant mingw and perl from ghc-tarballs/ - remove redundant mingw and perl from ghc-tarballs/