Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-yesod-persistent for
openSUSE:Factory checked in at 2023-04-04 21:25:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-yesod-persistent (Old)
and /work/SRC/openSUSE:Factory/.ghc-yesod-persistent.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yesod-persistent"
Tue Apr 4 21:25:30 2023 rev:8 rq:1076518 version:1.6.0.8
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-yesod-persistent/ghc-yesod-persistent.changes
2022-08-01 21:31:32.677853677 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-yesod-persistent.new.19717/ghc-yesod-persistent.changes
2023-04-04 21:25:44.331004525 +0200
@@ -1,0 +2,8 @@
+Thu Mar 30 17:09:12 UTC 2023 - Peter Simons <[email protected]>
+
+- Updated spec file to conform with ghc-rpm-macros-2.5.2.
+
+- Apply "dont-depend-on-obsolete-persistent-template.patch" to avoid
+ depending on the obsolete persistent-templates package.
+
+-------------------------------------------------------------------
@@ -52 +59,0 @@
-
New:
----
dont-depend-on-obsolete-persistent-template.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-yesod-persistent.spec ++++++
--- /var/tmp/diff_new_pack.6fSjcT/_old 2023-04-04 21:25:44.771007023 +0200
+++ /var/tmp/diff_new_pack.6fSjcT/_new 2023-04-04 21:25:44.779007068 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-yesod-persistent
#
-# 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 yesod-persistent
+%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
Version: 1.6.0.8
@@ -25,22 +26,35 @@
License: MIT
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/yesodweb/yesod/pull/1798.patch#/dont-depend-on-obsolete-persistent-template.patch
BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-base-devel
+BuildRequires: ghc-base-prof
BuildRequires: ghc-blaze-builder-devel
+BuildRequires: ghc-blaze-builder-prof
BuildRequires: ghc-conduit-devel
+BuildRequires: ghc-conduit-prof
BuildRequires: ghc-persistent-devel
-BuildRequires: ghc-persistent-template-devel
+BuildRequires: ghc-persistent-prof
BuildRequires: ghc-resource-pool-devel
+BuildRequires: ghc-resource-pool-prof
BuildRequires: ghc-resourcet-devel
+BuildRequires: ghc-resourcet-prof
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-transformers-devel
+BuildRequires: ghc-transformers-prof
BuildRequires: ghc-yesod-core-devel
+BuildRequires: ghc-yesod-core-prof
ExcludeArch: %{ix86}
%if %{with tests}
BuildRequires: ghc-hspec-devel
+BuildRequires: ghc-hspec-prof
BuildRequires: ghc-persistent-sqlite-devel
+BuildRequires: ghc-persistent-sqlite-prof
BuildRequires: ghc-text-devel
+BuildRequires: ghc-text-prof
BuildRequires: ghc-wai-extra-devel
+BuildRequires: ghc-wai-extra-prof
%endif
%description
@@ -58,6 +72,22 @@
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}
@@ -82,4 +112,9 @@
%files devel -f %{name}-devel.files
%doc ChangeLog.md README.md
+%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-persistent-template.patch ++++++
>From de8c69c9312a6b88cb4c0395cf4c4d663bfaf1d2 Mon Sep 17 00:00:00 2001
From: Peter Simons <[email protected]>
Date: Thu, 30 Mar 2023 09:15:55 +0200
Subject: [PATCH] yesod-persistent: don't depend on persistent-template if we
don't have to
If our version of 'persistent' is sufficiently new, then we don't need a
dependency on the empty 'persistent-template' package.
---
yesod-persistent/yesod-persistent.cabal | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/yesod-persistent/yesod-persistent.cabal
b/yesod-persistent/yesod-persistent.cabal
index 4416399b2..4071414e7 100644
--- a/yesod-persistent/yesod-persistent.cabal
+++ b/yesod-persistent/yesod-persistent.cabal
@@ -13,12 +13,13 @@ homepage: http://www.yesodweb.com/
description: API docs and the README are available at
<http://www.stackage.org/package/yesod-persistent>
extra-source-files: README.md ChangeLog.md
+flag persistent_has_persistent_template
+ default: True
+
library
default-language: Haskell2010
build-depends: base >= 4.10 && < 5
, yesod-core >= 1.6 && < 1.7
- , persistent >= 2.8
- , persistent-template >= 2.1
, transformers >= 0.2.2
, blaze-builder
, conduit
@@ -28,6 +29,12 @@ library
Yesod.Persist.Core
ghc-options: -Wall
+ if flag(persistent_has_persistent_template)
+ build-depends: persistent >= 2.12.0.1
+ else
+ build-depends: persistent >= 2.8 && < 2.12.0.1
+ , persistent-template >= 2.1 && < 2.12.0.0
+
test-suite test
default-language: Haskell2010
type: exitcode-stdio-1.0
