From 8acf456beb3f7c37ead87fba4e20bf7b266664456f03aa25a741f30da01a7128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sun, 17 Jul 2016 21:53:20 +0000 Subject: [PATCH] Accepting request 409698 from devel:languages:haskell:lts:6 See https://lists.opensuse.org/opensuse-haskell/2016-07/msg00000.html for details. OBS-URL: https://build.opensuse.org/request/show/409698 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-file-embed?expand=0&rev=9 --- ghc-file-embed.changes | 5 +++++ ghc-file-embed.spec | 27 +++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ghc-file-embed.changes b/ghc-file-embed.changes index 98bdd3d..d38f1fa 100644 --- a/ghc-file-embed.changes +++ b/ghc-file-embed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:15:55 UTC 2016 - psimons@suse.com + +- Update to version 0.0.10 revision 0 with cabal2obs. + ------------------------------------------------------------------- Tue Apr 26 08:25:43 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-file-embed.spec b/ghc-file-embed.spec index a2d24ea..1a3880a 100644 --- a/ghc-file-embed.spec +++ b/ghc-file-embed.spec @@ -17,63 +17,58 @@ %global pkg_name file-embed - -%bcond_without tests - -Name: ghc-file-embed +%bcond_with tests +Name: ghc-%{pkg_name} Version: 0.0.10 Release: 0 Summary: Use Template Haskell to embed file contents directly License: BSD-2-Clause Group: System/Libraries - Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel -%if %{with tests} -BuildRequires: ghc-HUnit-devel -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description Use Template Haskell to read a file or all the files in a directory, and turn them into (path, bytestring) pairs embedded in your haskell code. - %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other +Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. - %prep %setup -q -n %{pkg_name}-%{version} + %build %ghc_lib_build + %install %ghc_lib_install + %check %if %{with tests} -%cabal test +%{cabal} test %endif + %post devel %ghc_pkg_recache @@ -86,6 +81,6 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md +%doc ChangeLog.md README.md %changelog