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

cpphs-1.20.10.tar.gz

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

cpphs-1.20.9.1.tar.gz

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

cpphs.cabal

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

cpphs.changes

@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-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>
 
@@ -29,9 +17,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>
 
@@ -41,3 +29,4 @@ 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

@@ -19,12 +19,13 @@
 %global pkg_name cpphs
 %global pkgver %{pkg_name}-%{version}
 Name:           %{pkg_name}
-Version:        1.20.10
+Version:        1.20.9.1
 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/2.cabal#/%{name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-base-prof
@@ -47,8 +48,6 @@ 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
@@ -87,6 +86,8 @@ 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
@@ -102,14 +103,14 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 %files
 %license LICENCE-LGPL
-%doc CHANGELOG.md LICENCE-GPL LICENCE-commercial README.md docs
+%doc CHANGELOG LICENCE-GPL LICENCE-commercial README 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.md LICENCE-GPL LICENCE-commercial README.md docs
+%doc CHANGELOG LICENCE-GPL LICENCE-commercial README docs
 
 %files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files
 %license LICENCE-LGPL