diff --git a/ghc-fast-logger.changes b/ghc-fast-logger.changes index 88bd5bd..ec24da3 100644 --- a/ghc-fast-logger.changes +++ b/ghc-fast-logger.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 10 17:23:22 UTC 2016 - psimons@suse.com + +- Update to version 2.4.6 revision 0 with cabal2obs. +- Remove obsolete remove-bytestring-builder.patch. + ------------------------------------------------------------------- Wed Apr 27 18:23:38 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-fast-logger.spec b/ghc-fast-logger.spec index 38ccc32..83a4445 100644 --- a/ghc-fast-logger.spec +++ b/ghc-fast-logger.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-fast-logger # -# 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,35 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name fast-logger - %bcond_with tests - -Name: ghc-fast-logger +Name: ghc-%{pkg_name} Version: 2.4.6 Release: 0 Summary: A fast logging system -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 -# PATCH-FIX-UPSTREAM remove-bytestring-builder.patch - remove obsolete deps from *.cabal -Patch0: remove-bytestring-builder.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-auto-update-devel +BuildRequires: ghc-bytestring-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-easy-file-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-unix-time-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-hspec-devel %endif @@ -52,22 +48,20 @@ BuildRequires: ghc-hspec-devel %description A fast logging system. - %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} -%patch0 -p1 + %build %ghc_lib_build @@ -79,26 +73,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 ChangeLog.md - +%doc ChangeLog.md README.md %changelog diff --git a/remove-bytestring-builder.patch b/remove-bytestring-builder.patch deleted file mode 100644 index 70773f5..0000000 --- a/remove-bytestring-builder.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: fast-logger-2.4.5/fast-logger.cabal -=================================================================== ---- fast-logger-2.4.5.orig/fast-logger.cabal -+++ fast-logger-2.4.5/fast-logger.cabal -@@ -26,7 +26,6 @@ Library - , auto-update >= 0.1.2 - , easy-file >= 0.2 - , bytestring -- , bytestring-builder - , directory - , filepath - , text