diff --git a/_service b/_service deleted file mode 100644 index a07f79b..0000000 --- a/_service +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ghc-HUnit.changes b/ghc-HUnit.changes index bd75b14..1237cd2 100644 --- a/ghc-HUnit.changes +++ b/ghc-HUnit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:04:33 UTC 2016 - psimons@suse.com + +- Update to version 1.3.1.1 revision 0 with cabal2obs. + ------------------------------------------------------------------- Fri Jan 22 10:12:18 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 803418b..6d0edd3 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-HUnit # -# 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,51 +17,57 @@ %global pkg_name HUnit - -Name: ghc-HUnit +%bcond_with tests +Name: ghc-%{pkg_name} Version: 1.3.1.1 Release: 0 Summary: A unit testing framework for Haskell License: BSD-3-Clause Group: System/Libraries - -Url: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz 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-filepath-devel +%endif # End cabal-rpm deps %description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool for Java, see: . - %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other -Provides: %{name}-static = %{version}-%{release} +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 -rm -rf %{buildroot}%{_datadir}/%{pkg_name}-%{version} + + +%check +%if %{with tests} +%{cabal} test +%endif + %post devel %ghc_pkg_recache @@ -75,6 +81,6 @@ rm -rf %{buildroot}%{_datadir}/%{pkg_name}-%{version} %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc examples README.md +%doc CHANGELOG.md README.md examples %changelog