Browse Source

rebuild without cabal-install

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10232 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 8 years ago
parent
commit
1068e621d7
1 changed files with 19 additions and 22 deletions
  1. 19 22
      h/hscolour/hscolour-vl.spec

+ 19 - 22
h/hscolour/hscolour-vl.spec

@@ -1,16 +1,6 @@
 %define pkg_name    hscolour
 %define pkg_version 1.24
-%define pkg_release 3%{?_dist_release}
-
-%define ghc_version 7.10.3
-
-%ifarch %{ix86}
-%define rpmarch i386
-%endif
-%ifarch x86_64
-%define rpmarch x86_64
-%endif
-
+%define pkg_release 4%{?_dist_release}
 
 Summary: A small Haskell script to colourise Haskell code
 Name:    %{pkg_name}
@@ -20,13 +10,13 @@ Release: %{pkg_release}
 License: GPLv2
 Group:   Applications/Text
 URL:     http://hackage.haskell.org
-Source0: http://hackage.haskell.org/package/%{name}-%{pkg_version}/%{name}-%{pkg_version}.tar.gz
+Source0: http://hackage.haskell.org/package/%{pkg_name}-%{pkg_version}/%{pkg_name}-%{pkg_version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
-BuildRequires: ghc
-BuildRequires: haskell-platform-base cabal-install
-BuildRequires: gmp-devel libffi-devel
+BuildRequires: ghc-bootstrap
+BuildRequires: gmp-devel
+BuildRequires: libffi-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -46,15 +36,17 @@ XHTML 1.0 with inline CSS styling, LaTeX, and mIRC chat codes.
 %setup -q
 
 %build
-cabal configure \
-      --prefix=%{_prefix} \
-      --libsubdir=%{_libdir}/ghc-lib/%{name}-%{version} \
-      --datasubdir=%{_docdir}/%{name}-%{version} \
-      --docdir=%{_docdir}/%{name}-%{version}
-cabal build
+ghc -threaded --make Setup
+./Setup configure \
+        --disable-shared \
+        --prefix=%{_prefix} \
+        --libsubdir=%{_libdir}/ghc-lib/%{name}-%{version} \
+        --datasubdir=%{_docdir}/%{name}-%{version} \
+        --docdir=%{_docdir}/%{name}-%{version}
+./Setup build
 
 %install
-cabal copy --destdir=${RPM_BUILD_ROOT}
+./Setup copy --destdir=${RPM_BUILD_ROOT}
 
 cd ${RPM_BUILD_ROOT}%{_bindir}
 %{__ln_s} HsColour hscolour
@@ -72,6 +64,10 @@ cd ${RPM_BUILD_ROOT}%{_bindir}
 
 
 %changelog
+* Mon May 02 2016 Toshiaki Ara <ara_t@384.jp> 1.24-4
+- rebuilt under ghc-bootstrap only (without haskell-platform)
+- delete Requires: ghc
+
 * Mon Apr 11 2016 Toshiaki Ara <ara_t@384.jp> 1.24-3
 - correct SPEC file
 
@@ -80,3 +76,4 @@ cd ${RPM_BUILD_ROOT}%{_bindir}
 
 * Tue Feb 09 2016 Toshiaki Ara <ara_t@384.jp> 1.24-1
 - new package
+