From 36f10a5ff50039bf2a91541dc8baf74f91d2879b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 9 Sep 2015 12:29:22 +0000 Subject: [PATCH 01/36] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From e320a3fea0fbcb8be58e32546bf80fce424cd90a Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 9 Sep 2015 22:58:15 -0400 Subject: [PATCH 02/36] fedora import --- .gitignore | 1 + ghc-network-uri.spec | 83 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 85 insertions(+) create mode 100644 ghc-network-uri.spec diff --git a/.gitignore b/.gitignore index e69de29..93ed434 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/network-uri-2.6.0.3.tar.gz diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec new file mode 100644 index 0000000..70c51ae --- /dev/null +++ b/ghc-network-uri.spec @@ -0,0 +1,83 @@ +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name network-uri + +%bcond_with tests + +Name: ghc-%{pkg_name} +Version: 2.6.0.3 +Release: 2%{?dist} +Summary: URI manipulation + +License: BSD +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-parsec-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +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 inteface. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{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 +%endif + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE + + +%files devel -f %{name}-devel.files + + +%changelog +* Wed Sep 09 2015 Ben Boeckel - 2.6.0.3-2 +- fedora import + +* Sun Aug 23 2015 Ben Boeckel - 2.6.0.3-1 +- initial package diff --git a/sources b/sources index e69de29..f5a2c77 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1370aa94bb60da253616e23c4a849277 network-uri-2.6.0.3.tar.gz From bd63005f8ecbbbb1123d8684752792a80a93c9d1 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 9 Sep 2015 23:08:23 -0400 Subject: [PATCH 03/36] use %license --- ghc-network-uri.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 70c51ae..3634156 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -27,7 +27,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. %package devel @@ -52,6 +52,8 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install +rm -vf %{buildroot}%{_docdir}/%{name}/LICENSE +rmdir -v %{buildroot}%{_docdir}/%{name} %check From 8a941de0a082e47ad4cb3cfb66b68979e16613e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:39:14 +0000 Subject: [PATCH 04/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 3634156..7d5c19d 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 2.6.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: URI manipulation License: BSD @@ -78,6 +78,9 @@ rmdir -v %{buildroot}%{_docdir}/%{name} %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.6.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Sep 09 2015 Ben Boeckel - 2.6.0.3-2 - fedora import From 8c0085aa7929d000cced2e68af7aa79a7be6c384 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 23 Apr 2016 14:31:36 -0400 Subject: [PATCH 05/36] update to 2.6.1.0 --- .gitignore | 1 + ghc-network-uri.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 93ed434..6effb5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /network-uri-2.6.0.3.tar.gz +/network-uri-2.6.1.0.tar.gz diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 7d5c19d..60c8280 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -5,8 +5,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.6.0.3 -Release: 3%{?dist} +Version: 2.6.1.0 +Release: 1%{?dist} Summary: URI manipulation License: BSD @@ -52,8 +52,8 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm -vf %{buildroot}%{_docdir}/%{name}/LICENSE -rmdir -v %{buildroot}%{_docdir}/%{name} + +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %check @@ -78,6 +78,9 @@ rmdir -v %{buildroot}%{_docdir}/%{name} %changelog +* Sat Apr 23 2016 Ben Boeckel - 2.6.1.0-1 +- update to 2.6.1.0 + * Wed Feb 03 2016 Fedora Release Engineering - 2.6.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index f5a2c77..b4783ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1370aa94bb60da253616e23c4a849277 network-uri-2.6.0.3.tar.gz +c6ed1e8314a9b1674a3d118d9019a229 network-uri-2.6.1.0.tar.gz From 24dd60c05eb6e147aa6ff951116ae0ba285d1a64 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 30 Jun 2016 09:53:40 +0900 Subject: [PATCH 06/36] rebuild --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 60c8280..d4cb408 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: URI manipulation License: BSD @@ -78,6 +78,9 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %changelog +* Thu Jun 30 2016 Jens Petersen - 2.6.1.0-2 +- rebuild + * Sat Apr 23 2016 Ben Boeckel - 2.6.1.0-1 - update to 2.6.1.0 From 3df7ad115be3b201866f9ca82edc95bde41feac5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:46 +0900 Subject: [PATCH 07/36] no longer remove license; use cabal_test --- ghc-network-uri.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index d4cb408..3d4b290 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -53,13 +53,9 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel From 0ae6310e4726c8c7cd3ab13796a0719842fa3223 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:44:51 +0000 Subject: [PATCH 08/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 3d4b290..383d0d2 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: URI manipulation License: BSD @@ -74,6 +74,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.6.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jun 30 2016 Jens Petersen - 2.6.1.0-2 - rebuild From 38d59120eb8322fd977d154e90b37c3c28a04300 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Feb 2017 17:48:19 +0900 Subject: [PATCH 09/36] refresh to cabal-rpm-0.11.1 --- ghc-network-uri.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 383d0d2..3b7b3a2 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,17 +1,19 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network-uri +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: URI manipulation License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -43,7 +45,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} %build @@ -74,6 +76,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 24 2017 Jens Petersen - 2.6.1.0-4 +- refresh to cabal-rpm-0.11.1 + * Fri Feb 10 2017 Fedora Release Engineering - 2.6.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From ee16ccb5c1d095164ccc834bac2cbed45207804a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:50:22 +0000 Subject: [PATCH 10/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 3b7b3a2..8123ebe 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: URI manipulation License: BSD @@ -76,6 +76,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.6.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 24 2017 Jens Petersen - 2.6.1.0-4 - refresh to cabal-rpm-0.11.1 From a5df4cfc2d282ce39997ba522aad93c2d357bf0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:26:43 +0000 Subject: [PATCH 11/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 8123ebe..a4836d7 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: URI manipulation License: BSD @@ -76,6 +76,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.6.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.6.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e9f0e5bbc490e66c1864c4c5932b556b1d9e6c2b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:11:40 +0100 Subject: [PATCH 12/36] refresh to cabal-rpm-0.12.1 --- ghc-network-uri.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index a4836d7..b830209 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network-uri @@ -35,9 +35,12 @@ This package provides an URI manipulation interface. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -60,6 +63,12 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 8b48656bd1463514bcab66584ce23c2f7fddea21 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 11:48:09 +0100 Subject: [PATCH 13/36] bump release --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index b830209..6326124 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: URI manipulation License: BSD @@ -85,6 +85,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jan 26 2018 Jens Petersen - 2.6.1.0-7 +- rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 2.6.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 1132218d3927cfba56e8cf62e15504fbf58e7319 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:05 +0900 Subject: [PATCH 14/36] drop ldconfig scriptlets --- ghc-network-uri.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 6326124..9cf49e1 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -63,12 +63,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From f5345b4e551821bfc6f5daf8adde102636dc4739 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:56:45 +0000 Subject: [PATCH 15/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 9cf49e1..1ab50c8 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: URI manipulation License: BSD @@ -79,6 +79,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.6.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Jens Petersen - 2.6.1.0-7 - rebuild From fdb76b9b7c573f71d7baeb00b7b05a7b7cb73b52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:00:20 +0000 Subject: [PATCH 16/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 1ab50c8..2ec4cd4 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: URI manipulation License: BSD @@ -79,6 +79,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.6.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.6.1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 13fc42960da7dcda7ee1a54816cd60fe84827f98 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 29 Jul 2018 00:53:28 +0900 Subject: [PATCH 17/36] revise .cabal --- ghc-network-uri.spec | 9 ++++- network-uri-2.6.1.0.cabal | 80 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 network-uri-2.6.1.0.cabal diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 2ec4cd4..6354434 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network-uri @@ -8,12 +8,13 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: URI manipulation License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -49,6 +50,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} +cp -p %{SOURCE1} %{pkg_name}.cabal %build @@ -79,6 +81,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jul 28 2018 Jens Petersen - 2.6.1.0-10 +- revise .cabal + * Fri Jul 13 2018 Fedora Release Engineering - 2.6.1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/network-uri-2.6.1.0.cabal b/network-uri-2.6.1.0.cabal new file mode 100644 index 0000000..475fc25 --- /dev/null +++ b/network-uri-2.6.1.0.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 From 602aa78c2cf2ad1ed3ecc8f2aa3928853b518113 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:49:30 +0000 Subject: [PATCH 18/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 6354434..f0dc4e6 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: URI manipulation License: BSD @@ -81,6 +81,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.6.1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 2.6.1.0-10 - revise .cabal From 9d1f611aea00396ef3247a43955c741d75773feb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:46:29 +0800 Subject: [PATCH 19/36] refresh to cabal-rpm-0.13 --- ghc-network-uri.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index f0dc4e6..22fb0d1 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network-uri @@ -8,17 +8,19 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: URI manipulation License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-deepseq-devel BuildRequires: ghc-parsec-devel %if %{with tests} @@ -49,16 +51,22 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -p %{SOURCE1} %{pkg_name}.cabal +cp -bp %{SOURCE1} %{pkg_name}.cabal +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %check @@ -74,13 +82,18 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files %changelog +* Sun Feb 17 2019 Jens Petersen - 2.6.1.0-12 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 2.6.1.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f70e46fcd6d82d3b06c86b150c1359d3fba0b85d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:48:02 +0000 Subject: [PATCH 20/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 22fb0d1..48526e0 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: URI manipulation License: BSD @@ -91,6 +91,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.6.1.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 2.6.1.0-12 - refresh to cabal-rpm-0.13 From 8bf34cb076d578dcc64dba9b2be31a48e0746c99 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:24:55 +0000 Subject: [PATCH 21/36] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-network-uri.spec | 53 +++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 48526e0..5fbea7b 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network-uri @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: URI manipulation License: BSD @@ -20,6 +20,12 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-deepseq-devel BuildRequires: ghc-parsec-devel @@ -38,11 +44,8 @@ This package provides an URI manipulation interface. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} @@ -50,6 +53,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation + +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -73,14 +95,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -90,7 +104,20 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog +* Fri Aug 02 2019 Jens Petersen - 2.6.1.0-14 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 2.6.1.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f71ab8fc1b4e1796523077e6d920d56b5e271102 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:30:52 +0800 Subject: [PATCH 22/36] BR prof for lib and static for executable --- ghc-network-uri.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 5fbea7b..92cf2e9 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network-uri @@ -20,15 +20,10 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-parsec-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-parsec-prof %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-test-framework-devel @@ -44,6 +39,7 @@ This package provides an URI manipulation interface. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From edf993e4be9c51f58ccded0e3682a3478774f92a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:07:37 +0000 Subject: [PATCH 23/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 92cf2e9..cdd697b 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.1.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: URI manipulation License: BSD @@ -111,6 +111,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.6.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Jens Petersen - 2.6.1.0-14 - add doc and prof subpackages (cabal-rpm-1.0.0) From 870b2aa6c8914797ec7a91cb40bd0b2e5405494f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:51:18 +0800 Subject: [PATCH 24/36] refresh to cabal-rpm-2.0.2 --- ghc-network-uri.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index cdd697b..bbfc56f 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,11 +1,9 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network-uri %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 2.6.1.0 Release: 15%{?dist} @@ -24,12 +22,6 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-parsec-prof -%if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel -%endif # End cabal-rpm deps %description @@ -52,6 +44,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -62,6 +55,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -87,8 +81,14 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%check -%cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif %files -f %{name}.files @@ -102,6 +102,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From d319d5b605ecc7fdef616ff0e674f7bde2af0448 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 11:48:01 +0800 Subject: [PATCH 25/36] update to 2.6.2.0 --- .gitignore | 1 + ghc-network-uri.spec | 9 +++- ...2.6.1.0.cabal => network-uri-2.6.2.0.cabal | 42 +++++++++++++++++-- sources | 2 +- 4 files changed, 47 insertions(+), 7 deletions(-) rename network-uri-2.6.1.0.cabal => network-uri-2.6.2.0.cabal (75%) diff --git a/.gitignore b/.gitignore index 6effb5b..af8ac08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /network-uri-2.6.0.3.tar.gz /network-uri-2.6.1.0.tar.gz +/network-uri-2.6.2.0.tar.gz diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index bbfc56f..9a9c8d2 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 2.6.1.0 -Release: 15%{?dist} +Version: 2.6.2.0 +Release: 1%{?dist} Summary: URI manipulation License: BSD @@ -22,6 +22,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-parsec-prof +BuildRequires: ghc-template-haskell-prof # End cabal-rpm deps %description @@ -98,6 +99,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files +%doc CHANGELOG.md README.md %if %{with haddock} @@ -112,6 +114,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Feb 14 2020 Jens Petersen - 2.6.2.0-1 +- update to 2.6.2.0 + * Tue Jan 28 2020 Fedora Release Engineering - 2.6.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/network-uri-2.6.1.0.cabal b/network-uri-2.6.2.0.cabal similarity index 75% rename from network-uri-2.6.1.0.cabal rename to network-uri-2.6.2.0.cabal index 475fc25..d2a6c22 100644 --- a/network-uri-2.6.1.0.cabal +++ b/network-uri-2.6.2.0.cabal @@ -1,10 +1,10 @@ name: network-uri -version: 2.6.1.0 +version: 2.6.2.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, + and resolving relative URI references, closely following the URI spec, . . == Backward-compatibility @@ -12,7 +12,7 @@ description: 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 + the right package by using the in your @.cabal@ file's build-depends (along with dependencies for both @network-uri@ and @network@): @@ -41,20 +41,39 @@ homepage: https://github.com/haskell/network-uri bug-reports: https://github.com/haskell/network-uri/issues license: BSD3 license-file: LICENSE +extra-source-files: README.md, CHANGELOG.md maintainer: ezra@ezrakilty.net category: Network build-type: Simple cabal-version: >=1.10 +tested-with: + GHC ==8.10.1 + || ==8.8.2 + || ==8.6.5 + || ==8.4.4 + || ==8.2.2 + || ==8.0.2 + || ==7.10.3 + || ==7.8.4 + || ==7.6.3 + || ==7.4.2 + || ==7.2.2 + || ==7.0.2 library exposed-modules: Network.URI + Network.URI.Lens + Network.URI.Static build-depends: base >= 3 && < 5, deepseq >= 1.1 && < 1.5, parsec >= 3.0 && < 3.2 + build-depends: template-haskell <2.16 default-extensions: CPP, DeriveDataTypeable - if impl(ghc >= 7.6) + if impl(ghc < 7.6) + build-depends: ghc-prim + if impl(ghc >= 7.2) default-extensions: DeriveGeneric ghc-options: -Wall -fwarn-tabs default-language: Haskell98 @@ -75,6 +94,21 @@ test-suite uri ghc-options: -Wall -fwarn-tabs default-language: Haskell98 +test-suite uri-bench + hs-source-dirs: tests + main-is: uri-bench.hs + type: exitcode-stdio-1.0 + + build-depends: + base < 5, + HUnit, + network-uri, + criterion, + deepseq + + ghc-options: -Wall -fwarn-tabs + default-language: Haskell98 + source-repository head type: git location: git://github.com/haskell/network-uri.git diff --git a/sources b/sources index b4783ea..0109e40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6ed1e8314a9b1674a3d118d9019a229 network-uri-2.6.1.0.tar.gz +SHA512 (network-uri-2.6.2.0.tar.gz) = 66c67eac386da617f866ad0684a7262d009f67be0ccd0c4f20ca2de38219e00b11de1fef4c3769957b1412dd42b949cc01a8edc40564a31d3735c12696d648b1 From 67d8b9b9650cc3881bdf9c54a9b1c78997b0663b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:27:33 +0800 Subject: [PATCH 26/36] refresh to cabal-rpm-2.0.5 --- ghc-network-uri.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 9a9c8d2..e77222a 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name network-uri %global pkgver %{pkg_name}-%{version} @@ -79,6 +79,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %install # Begin cabal-rpm install %ghc_lib_install +chmod a-x CHANGELOG.md README.md # End cabal-rpm install From 2810bcdd80fa4526680a85ec1dcf3df90e17bc3d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 11:38:22 +0800 Subject: [PATCH 27/36] update to 2.6.3.0 --- .gitignore | 1 + ghc-network-uri.spec | 8 +-- network-uri-2.6.2.0.cabal | 114 -------------------------------------- sources | 2 +- 4 files changed, 6 insertions(+), 119 deletions(-) delete mode 100644 network-uri-2.6.2.0.cabal diff --git a/.gitignore b/.gitignore index af8ac08..5ecbe43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /network-uri-2.6.0.3.tar.gz /network-uri-2.6.1.0.tar.gz /network-uri-2.6.2.0.tar.gz +/network-uri-2.6.3.0.tar.gz diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index e77222a..7b7cbb1 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -5,7 +5,7 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 2.6.2.0 +Version: 2.6.3.0 Release: 1%{?dist} Summary: URI manipulation @@ -13,7 +13,6 @@ License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -66,7 +65,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -79,7 +77,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %install # Begin cabal-rpm install %ghc_lib_install -chmod a-x CHANGELOG.md README.md # End cabal-rpm install @@ -115,6 +112,9 @@ chmod a-x CHANGELOG.md README.md %changelog +* Wed Jun 10 2020 Jens Petersen - 2.6.3.0-1 +- update to 2.6.3.0 + * Fri Feb 14 2020 Jens Petersen - 2.6.2.0-1 - update to 2.6.2.0 diff --git a/network-uri-2.6.2.0.cabal b/network-uri-2.6.2.0.cabal deleted file mode 100644 index d2a6c22..0000000 --- a/network-uri-2.6.2.0.cabal +++ /dev/null @@ -1,114 +0,0 @@ -name: network-uri -version: 2.6.2.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 -extra-source-files: README.md, CHANGELOG.md -maintainer: ezra@ezrakilty.net -category: Network -build-type: Simple -cabal-version: >=1.10 -tested-with: - GHC ==8.10.1 - || ==8.8.2 - || ==8.6.5 - || ==8.4.4 - || ==8.2.2 - || ==8.0.2 - || ==7.10.3 - || ==7.8.4 - || ==7.6.3 - || ==7.4.2 - || ==7.2.2 - || ==7.0.2 - -library - exposed-modules: - Network.URI - Network.URI.Lens - Network.URI.Static - build-depends: - base >= 3 && < 5, - deepseq >= 1.1 && < 1.5, - parsec >= 3.0 && < 3.2 - build-depends: template-haskell <2.16 - default-extensions: CPP, DeriveDataTypeable - if impl(ghc < 7.6) - build-depends: ghc-prim - if impl(ghc >= 7.2) - 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 - -test-suite uri-bench - hs-source-dirs: tests - main-is: uri-bench.hs - type: exitcode-stdio-1.0 - - build-depends: - base < 5, - HUnit, - network-uri, - criterion, - deepseq - - ghc-options: -Wall -fwarn-tabs - default-language: Haskell98 - -source-repository head - type: git - location: git://github.com/haskell/network-uri.git diff --git a/sources b/sources index 0109e40..188b8b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-uri-2.6.2.0.tar.gz) = 66c67eac386da617f866ad0684a7262d009f67be0ccd0c4f20ca2de38219e00b11de1fef4c3769957b1412dd42b949cc01a8edc40564a31d3735c12696d648b1 +SHA512 (network-uri-2.6.3.0.tar.gz) = 15091367e4543de1e2af0d81973b8e456e2c5f5295dcd7a91b91f46c2e07a6a655c6ab4c0837ce7566b21b43bca3569c1b27bb7f437572b09d00e678c7b512f0 From d00631eae94c088c6f1ffae6214fad5ec2d27ebf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:56:11 +0800 Subject: [PATCH 28/36] refresh to cabal-rpm-2.0.6 --- ghc-network-uri.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 7b7cbb1..1d7abc3 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,9 +1,11 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name network-uri %global pkgver %{pkg_name}-%{version} +# testsuite missing deps: test-framework test-framework-hunit test-framework-quickcheck2 + Name: ghc-%{pkg_name} Version: 2.6.3.0 Release: 1%{?dist} @@ -80,16 +82,6 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From 4aa4e6d01ba14f9e6914b2da0947cadf9b53a13c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:27:37 +0000 Subject: [PATCH 29/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 1d7abc3..5fdb0af 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: URI manipulation License: BSD @@ -104,6 +104,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.6.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 10 2020 Jens Petersen - 2.6.3.0-1 - update to 2.6.3.0 From a28a26224d9ac2a3a97f0693b1e360dded4a8937 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:16:57 +0000 Subject: [PATCH 30/36] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 5fdb0af..38b4895 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: URI manipulation License: BSD @@ -104,6 +104,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.6.3.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.6.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ceac3d66c844f9e0b463136618c5799a54ac1c99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:32:00 +0000 Subject: [PATCH 31/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 38b4895..fe3b3e3 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: URI manipulation License: BSD @@ -104,6 +104,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.6.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 2.6.3.0-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 80e6b1ea9af1eaf5c8c361f96540a7280205f687 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:01:37 +0000 Subject: [PATCH 32/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index fe3b3e3..3962e34 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: URI manipulation License: BSD @@ -104,6 +104,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.6.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.6.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3b65e4a1a37b13cb1ec711740db4b8b42ee2277d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:12 +0800 Subject: [PATCH 33/36] refresh to cabal-rpm-2.0.9 --- ghc-network-uri.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 3962e34..cc897db 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name network-uri @@ -47,6 +47,7 @@ This package provides the Haskell %{pkg_name} library development files. %package doc Summary: Haskell %{pkg_name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description doc This package provides the Haskell %{pkg_name} library documentation. From d9b7faaa28fd87c629a874f74087807ef17777d8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 11:17:58 +0800 Subject: [PATCH 34/36] update to 2.6.4.1 --- .gitignore | 1 + ghc-network-uri.spec | 23 ++++++++++++++++++++--- sources | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5ecbe43..18da4e6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /network-uri-2.6.1.0.tar.gz /network-uri-2.6.2.0.tar.gz /network-uri-2.6.3.0.tar.gz +/network-uri-2.6.4.1.tar.gz diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index cc897db..9063ca2 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -4,11 +4,11 @@ %global pkg_name network-uri %global pkgver %{pkg_name}-%{version} -# testsuite missing deps: test-framework test-framework-hunit test-framework-quickcheck2 +%bcond_without tests Name: ghc-%{pkg_name} -Version: 2.6.3.0 -Release: 5%{?dist} +Version: 2.6.4.1 +Release: 1%{?dist} Summary: URI manipulation License: BSD @@ -24,6 +24,14 @@ BuildRequires: ghc-base-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-template-haskell-prof +BuildRequires: ghc-th-compat-prof +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel +%endif # End cabal-rpm deps %description @@ -83,6 +91,12 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install +%check +%if %{with tests} +%cabal_test +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -105,6 +119,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 2.6.4.1-1 +- update to 2.6.4.1 + * Thu Jul 22 2021 Fedora Release Engineering - 2.6.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 188b8b9..d2165c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-uri-2.6.3.0.tar.gz) = 15091367e4543de1e2af0d81973b8e456e2c5f5295dcd7a91b91f46c2e07a6a655c6ab4c0837ce7566b21b43bca3569c1b27bb7f437572b09d00e678c7b512f0 +SHA512 (network-uri-2.6.4.1.tar.gz) = 8e5b01fd11197ac36de9b804d37256662f904f2b94a997a2e262439bb1706d1c460db368e935bf3971fd1581162abbc07439a0bae391e1e616264bd00fe7104e From 5045af27743ed99009d87093edebe6dc3cc44737 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:18:05 +0000 Subject: [PATCH 35/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network-uri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index 9063ca2..dfa0da9 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: URI manipulation License: BSD @@ -119,6 +119,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.6.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 2.6.4.1-1 - update to 2.6.4.1 From 6b7c2617b6253e9984b4818490b43e03e29f3a04 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:48:54 +0300 Subject: [PATCH 36/36] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index d2165c2..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (network-uri-2.6.4.1.tar.gz) = 8e5b01fd11197ac36de9b804d37256662f904f2b94a997a2e262439bb1706d1c460db368e935bf3971fd1581162abbc07439a0bae391e1e616264bd00fe7104e