Bladeren bron

ghc: update to 8.4.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11629 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 6 jaren geleden
bovenliggende
commit
4c32b1c409
1 gewijzigde bestanden met toevoegingen van 13 en 2 verwijderingen
  1. 13 2
      g/ghc/ghc-vl.spec

+ 13 - 2
g/ghc/ghc-vl.spec

@@ -1,5 +1,5 @@
 %define pkg_name    ghc
-%define pkg_version 8.2.2
+%define pkg_version 8.4.2
 # %define pkg_subversion b
 %define pkg_release 1%{?_dist_release}
 
@@ -22,6 +22,7 @@ URL:     https://www.haskell.org/ghc
 
 # Source0: %{name}-%{version}%{pkg_subversion}-src.tar.bz2
 Source0: %{name}-%{version}-src.tar.xz
+Source1: macros.ghc
 
 # https://phabricator.haskell.org/D4159
 # ghc-pkg: recompute `abi-depends` for updated packages
@@ -81,7 +82,7 @@ Highlights:
 %patch1 -p1 -b .fix-shadowed_dependencies
 
 %build
-./configure \
+%{_configure} \
     --prefix=%{_prefix} \
     --libdir=%{_libdir} \
     --docdir=%{_docdir}/%{name}-%{version} \
@@ -93,6 +94,11 @@ Highlights:
 %{__cp} ANNOUNCE LICENSE \
         ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 
+# macros for building haskell-platform-related packages
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
+%{__sed} -e "s/@GHC_VERSION@/%{version}/" %{SOURCE1} \
+ > ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
+
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
@@ -106,9 +112,14 @@ Highlights:
 %{_libdir}/ghc-%{version}/
 %{_docdir}/ghc-%{version}/
 %{_mandir}/man1/
+%{_sysconfdir}/rpm/
 
 
 %changelog
+* Thu May 17 2018 Toshiaki Ara <ara_t@384.jp> 8.4.2-1
+- update to 8.4.2
+- add /etc/rpm/macros.ghc
+
 * Sat Jan 06 2018 Toshiaki Ara <ara_t@384.jp> 8.2.2-1
 - update to 8.2.2
 - add Patch1 (ghc-8.2.2-fix-shadowed_dependencies.patch)