Accepting request 411632 from devel:languages:haskell

1

OBS-URL: https://build.opensuse.org/request/show/411632
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-network?expand=0&rev=11

_service

@@ -1,3 +0,0 @@
-<services>
-  
-<service name="download_files" mode="localonly"/></services>

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
 

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-%{pkg_name}
-Name:           ghc-network
 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