From 5669c808c41e83af40bea948a7461ad274b4ee39f5bd9fac9698b63da6699dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sun, 17 Jul 2016 22:28:29 +0000 Subject: [PATCH] Accepting request 410289 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/410289 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=20 --- _service | 3 --- ghc-network.changes | 5 +++++ ghc-network.spec | 33 +++++++++++++++++++++------------ 3 files changed, 26 insertions(+), 15 deletions(-) delete mode 100644 _service 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-network.changes b/ghc-network.changes index 98fdc5a..2f1fa17 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:30:20 UTC 2016 - psimons@suse.com + +- Update to version 2.6.2.1 revision 0 with cabal2obs. + ------------------------------------------------------------------- Mon Jul 13 05:45:23 UTC 2015 - mimi.vx@gmail.com diff --git a/ghc-network.spec b/ghc-network.spec index 46cfa04..40900d5 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-network # -# 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,25 +17,21 @@ %global pkg_name network - %bcond_with tests - -Name: ghc-network +Name: ghc-%{pkg_name} Version: 2.6.2.1 Release: 0 Summary: Low-level networking interface 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-bytestring-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-unix-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-test-framework-devel @@ -46,33 +42,46 @@ BuildRequires: ghc-test-framework-hunit-devel %description This package provides a low-level networking interface. +In network-2.6 the 'Network.URI' module was split off into its own package, +network-uri-2.6. If you're using the 'Network.URI' module you can automatically +get it from the right package by adding this to your .cabal file: + +> flag network-uri > description: Get Network.URI from the network-uri package +> default: True > > library > -- ... > if flag(network-uri) > build-depends: +network-uri >= 2.6, network >= 2.6 > else > build-depends: network-uri < 2.6, +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 @@ -85,6 +94,6 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md examples +%doc CHANGELOG.md README.md examples %changelog