ghc-file-embed is now a fedora package

This commit is contained in:
Jens Petersen 2017-08-30 13:10:24 -04:00
parent a539ba603b
commit ad882f75cb

View File

@ -4,8 +4,6 @@
%global pkg_name hledger %global pkg_name hledger
%global pkgver %{pkg_name}-%{version} %global pkgver %{pkg_name}-%{version}
# https://bugzilla.redhat.com/show_bug.cgi?id=1426896
%global fileembed file-embed-0.0.10
%global here here-1.2.9 %global here here-1.2.9
# here needs # here needs
%global haskellsrcmeta haskell-src-meta-0.7.0.1 %global haskellsrcmeta haskell-src-meta-0.7.0.1
@ -14,19 +12,18 @@
%global thliftinstances th-lift-instances-0.1.11 %global thliftinstances th-lift-instances-0.1.11
%global thorphans th-orphans-0.13.3 %global thorphans th-orphans-0.13.3
%global threifymany th-reify-many-0.1.6 %global threifymany th-reify-many-0.1.6
%global subpkgs %{fileembed} %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %global subpkgs %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here}
%bcond_with tests %bcond_with tests
Name: %{pkg_name} Name: %{pkg_name}
Version: 1.2 Version: 1.2
Release: 4%{?dist} Release: 5%{?dist}
Summary: Command-line interface for the hledger accounting tool Summary: Command-line interface for the hledger accounting tool
License: GPLv3 License: GPLv3
Url: https://hackage.haskell.org/package/%{name} Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{fileembed}/%{fileembed}.tar.gz
Source2: https://hackage.haskell.org/package/%{here}/%{here}.tar.gz Source2: https://hackage.haskell.org/package/%{here}/%{here}.tar.gz
Source3: https://hackage.haskell.org/package/%{haskellsrcmeta}/%{haskellsrcmeta}.tar.gz Source3: https://hackage.haskell.org/package/%{haskellsrcmeta}/%{haskellsrcmeta}.tar.gz
Source4: https://hackage.haskell.org/package/%{thexpandsyns}/%{thexpandsyns}.tar.gz Source4: https://hackage.haskell.org/package/%{thexpandsyns}/%{thexpandsyns}.tar.gz
@ -47,7 +44,7 @@ BuildRequires: ghc-containers-devel
BuildRequires: ghc-csv-devel BuildRequires: ghc-csv-devel
BuildRequires: ghc-data-default-devel BuildRequires: ghc-data-default-devel
BuildRequires: ghc-directory-devel BuildRequires: ghc-directory-devel
#BuildRequires: ghc-file-embed-devel BuildRequires: ghc-file-embed-devel
BuildRequires: ghc-filepath-devel BuildRequires: ghc-filepath-devel
BuildRequires: ghc-hashable-devel BuildRequires: ghc-hashable-devel
BuildRequires: ghc-haskeline-devel BuildRequires: ghc-haskeline-devel
@ -115,7 +112,6 @@ This package provides the Haskell %{name} library development files.
%global main_version %{version} %global main_version %{version}
%if %{defined ghclibdir} %if %{defined ghclibdir}
%ghc_lib_subpackage %{fileembed}
%ghc_lib_subpackage %{here} %ghc_lib_subpackage %{here}
%ghc_lib_subpackage %{haskellsrcmeta} %ghc_lib_subpackage %{haskellsrcmeta}
%ghc_lib_subpackage %{thexpandsyns} %ghc_lib_subpackage %{thexpandsyns}
@ -129,7 +125,7 @@ This package provides the Haskell %{name} library development files.
%prep %prep
%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 %setup -q -a2 -a3 -a4 -a5 -a6 -a7 -a8
cabal-tweak-drop-dep mtl-compat cabal-tweak-drop-dep mtl-compat
@ -173,6 +169,9 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hle
%changelog %changelog
* Wed Aug 30 2017 Jens Petersen <petersen@redhat.com> - 1.2-5
- no longer need to subpackage file-embed
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-4 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild