From 061bcabc288c556f446377421705788cceb3e787d62810a0c948ec0981c964f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:57 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-network-uri revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network-uri?expand=0&rev=46 --- ghc-network-uri.changes | 23 ----------- ghc-network-uri.spec | 11 +++--- network-uri-2.6.1.0.tar.gz | 3 ++ network-uri-2.6.3.0.tar.gz | 3 -- network-uri.cabal | 80 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 32 deletions(-) create mode 100644 network-uri-2.6.1.0.tar.gz delete mode 100644 network-uri-2.6.3.0.tar.gz create mode 100644 network-uri.cabal diff --git a/ghc-network-uri.changes b/ghc-network-uri.changes index 944438d..9980f72 100644 --- a/ghc-network-uri.changes +++ b/ghc-network-uri.changes @@ -1,26 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:45:35 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:23 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Wed May 6 10:06:40 UTC 2020 - Peter Simons - -- Downgrade to version 2.6.3.0. Upstream has retracted 2.7.0.0. - -------------------------------------------------------------------- -Fri Feb 7 08:04:22 UTC 2020 - psimons@suse.com - -- Update network-uri to version 2.7.0.0. - Upstream added a new change log file in this release. With no - previous version to compare against, the automatic updater cannot - reliable determine the relevante entries for this release. - ------------------------------------------------------------------- Fri Nov 8 16:14:18 UTC 2019 - Peter Simons diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index ff9742e..45c3f9c 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-network-uri # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 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,20 +19,19 @@ %global pkg_name network-uri %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.6.3.0 +Version: 2.6.1.0 Release: 0 Summary: URI manipulation License: BSD-3-Clause 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 BuildRequires: ghc-deepseq-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-rpm-macros -BuildRequires: ghc-template-haskell-devel %if %{with tests} BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-criterion-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel @@ -76,7 +75,8 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -97,6 +97,5 @@ This package provides the Haskell %{pkg_name} library development files. %license LICENSE %files devel -f %{name}-devel.files -%doc CHANGELOG.md README.md %changelog diff --git a/network-uri-2.6.1.0.tar.gz b/network-uri-2.6.1.0.tar.gz new file mode 100644 index 0000000..9b89d0e --- /dev/null +++ b/network-uri-2.6.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0 +size 27262 diff --git a/network-uri-2.6.3.0.tar.gz b/network-uri-2.6.3.0.tar.gz deleted file mode 100644 index 6d6c3f6..0000000 --- a/network-uri-2.6.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723 -size 31997 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