Accepting request 123378 from home:ptrommler:branches:devel:languages:haskell
New package structure following Fedora. Enable patch2. Do autoreconf in all subdirectories (perl boot). OBS-URL: https://build.opensuse.org/request/show/123378 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=104
This commit is contained in:
Peter Trommler
Git OBS Bridge
parent
92e125ff8d
commit
a1c5007a25
25
ghc.changes
25
ghc.changes
@ -1,8 +1,33 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 3 11:44:09 UTC 2012 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
- apply patch 2
|
||||
- use perl boot to autoreconf all subdirectories
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 28 11:11:43 UTC 2012 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
- added LICENSE to library and base package
|
||||
- should probably be ignored in rpmlintrc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 28 07:25:35 UTC 2012 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
- follow Fedora packaging:
|
||||
- package compiler in ghc-compiler
|
||||
- meta package for all libraries
|
||||
- ghc became meta package for everything
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 26 06:56:22 UTC 2012 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
- deleted extra BR after project configuration fix
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 25 12:56:11 UTC 2012 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
- remove minimum version requirement for gmp-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 19 16:00:19 UTC 2012 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
|
||||
68
ghc.spec
68
ghc.spec
@ -47,6 +47,7 @@ BuildRequires: ghc-rpm-macros >= 0.14
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: gmp-devel
|
||||
@ -59,13 +60,11 @@ BuildRequires: docbook-utils
|
||||
%if %{undefined without_haddock} && %{undefined without_hscolour}
|
||||
BuildRequires: hscolour
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
#BuildRequires: fdupes
|
||||
PreReq: update-alternatives
|
||||
Requires: gcc
|
||||
Requires: gmp-devel
|
||||
Requires: ghc-base-devel
|
||||
# Fedora put compiler into ghc-compiler and left ghc empty?!
|
||||
Provides: ghc-compiler = %{version}
|
||||
Requires: ghc-compiler = %{version}-%{release}
|
||||
Requires: ghc-libraries = %{version}-%{release}
|
||||
Requires: ghc-ghc-devel = %{version}-%{release}
|
||||
Source: %{name}-%{version}-src.tar.bz2
|
||||
#Patch5 on Fedora
|
||||
Patch: Cabal-option-executable-dynamic.patch
|
||||
@ -93,6 +92,21 @@ specifications, documentation, compilers, interprbeters, references,
|
||||
contact information, links to research groups) are available from the
|
||||
Haskell home page at <http://www.haskell.org/>.
|
||||
|
||||
%package compiler
|
||||
Summary: GHC compiler and utilities
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Languages/Other
|
||||
Requires: gcc
|
||||
Requires: ghc-base-devel
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
|
||||
%description compiler
|
||||
This package contains the GHC compiler, tools and utilities.
|
||||
|
||||
The GHC libraries are provided by ghc-devel.
|
||||
To install all of GHC install package ghc.
|
||||
|
||||
%global ghc_version_override %{version}
|
||||
|
||||
|
||||
@ -129,6 +143,19 @@ Haskell home page at <http://www.haskell.org/>.
|
||||
|
||||
%global version %{ghc_version_override}
|
||||
|
||||
%package libraries
|
||||
Summary: GHC development libraries meta package
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/Other
|
||||
Requires: ghc-compiler = %{version}-%{release}
|
||||
Obsoletes: ghc-devel < %{version}-%{release}
|
||||
Provides: ghc-devel = %{version}-%{release}
|
||||
%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2-%{release},/g")}
|
||||
|
||||
%description libraries
|
||||
This is a meta-package for all the development library packages in GHC
|
||||
except the ghc library, which is installed by the toplevel ghc metapackage.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
rm -r ghc-tarballs/{mingw,perl}
|
||||
@ -137,10 +164,10 @@ rm -r ghc-tarballs/{mingw,perl}
|
||||
%patch1 -p1 -b .libffi
|
||||
%endif
|
||||
|
||||
#%%patch2 -p1 -b .orig
|
||||
%patch2 -p1 -b .orig
|
||||
|
||||
%build
|
||||
autoreconf --force --install
|
||||
perl boot
|
||||
# http://hackage.haskell.org/trac/ghc/wiki/Platforms
|
||||
# cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc
|
||||
cat > mk/build.mk << EOF
|
||||
@ -154,14 +181,6 @@ BUILD_DOCBOOK_HTML = NO
|
||||
%if %{defined without_hscolour}
|
||||
HSCOLOUR_SRCS = NO
|
||||
%endif
|
||||
%ifarch %{unregisterised_archs}
|
||||
GhcUnregisterised=YES
|
||||
%endif
|
||||
%ifarch ppc64
|
||||
GhcNotThreaded=YES
|
||||
SRC_HC_OPTS+=-optc-mminimal-toc -optl-pthread
|
||||
SRC_CC_OPTS+=-mminimal-toc -pthread -Wa,--noexecstack
|
||||
%endif
|
||||
EOF
|
||||
|
||||
export SUSE_ASNEEDED=0
|
||||
@ -226,11 +245,7 @@ done
|
||||
|
||||
%ghc_strip_dynlinked
|
||||
|
||||
|
||||
|
||||
|
||||
%post
|
||||
%ghc_pkg_recache
|
||||
%post compiler
|
||||
# Alas, GHC, Hugs and nhc all come with different set of tools in addition to
|
||||
# a runFOO:
|
||||
#
|
||||
@ -245,15 +260,18 @@ done
|
||||
update-alternatives --install %{_bindir}/runhaskell runhaskell %{_bindir}/runghc 500
|
||||
update-alternatives --install %{_bindir}/hsc2hs hsc2hs %{_bindir}/hsc2hs-ghc 500
|
||||
|
||||
%preun
|
||||
%preun compiler
|
||||
if test "$1" = 0; then
|
||||
update-alternatives --remove runhaskell %{_bindir}/runghc
|
||||
update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc
|
||||
fi
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE
|
||||
|
||||
%files compiler
|
||||
%defattr(-,root,root,-)
|
||||
%doc ANNOUNCE HACKING LICENSE README
|
||||
%{_bindir}/ghc
|
||||
%{_bindir}/ghc-%{version}
|
||||
@ -313,4 +331,8 @@ fi
|
||||
%ghost %{ghcdocbasedir}/libraries/plus.gif
|
||||
%endif
|
||||
|
||||
%files libraries
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user