From d4e66cf3b4af72e69dd684023bb3b25c1f2b95e609e6732d391492a563695162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sun, 17 Jul 2016 22:29:40 +0000 Subject: [PATCH] Accepting request 410307 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/410307 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network-uri?expand=0&rev=6 --- ghc-network-uri.changes | 5 +++++ ghc-network-uri.spec | 26 ++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ghc-network-uri.changes b/ghc-network-uri.changes index 978d3f5..d7b7a6b 100644 --- a/ghc-network-uri.changes +++ b/ghc-network-uri.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:02:20 UTC 2016 - psimons@suse.com + +- Update to version 2.6.1.0 revision 0 with cabal2obs. + ------------------------------------------------------------------- Mon Mar 21 07:50:36 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 297a74e..2e36946 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-network-uri # -# 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,27 +17,23 @@ %global pkg_name network-uri - %bcond_with tests - -Name: ghc-network-uri +Name: ghc-%{pkg_name} Version: 2.6.1.0 Release: 0 Summary: URI manipulation 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-parsec-devel +BuildRequires: ghc-rpm-macros +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-network-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel @@ -45,7 +41,7 @@ BuildRequires: ghc-test-framework-quickcheck2-devel # End cabal-rpm deps %description -This package provides an URI manipulation inteface. +This package provides an URI manipulation interface. In network-2.6 the 'Network.URI' module was split off from the network package into this package. If you're using the 'Network.URI' module you can @@ -58,33 +54,35 @@ network < 2.6 That is, get the module from either network < 2.6 or from network-uri >= 2.6. - %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 + %install %ghc_lib_install + %check %if %{with tests} -%cabal test +%{cabal} test %endif + %post devel %ghc_pkg_recache