From 9691d90946639a0223e727b63cd72a9466c6cbe2f37758ca3cac33e3d76f804b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 16 Jul 2016 23:21:32 +0000 Subject: [PATCH] Accepting request 409790 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/409790 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-Glob?expand=0&rev=6 --- ghc-Glob.changes | 5 +++++ ghc-Glob.spec | 41 ++++++++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ghc-Glob.changes b/ghc-Glob.changes index 1084704..2a6a54d 100644 --- a/ghc-Glob.changes +++ b/ghc-Glob.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:16:38 UTC 2016 - psimons@suse.com + +- Update to version 0.7.9 revision 0 with cabal2obs. + ------------------------------------------------------------------- Sun Jul 3 10:07:56 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-Glob.spec b/ghc-Glob.spec index 2ece691..6c3acbb 100644 --- a/ghc-Glob.spec +++ b/ghc-Glob.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-Glob # -# 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,50 +15,55 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global pkg_name Glob -Name: ghc-Glob +%global pkg_name Glob +%bcond_with tests +Name: ghc-%{pkg_name} Version: 0.7.9 Release: 0 Summary: Globbing 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-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-dlist-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-semigroups-devel -BuildRequires: ghc-transformers-devel BuildRequires: ghc-transformers-compat-devel +BuildRequires: ghc-transformers-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description A library for globbing: matching patterns against file paths. - %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 @@ -67,22 +72,24 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install +%check +%if %{with tests} +%{cabal} test +%endif + + %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE.txt - %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.txt - +%doc CHANGELOG.txt README.txt %changelog