Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-postgresql-simple for
openSUSE:Factory checked in at 2023-04-04 21:25:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-postgresql-simple (Old)
and /work/SRC/openSUSE:Factory/.ghc-postgresql-simple.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-postgresql-simple"
Tue Apr 4 21:25:31 2023 rev:14 rq:1076519 version:0.6.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-postgresql-simple/ghc-postgresql-simple.changes
2023-01-18 13:10:42.764786091 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-postgresql-simple.new.19717/ghc-postgresql-simple.changes
2023-04-04 21:25:44.987008249 +0200
@@ -1,0 +2,8 @@
+Thu Mar 30 17:07:55 UTC 2023 - Peter Simons <psim...@suse.com>
+
+- Updated spec file to conform with ghc-rpm-macros-2.5.2.
+
+- Apply "dont-depend-on-obsolete-bytestring-builder.patch" to avoid
+ depending on the obsolete bytestring-builder package.
+
+-------------------------------------------------------------------
@@ -117 +124,0 @@
-
New:
----
dont-depend-on-obsolete-bytestring-builder.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-postgresql-simple.spec ++++++
--- /var/tmp/diff_new_pack.4RAuzR/_old 2023-04-04 21:25:45.415010678 +0200
+++ /var/tmp/diff_new_pack.4RAuzR/_new 2023-04-04 21:25:45.419010701 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-postgresql-simple
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,7 @@
%global pkg_name postgresql-simple
+%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
Version: 0.6.5
@@ -25,34 +26,59 @@
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
+Patch0:
https://github.com/haskellari/postgresql-simple/pull/110.patch#/dont-depend-on-obsolete-bytestring-builder.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-Only-devel
+BuildRequires: ghc-Only-prof
BuildRequires: ghc-aeson-devel
+BuildRequires: ghc-aeson-prof
BuildRequires: ghc-attoparsec-devel
-BuildRequires: ghc-bytestring-builder-devel
+BuildRequires: ghc-attoparsec-prof
+BuildRequires: ghc-base-devel
+BuildRequires: ghc-base-prof
BuildRequires: ghc-bytestring-devel
+BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-case-insensitive-devel
+BuildRequires: ghc-case-insensitive-prof
BuildRequires: ghc-containers-devel
+BuildRequires: ghc-containers-prof
BuildRequires: ghc-hashable-devel
+BuildRequires: ghc-hashable-prof
BuildRequires: ghc-postgresql-libpq-devel
+BuildRequires: ghc-postgresql-libpq-prof
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-scientific-devel
+BuildRequires: ghc-scientific-prof
BuildRequires: ghc-template-haskell-devel
+BuildRequires: ghc-template-haskell-prof
BuildRequires: ghc-text-devel
+BuildRequires: ghc-text-prof
BuildRequires: ghc-time-compat-devel
+BuildRequires: ghc-time-compat-prof
BuildRequires: ghc-transformers-devel
+BuildRequires: ghc-transformers-prof
BuildRequires: ghc-uuid-types-devel
+BuildRequires: ghc-uuid-types-prof
BuildRequires: ghc-vector-devel
+BuildRequires: ghc-vector-prof
ExcludeArch: %{ix86}
%if %{with tests}
BuildRequires: ghc-HUnit-devel
+BuildRequires: ghc-HUnit-prof
BuildRequires: ghc-base16-bytestring-devel
+BuildRequires: ghc-base16-bytestring-prof
BuildRequires: ghc-cryptohash-md5-devel
+BuildRequires: ghc-cryptohash-md5-prof
BuildRequires: ghc-filepath-devel
+BuildRequires: ghc-filepath-prof
BuildRequires: ghc-inspection-testing-devel
+BuildRequires: ghc-inspection-testing-prof
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-golden-devel
+BuildRequires: ghc-tasty-golden-prof
BuildRequires: ghc-tasty-hunit-devel
+BuildRequires: ghc-tasty-hunit-prof
+BuildRequires: ghc-tasty-prof
%endif
%description
@@ -69,8 +95,24 @@
This package provides the Haskell %{pkg_name} library development
files.
+%package -n ghc-%{pkg_name}-doc
+Summary: Haskell %{pkg_name} library documentation
+Requires: ghc-filesystem
+BuildArch: noarch
+
+%description -n ghc-%{pkg_name}-doc
+This package provides the Haskell %{pkg_name} library documentation.
+
+%package -n ghc-%{pkg_name}-prof
+Summary: Haskell %{pkg_name} profiling library
+Requires: ghc-%{pkg_name}-devel = %{version}-%{release}
+Supplements: (ghc-%{pkg_name}-devel and ghc-prof)
+
+%description -n ghc-%{pkg_name}-prof
+This package provides the Haskell %{pkg_name} profiling library.
+
%prep
-%autosetup -n %{pkg_name}-%{version}
+%autosetup -p1 -n %{pkg_name}-%{version}
%build
%ghc_lib_build
@@ -93,4 +135,9 @@
%files devel -f %{name}-devel.files
%doc CHANGES.md CONTRIBUTORS
+%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files
+%license LICENSE
+
+%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files
+
%changelog
++++++ dont-depend-on-obsolete-bytestring-builder.patch ++++++
>From 9361ef190b3a18f26760a8d228f5fc7c0094ba1c Mon Sep 17 00:00:00 2001
From: Peter Simons <sim...@cryp.to>
Date: Fri, 24 Mar 2023 10:22:47 +0100
Subject: [PATCH] postgresql-simple.cabal: add conditional logic for obsolete
bytestring-builder
bytestring-builder is required only when building with versions of bytestring
older than 0.10.4. This commit adds conditional logic to avoid the dependency
on the obsolete package in that case.
---
postgresql-simple.cabal | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/postgresql-simple.cabal b/postgresql-simple.cabal
index 584b379..3d399fb 100644
--- a/postgresql-simple.cabal
+++ b/postgresql-simple.cabal
@@ -36,6 +36,9 @@ tested-with:
|| ==9.2.4
|| ==9.4.2
+Flag bytestring_has_builder
+ default: True
+
library
default-language: Haskell2010
hs-source-dirs: src
@@ -81,7 +84,6 @@ library
-- GHC bundled libs
build-depends:
base >=4.6.0.0 && <4.18
- , bytestring >=0.10.0.0 && <0.12
, containers >=0.5.0.0 && <0.7
, template-haskell >=2.8.0.0 && <2.20
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
@@ -92,7 +94,6 @@ library
build-depends:
aeson >=1.4.1.0 && <1.6 || >=2.0.0.0 && <2.2
, attoparsec >=0.13.2.2 && <0.15
- , bytestring-builder >=0.10.8.1.0 && <0.11
, case-insensitive >=1.2.0.11 && <1.3
, hashable >=1.2.7.0 && <1.5
, Only >=0.1 && <0.1.1
@@ -109,6 +110,12 @@ library
if !impl(ghc >=7.6)
build-depends: ghc-prim
+ if flag(bytestring_has_builder)
+ build-depends: bytestring >=0.10.4 && <0.12
+ else
+ build-depends: bytestring <0.10.4
+ , bytestring-builder >=0.10.8.1.0 && <0.11
+
default-extensions:
BangPatterns
DoAndIfThenElse
