From 2387fa05f6885a2160acca2bdff8726ddbd02437e44e78315104dd2683651264 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2016 18:04:44 +0000 Subject: [PATCH 1/2] Synchronize builds with devel:languages:haskell:lts:7. OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-extra?expand=0&rev=25 --- ghc-extra.spec | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/ghc-extra.spec b/ghc-extra.spec index f967a8d..48d6d09 100644 --- a/ghc-extra.spec +++ b/ghc-extra.spec @@ -23,11 +23,10 @@ Version: 1.4.10 Release: 0 Summary: Extra functions I use License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other 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 -# Begin cabal-rpm deps: BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-process-devel @@ -38,7 +37,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-QuickCheck-devel %endif -# End cabal-rpm deps %description A library of extra functions for the standard Haskell libraries. Most functions @@ -65,20 +63,14 @@ 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 - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache From e7a226ec149752e2afc288e542a05052ce4ca855d6f6a826833d713937f98cd2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2017 17:47:05 +0000 Subject: [PATCH 2/2] synchronize with lts-8 package sett from configuration 0cb270c8d22a0823ab5130d95cc499e186cf864e OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-extra?expand=0&rev=26 --- extra-1.4.10.tar.gz | 3 --- extra-1.5.1.tar.gz | 3 +++ ghc-extra.changes | 5 +++++ ghc-extra.spec | 7 ++++--- 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 extra-1.4.10.tar.gz create mode 100644 extra-1.5.1.tar.gz diff --git a/extra-1.4.10.tar.gz b/extra-1.4.10.tar.gz deleted file mode 100644 index 19b4ed1..0000000 --- a/extra-1.4.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b40b3f74c02e40697f4ba5242a764c2846921e8aafdd92e79a30a7afd9e56759 -size 34981 diff --git a/extra-1.5.1.tar.gz b/extra-1.5.1.tar.gz new file mode 100644 index 0000000..b62b7f6 --- /dev/null +++ b/extra-1.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f3397c7a176045f1bb3b2a181e36b54192cb6fb5e99a9d28552975130ec49fc +size 35989 diff --git a/ghc-extra.changes b/ghc-extra.changes index 1c627d5..2e43334 100644 --- a/ghc-extra.changes +++ b/ghc-extra.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 12 14:20:44 UTC 2017 - psimons@suse.com + +- Update to version 1.5.1 with cabal2obs. + ------------------------------------------------------------------- Sun Jul 10 17:28:13 UTC 2016 - psimons@suse.com diff --git a/ghc-extra.spec b/ghc-extra.spec index 48d6d09..a3f1d8f 100644 --- a/ghc-extra.spec +++ b/ghc-extra.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-extra # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -19,7 +19,7 @@ %global pkg_name extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.4.10 +Version: 1.5.1 Release: 0 Summary: Extra functions I use License: BSD-3-Clause @@ -27,6 +27,7 @@ Group: Development/Languages/Other 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-clock-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-process-devel @@ -84,6 +85,6 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md +%doc CHANGES.txt README.md %changelog