From 73e127d1fe28ce69a7c0f405dcfcd2ef0bc20693f94eaec4f32776690a3d074e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sun, 17 Jul 2016 20:50:29 +0000 Subject: [PATCH] Accepting request 409918 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/409918 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hourglass?expand=0&rev=5 --- ghc-hourglass.changes | 5 +++++ ghc-hourglass.spec | 25 ++++++++----------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/ghc-hourglass.changes b/ghc-hourglass.changes index 5041915..4be7927 100644 --- a/ghc-hourglass.changes +++ b/ghc-hourglass.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:15:56 UTC 2016 - psimons@suse.com + +- Update to version 0.2.10 revision 0 with cabal2obs. + ------------------------------------------------------------------- Sun Feb 28 21:48:31 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 79c87eb..c367edf 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hourglass # -# 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 @@ -15,25 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name hourglass - %bcond_with tests - Name: ghc-%{pkg_name} Version: 0.2.10 Release: 0 Summary: Simple performant time related library -Group: System/Libraries - 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: BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-rpm-macros +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-mtl-devel BuildRequires: ghc-old-locale-devel @@ -52,19 +49,17 @@ The backbone of the library are the Timeable and Time type classes. Each Timeable instances can be converted to type that has a Time instances, and thus are different representations of current time. - %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} @@ -79,26 +74,22 @@ This package provides the Haskell %{pkg_name} library development files. %check %if %{with tests} -%cabal test +%{cabal} test %endif %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE - %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md - +%doc CHANGELOG.md README.md %changelog