summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Petersen <petersen@redhat.com>2015-01-04 15:21:10 +0900
committerJens Petersen <petersen@redhat.com>2015-01-04 23:10:14 +0900
commitdf0bb26494a37a58c1eb3efc3248df8b72a3efc1 (patch)
treea732246430c69312393922250d55f67a10f466a2
parent3070c10a2f7278933021b9083557c7c50eb16c46 (diff)
downloadpandoc-standalone-df0bb26494a37a58c1eb3efc3248df8b72a3efc1.zip
pandoc-standalone-df0bb26494a37a58c1eb3efc3248df8b72a3efc1.tar.gz
pandoc-standalone-df0bb26494a37a58c1eb3efc3248df8b72a3efc1.tar.xz
build hsb2hs with cabal-install
-rw-r--r--tools/hsb2hs/hsb2hs.spec25
1 files changed, 13 insertions, 12 deletions
diff --git a/tools/hsb2hs/hsb2hs.spec b/tools/hsb2hs/hsb2hs.spec
index eb4b784..302e15a 100644
--- a/tools/hsb2hs/hsb2hs.spec
+++ b/tools/hsb2hs/hsb2hs.spec
@@ -1,6 +1,6 @@
Name: hsb2hs
Version: 0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Preprocesses a file, adding blobs from files as string literals
License: BSD
@@ -17,31 +17,28 @@ BuildRequires: ghc-directory-devel
BuildRequires: ghc-filepath-devel
#BuildRequires: ghc-preprocessor-tools-devel
# End cabal-rpm deps
-BuildRequires: cabal-dev
+BuildRequires: cabal-install
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
-hsb2hs is a preprocessor that allows you to include the contents of files as
+Hsb2hs is a preprocessor that allows you to include the contents of files as
string literals in your Haskell programs and libraries. It is an alternative to
file-embed for those who do not want to rely on Template Haskell.
-%global cabal cabal-dev
-
-
%prep
%setup -q
%build
-%cabal install-deps
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
-%cabal build
+%global cabal cabal
+[ -d ~/.cabal ] || %cabal update
+%cabal install --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}
+
%install
rm -rf %{buildroot}
-%cabal copy --destdir=%{buildroot} -v
-
+install -D -p dist/build/%{name}/%{name} %{buildroot}%{_bindir}/%{name}
%clean
@@ -55,5 +52,9 @@ rm -rf %{buildroot}
%changelog
-* Thu Jan 30 2014 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.1
+* Thu Dec 25 2014 Jens Petersen <petersen@redhat.com> - 0.1-2
+- use cabal install instead of cabal-dev
+- run cabal update if no ~/.cabal
+
+* Thu Jan 30 2014 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.1-1
- spec file generated by cabal-rpm-0.8.7