Accepting request 1279237 from devel:languages:haskell

version update OBS-URL: https://build.opensuse.org/request/show/1279237 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpphs?expand=0&rev=6
osc copypac from project:devel:languages:haskell:ghc-9.10.x package:cpphs revision:3, using keep-link
2025-05-22 14:57:05 +00:00 · 2025-05-22 10:58:58 +00:00 · 2023-11-22 09:17:19 +00:00 · 2023-11-16 16:59:34 +00:00 · 2023-11-10 14:07:16 +00:00
3 changed files with 113 additions and 108 deletions
--- a/cpphs.cabal
+++ b/cpphs.cabal
@@ -1,106 +1,105 @@
-Name: cpphs
-Version: 1.20.9.1
-x-revision: 1
-Copyright: 2004-2017, Malcolm Wallace
-License: LGPL
-License-File: LICENCE-LGPL
-Cabal-Version: >= 1.8
-Author: Malcolm Wallace <Malcolm.Wallace@me.com>
-Maintainer: Malcolm Wallace <Malcolm.Wallace@me.com>
-Homepage: http://projects.haskell.org/cpphs/
-bug-reports: https://github.com/malcolmwallace/cpphs/issues
-Synopsis: A liberalised re-implementation of cpp, the C pre-processor.
-Description:
-    Cpphs is a re-implementation of the C pre-processor that is both
-    more compatible with Haskell, and itself written in Haskell so
-    that it can be distributed with compilers.
-    .
-    This version of the C pre-processor is pretty-much
-    feature-complete and compatible with traditional (K&R)
-    pre-processors.  Additional features include: a plain-text mode;
-    an option to unlit literate code files; and an option to turn
-    off macro-expansion.
-Category: Development
-Build-type: Simple
-Extra-Source-Files: README, LICENCE-GPL, LICENCE-commercial, CHANGELOG, docs/cpphs.1, docs/index.html
-
-tested-with:
-  ghc ==9.2.1
-   || ==9.0.1
-   || ==8.10.7
-   || ==8.8.4
-   || ==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.4
-
-flag old-locale
-  description: If true, use old-locale, otherwise use time 1.5 or newer.
-  manual:      False
-  default:     False
-
-Library
-    Build-Depends: base >= 4.3 && <5, directory <1.4, polyparse>=1.13 && <1.14
-
-    if flag(old-locale)
-      Build-Depends:
-          old-locale  >=1.0.0.2 && <1.1
-        , time        >=0       && <1.5
-      Hs-Source-Dirs: . old
-
-    else
-      Build-Depends: time >=1.5 && <1.13
-      Hs-Source-Dirs: . new
-
-    Exposed-Modules:
-        Language.Preprocessor.Cpphs
-        Language.Preprocessor.Unlit
-    Other-Modules:
-        Language.Preprocessor.Cpphs.CppIfdef
-        Language.Preprocessor.Cpphs.HashDefine
-        Language.Preprocessor.Cpphs.MacroPass
-        Language.Preprocessor.Cpphs.Options
-        Language.Preprocessor.Cpphs.Position
-        Language.Preprocessor.Cpphs.ReadFirst
-        Language.Preprocessor.Cpphs.RunCpphs
-        Language.Preprocessor.Cpphs.SymTab
-        Language.Preprocessor.Cpphs.Tokenise
-        TimeCompat
-
-Executable cpphs
-    Build-Depends: base>=3&&<6, directory <1.4, polyparse>=1.13 && <1.14
-    Main-Is: cpphs.hs
-
-    if flag(old-locale)
-      Build-Depends:
-          old-locale  >=1.0.0.2 && <1.1
-        , time        >=0       && <1.5
-      Hs-Source-Dirs: . old
-
-    else
-      Build-Depends: time >=1.5 && <1.13
-      Hs-Source-Dirs: . new
-
-    Other-Modules:
-        Language.Preprocessor.Cpphs
-        Language.Preprocessor.Unlit
-        Language.Preprocessor.Cpphs.CppIfdef
-        Language.Preprocessor.Cpphs.HashDefine
-        Language.Preprocessor.Cpphs.MacroPass
-        Language.Preprocessor.Cpphs.Options
-        Language.Preprocessor.Cpphs.Position
-        Language.Preprocessor.Cpphs.ReadFirst
-        Language.Preprocessor.Cpphs.RunCpphs
-        Language.Preprocessor.Cpphs.SymTab
-        Language.Preprocessor.Cpphs.Tokenise
-        TimeCompat
-
-Source-Repository head
-    Type:     git
-    Location: https://github.com/hackage-trustees/malcolm-wallace-universe
+Name: cpphs
+Version: 1.20.9.1
+x-revision: 2
+Copyright: 2004-2017, Malcolm Wallace
+License: LGPL
+License-File: LICENCE-LGPL
+Cabal-Version: >= 1.8
+Author: Malcolm Wallace <Malcolm.Wallace@me.com>
+Maintainer: Malcolm Wallace <Malcolm.Wallace@me.com>
+Homepage: http://projects.haskell.org/cpphs/
+bug-reports: https://github.com/malcolmwallace/cpphs/issues
+Synopsis: A liberalised re-implementation of cpp, the C pre-processor.
+Description:
+    Cpphs is a re-implementation of the C pre-processor that is both
+    more compatible with Haskell, and itself written in Haskell so
+    that it can be distributed with compilers.
+    .
+    This version of the C pre-processor is pretty-much
+    feature-complete and compatible with traditional (K&R)
+    pre-processors.  Additional features include: a plain-text mode;
+    an option to unlit literate code files; and an option to turn
+    off macro-expansion.
+Category: Development
+Build-type: Simple
+Extra-Source-Files: README, LICENCE-GPL, LICENCE-commercial, CHANGELOG, docs/cpphs.1, docs/index.html
+
+tested-with:
+  GHC == 9.12.2
+  GHC == 9.10.2
+  GHC == 9.8.4
+  GHC == 9.6.7
+  GHC == 9.4.8
+  GHC == 9.2.8
+  GHC == 9.0.2
+  GHC == 8.10.7
+  GHC == 8.8.4
+  GHC == 8.6.5
+  GHC == 8.4.4
+  GHC == 8.2.2
+  GHC == 8.0.2
+
+flag old-locale
+  description: If true, use old-locale, otherwise use time 1.5 or newer.
+  manual:      False
+  default:     False
+
+Library
+    Build-Depends: base >= 4.3 && <5, directory <1.4, polyparse>=1.13 && <1.14
+
+    if flag(old-locale)
+      Build-Depends:
+          old-locale  >=1.0.0.2 && <1.1
+        , time        >=0       && <1.5
+      Hs-Source-Dirs: . old
+
+    else
+      Build-Depends: time >=1.5 && <1.15
+      Hs-Source-Dirs: . new
+
+    Exposed-Modules:
+        Language.Preprocessor.Cpphs
+        Language.Preprocessor.Unlit
+    Other-Modules:
+        Language.Preprocessor.Cpphs.CppIfdef
+        Language.Preprocessor.Cpphs.HashDefine
+        Language.Preprocessor.Cpphs.MacroPass
+        Language.Preprocessor.Cpphs.Options
+        Language.Preprocessor.Cpphs.Position
+        Language.Preprocessor.Cpphs.ReadFirst
+        Language.Preprocessor.Cpphs.RunCpphs
+        Language.Preprocessor.Cpphs.SymTab
+        Language.Preprocessor.Cpphs.Tokenise
+        TimeCompat
+
+Executable cpphs
+    Build-Depends: base >=4.3 && <5, directory <1.4, polyparse>=1.13 && <1.14
+    Main-Is: cpphs.hs
+
+    if flag(old-locale)
+      Build-Depends:
+          old-locale  >=1.0.0.2 && <1.1
+        , time        >=0       && <1.5
+      Hs-Source-Dirs: . old
+
+    else
+      Build-Depends: time >=1.5 && <1.15
+      Hs-Source-Dirs: . new
+
+    Other-Modules:
+        Language.Preprocessor.Cpphs
+        Language.Preprocessor.Unlit
+        Language.Preprocessor.Cpphs.CppIfdef
+        Language.Preprocessor.Cpphs.HashDefine
+        Language.Preprocessor.Cpphs.MacroPass
+        Language.Preprocessor.Cpphs.Options
+        Language.Preprocessor.Cpphs.Position
+        Language.Preprocessor.Cpphs.ReadFirst
+        Language.Preprocessor.Cpphs.RunCpphs
+        Language.Preprocessor.Cpphs.SymTab
+        Language.Preprocessor.Cpphs.Tokenise
+        TimeCompat
+
+Source-Repository head
+    Type:     git
+    Location: https://github.com/hackage-trustees/malcolm-wallace-universe
--- a/cpphs.changes
+++ b/cpphs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat May 17 07:04:51 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update cpphs to version 1.20.9.1 revision 2.
+  Upstream has revised the Cabal build instructions on Hackage.
+
 -------------------------------------------------------------------
 Thu Mar 30 17:05:40 UTC 2023 - Peter Simons <psimons@suse.com>

--- a/cpphs.spec
+++ b/cpphs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cpphs
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@ Summary:        A liberalised re-implementation of cpp, the C pre-processor
 License:        GPL-2.0-only AND LGPL-2.1-only
 URL:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{name}.cabal
+Source1:        https://hackage.haskell.org/package/%{name}-%{version}/revision/2.cabal#/%{name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-base-prof
Author	SHA256	Message	Date
Ana Guerrero	adf46fd03a	Accepting request 1279237 from devel:languages:haskell version update OBS-URL: https://build.opensuse.org/request/show/1279237 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpphs?expand=0&rev=6	2025-05-22 14:57:05 +00:00
Peter Simons	5be856d108	osc copypac from project:devel:languages:haskell:ghc-9.10.x package:cpphs revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/cpphs?expand=0&rev=17	2025-05-22 10:58:58 +00:00
Peter Simons	d537af2032	osc copypac from project:devel:languages:haskell:ghc-9.6.x package:cpphs revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/cpphs?expand=0&rev=16	2023-11-22 09:17:19 +00:00
Peter Simons	4413f25e3d	osc copypac from project:devel:languages:haskell:ghc-9.6.x package:cpphs revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/cpphs?expand=0&rev=15	2023-11-16 16:59:34 +00:00
Peter Simons	c7819a4bb3	osc copypac from project:devel:languages:haskell:ghc-9.6.x package:cpphs revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/cpphs?expand=0&rev=14	2023-11-10 14:07:16 +00:00