From 1da09d3e56017f6fa64b566d3209aa0e930fb83ddc971dc5193e4a785b15bf6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 18 Jul 2016 20:13:58 +0000 Subject: [PATCH] Accepting request 410224 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/410224 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-monad-control?expand=0&rev=10 --- ghc-monad-control.changes | 5 +++++ ghc-monad-control.spec | 16 +++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ghc-monad-control.changes b/ghc-monad-control.changes index 8c61873..3ee0c0b 100644 --- a/ghc-monad-control.changes +++ b/ghc-monad-control.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 16:59:05 UTC 2016 - psimons@suse.com + +- Update to version 1.0.1.0 revision 0 with cabal2obs. + ------------------------------------------------------------------- Thu Apr 7 15:00:08 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-monad-control.spec b/ghc-monad-control.spec index 57808de..01cc52c 100644 --- a/ghc-monad-control.spec +++ b/ghc-monad-control.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-monad-control # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,14 @@ %global pkg_name monad-control - Name: ghc-%{pkg_name} Version: 1.0.1.0 Release: 0 Summary: Lift control operations, like exception catching, through monad transformers License: BSD-3-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: @@ -36,6 +32,7 @@ BuildRequires: ghc-stm-devel BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description @@ -54,28 +51,29 @@ The main difference is that this package provides CPS style operators and exploits the 'RankNTypes' and 'TypeFamilies' language extensions to simplify and speedup most definitions. - %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 + %post devel %ghc_pkg_recache @@ -88,6 +86,6 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.markdown +%doc CHANGELOG README.markdown %changelog