Accepting request 1310461 from devel:languages:haskell

version update

OBS-URL: https://build.opensuse.org/request/show/1310461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpphs?expand=0&rev=7

cpphs-1.20.10.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fa78ae9a2a1d1c69179238e8849340ad26be6496b763a489bf2e0eb5b7c4c19
+size 45622

cpphs-1.20.9.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f59b10bc3374004cee3c04fa4ee4a1b90d0dca84a3d0e436d5861a1aa3b919f
-size 45496

cpphs.cabal

@@ -1,106 +0,0 @@
-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

cpphs.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sun Sep 14 15:58:20 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update cpphs to version 1.20.10.
+  * Drop support for GHC 7.
+  * Remove cabal flag `old-locale`.
+  * Compatibility with `{-# LANGUAGE RecordDotSyntax #-}` (Lennart Augustsson).
+  * Build tested with GHC 8.0 - 9.14 alpha1.
+  * bugfixes for `#if defined(FOO) && FOO(a,b)`
+  * ensure all input/output is UTF8, regardless of locale
+  * bugfix for windows drive letter in #include
+
+-------------------------------------------------------------------
+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>
 
@@ -11,9 +29,9 @@ Wed Nov  3 15:45:50 UTC 2021 - psimons@suse.com
 
 -------------------------------------------------------------------
 Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
- 
+
 - disable %{ix86} build
- 
+
 -------------------------------------------------------------------
 Tue Aug 18 10:43:44 UTC 2020 - Peter Simons <psimons@suse.com>
 
@@ -23,4 +41,3 @@ Tue Aug 18 10:43:44 UTC 2020 - Peter Simons <psimons@suse.com>
 Tue Jun 23 09:31:49 UTC 2020 - psimons@suse.com
 
 - Add cpphs at version 1.20.9.1.
-

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
@@ -19,13 +19,12 @@
 %global pkg_name cpphs
 %global pkgver %{pkg_name}-%{version}
 Name:           %{pkg_name}
-Version:        1.20.9.1
+Version:        1.20.10
 Release:        0
 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
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-base-prof
@@ -48,6 +47,8 @@ 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.
 
+Old homepage: <https://archives.haskell.org/projects.haskell.org/cpphs/>.
+
 %package -n ghc-%{name}
 Summary:        Haskell %{name} library
 License:        LGPL-2.1-only
@@ -86,8 +87,6 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 %prep
 %autosetup
-cp -p %{SOURCE1} %{name}.cabal
-find . -type f -exec chmod -x {} +
 
 %build
 %ghc_lib_build
@@ -103,14 +102,14 @@ find . -type f -exec chmod -x {} +
 
 %files
 %license LICENCE-LGPL
-%doc CHANGELOG LICENCE-GPL LICENCE-commercial README docs
+%doc CHANGELOG.md LICENCE-GPL LICENCE-commercial README.md docs
 %{_bindir}/%{name}
 
 %files -n ghc-%{name} -f ghc-%{name}.files
 %license LICENCE-LGPL
 
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%doc CHANGELOG LICENCE-GPL LICENCE-commercial README docs
+%doc CHANGELOG.md LICENCE-GPL LICENCE-commercial README.md docs
 
 %files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files
 %license LICENCE-LGPL