diff --git a/ghc-network-uri.changes b/ghc-network-uri.changes index d7b7a6b..868428b 100644 --- a/ghc-network-uri.changes +++ b/ghc-network-uri.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 8 11:05:44 UTC 2017 - psimons@suse.com + +- Update to version 2.6.1.0 revision 1. + ------------------------------------------------------------------- Sun Jul 10 17:02:20 UTC 2016 - psimons@suse.com diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 2e36946..ac7636f 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-network-uri # -# 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 @@ -23,11 +23,11 @@ Version: 2.6.1.0 Release: 0 Summary: URI manipulation 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 +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-deepseq-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-rpm-macros @@ -38,21 +38,33 @@ BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel %endif -# End cabal-rpm deps %description -This package provides an URI manipulation interface. +This package provides facilities for parsing and unparsing URIs, and creating +and resolving relative URI references, closely following the URI spec, +. -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 -automatically get it from the right package by adding this to your .cabal file: +== Backward-compatibility + +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 be +backward compatible and automatically get it from the right package by using +the in your +'.cabal' file's build-depends (along with dependencies for both 'network-uri' +and 'network'): + +> build-depends: > network-uri-flag == 0.1.* + +Or you can do the same manually by adding this boilerplate 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. +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 @@ -67,21 +79,16 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} - +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache diff --git a/network-uri.cabal b/network-uri.cabal new file mode 100644 index 0000000..c16fe96 --- /dev/null +++ b/network-uri.cabal @@ -0,0 +1,80 @@ +name: network-uri +version: 2.6.1.0 +x-revision: 1 +synopsis: URI manipulation +description: + This package provides facilities for parsing and unparsing URIs, and creating + and resolving relative URI references, closely following the URI spec, + . + . + == Backward-compatibility + . + 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 be backward compatible and automatically get it from + the right package by using the + + in your @.cabal@ file's build-depends (along with dependencies for + both @network-uri@ and @network@): + . + > build-depends: + > network-uri-flag == 0.1.* + . + Or you can do the same manually by adding this boilerplate 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@. + +homepage: https://github.com/haskell/network-uri +bug-reports: https://github.com/haskell/network-uri/issues +license: BSD3 +license-file: LICENSE +maintainer: ezra@ezrakilty.net +category: Network +build-type: Simple +cabal-version: >=1.10 + +library + exposed-modules: + Network.URI + build-depends: + base >= 3 && < 5, + deepseq >= 1.1 && < 1.5, + parsec >= 3.0 && < 3.2 + default-extensions: CPP, DeriveDataTypeable + if impl(ghc >= 7.6) + default-extensions: DeriveGeneric + ghc-options: -Wall -fwarn-tabs + default-language: Haskell98 + +test-suite uri + hs-source-dirs: tests + main-is: uri001.hs + type: exitcode-stdio-1.0 + + build-depends: + base < 5, + HUnit, + network-uri, + test-framework, + test-framework-hunit, + test-framework-quickcheck2 + + ghc-options: -Wall -fwarn-tabs + default-language: Haskell98 + +source-repository head + type: git + location: git://github.com/haskell/network-uri.git