diff --git a/filestore-0.6.5.cabal b/filestore-0.6.5.cabal
new file mode 100644
index 0000000..02bc577
--- /dev/null
+++ b/filestore-0.6.5.cabal
@@ -0,0 +1,80 @@
+Name:                filestore
+Version:             0.6.5
+x-revision: 1
+Cabal-Version:       >= 1.10
+Build-type:          Simple
+Synopsis:            Interface for versioning file stores.
+Description:         The filestore library provides an abstract interface for a versioning
+                     file store, and modules that instantiate this interface.  Currently
+                     Git, Darcs, and Mercurial modules are provided, and other VCSs
+                     or databases could be added.
+Category:            Data
+Stability:           Experimental
+License:             BSD3
+License-File:        LICENSE
+Author:              John MacFarlane, Gwern Branwen, Sebastiaan Visser
+Maintainer:          jgm@berkeley.edu
+Bug-Reports:         https://github.com/jgm/filestore/issues
+
+Extra-Source-Files:  CHANGES
+
+Source-repository head
+  type:          git
+  location:      git://github.com/jgm/filestore.git
+
+Flag maxcount
+    default:     True
+    description: Make use of a recent (>= 2.3.0) Darcs feature which vastly improves the performance
+                 of 'latest'.  You should disable this flag if you plan to use gitit with an
+                 older version of Darcs, or 'latest' will raise an error.
+
+Library
+    Build-depends:       base >= 4 && < 5,
+                         bytestring >= 0.9 && < 1.0,
+                         containers >= 0.3 && < 0.7,
+                         utf8-string >= 0.3 && < 1.1,
+                         filepath >= 1.1 && < 1.5,
+                         directory >= 1.0 && < 1.4,
+                         parsec >= 2 && < 3.2,
+                         process >= 1.0 && < 1.7,
+                         time >= 1.5 && < 1.13,
+                         xml >= 1.3 && < 1.4,
+                         split >= 0.1 && < 0.3,
+                         Diff >= 0.4 && < 0.5,
+                         old-locale >= 1.0 && < 1.1
+
+    Exposed-modules:     Data.FileStore
+                         Data.FileStore.Types
+                         Data.FileStore.Git
+                         Data.FileStore.Darcs
+                         Data.FileStore.Mercurial
+                         -- Data.FileStore.Sqlite3
+                         Data.FileStore.Utils
+                         Data.FileStore.Generic
+    Other-modules:       Data.FileStore.DarcsXml
+                         Data.FileStore.MercurialCommandServer
+                         Data.FileStore.Compat.Locale
+    Default-Extensions:  FlexibleInstances
+    Default-Language:    Haskell98
+    if flag(maxcount)
+        cpp-options: -DUSE_MAXCOUNT
+    if impl(ghc >= 6.12)
+      Ghc-Options:       -Wall -fno-warn-unused-do-bind
+    else
+      Ghc-Options:       -Wall
+    Ghc-Prof-Options:    -fprof-auto-exported
+
+Test-suite test-filestore
+    Type:           exitcode-stdio-1.0
+    Hs-source-dirs: tests
+    Main-is:        Tests.hs
+    Default-Language:  Haskell98
+    Build-depends:  base >= 4.7 && < 5,
+                    HUnit >= 1.2 && < 1.7,
+                    mtl,
+                    time,
+                    Diff >= 0.4 && < 0.5,
+                    filepath >= 1.1 && < 1.5,
+                    directory >= 1.1 && < 1.4,
+                    filestore
+
diff --git a/ghc-filestore.spec b/ghc-filestore.spec
index 77d9a47..3c69e32 100644
--- a/ghc-filestore.spec
+++ b/ghc-filestore.spec
@@ -1,4 +1,4 @@
-# generated by cabal-rpm-2.0.9
+# generated by cabal-rpm-2.1.0
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name filestore
@@ -8,18 +8,34 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.6.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Interface for versioning file stores
 
-License:        BSD
+License:        BSD-3-Clause
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
+BuildRequires:  dos2unix
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-Diff-devel
+BuildRequires:  ghc-base-devel
+BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-filepath-devel
+BuildRequires:  ghc-old-locale-devel
+BuildRequires:  ghc-parsec-devel
+BuildRequires:  ghc-process-devel
+BuildRequires:  ghc-split-devel
+BuildRequires:  ghc-time-devel
+BuildRequires:  ghc-utf8-string-devel
+BuildRequires:  ghc-xml-devel
+%if %{with ghc_prof}
 BuildRequires:  ghc-Diff-prof
 BuildRequires:  ghc-base-prof
 BuildRequires:  ghc-bytestring-prof
@@ -33,6 +49,7 @@ BuildRequires:  ghc-split-prof
 BuildRequires:  ghc-time-prof
 BuildRequires:  ghc-utf8-string-prof
 BuildRequires:  ghc-xml-prof
+%endif
 %if %{with tests}
 BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-mtl-devel
@@ -83,6 +100,7 @@ This package provides the Haskell %{pkg_name} profiling library.
 %prep
 # Begin cabal-rpm setup:
 %setup -q -n %{pkgver}
+dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
 # End cabal-rpm setup
 
 
@@ -126,6 +144,9 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 
 %changelog
+* Thu Feb 16 2023 Jens Petersen <petersen@redhat.com> - 0.6.5-5
+- refresh to cabal-rpm-2.1.0 with SPDX migration
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild