update to 2.0.11.1

special bash_completion

.gitignore

@@ -56,3 +56,4 @@
 /cabal-rpm-2.0.9.tar.gz
 /cabal-rpm-2.0.10.tar.gz
 /cabal-rpm-2.0.11.tar.gz
+/cabal-rpm-2.0.11.1.tar.gz

cabal-rpm-2.0.11.1.cabal

@@ -0,0 +1,93 @@
+Name:                cabal-rpm
+Version:             2.0.11.1
+x-revision: 1
+Synopsis:            RPM packaging tool for Haskell Cabal-based packages
+Description:
+    This package provides a RPM packaging tool for Haskell Cabal-based packages.
+    .
+    cabal-rpm has commands to generate a RPM spec file and srpm for a package.
+    It can rpmbuild packages, yum/dnf install their dependencies, prep packages,
+    and install them. There are commands to list package dependencies and
+    missing dependencies. The diff command compares the current spec file with
+    a freshly generated one, the update command updates the spec file to latest
+    version from Stackage or Hackage, and the refresh command updates the spec
+    file to the current cabal-rpm packaging. It also handles Hackage revisions of
+    packages. Standalone packages can also be made, built with cabal-install.
+Homepage:            https://github.com/juhp/cabal-rpm
+Bug-reports:         https://github.com/juhp/cabal-rpm/issues
+License:             GPL-3
+License-file:        COPYING
+Author:              Jens Petersen <juhpetersen@gmail.com>,
+                     Bryan O'Sullivan <bos@serpentine.com>
+Maintainer:          Jens Petersen <petersen@fedoraproject.org>
+Copyright:           2007-2008 Bryan O'Sullivan <bos@serpentine.com>,
+                     2012-2022 Jens Petersen <juhpetersen@gmail.com>
+Category:            Distribution
+Build-type:          Simple
+Extra-doc-files:     ChangeLog README.md TODO
+Extra-source-files:  man/cabal-rpm.1.md
+Cabal-version:       1.18
+Tested-with:         GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3,
+                     GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4,
+                     GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.5
+
+source-repository head
+  type:     git
+  location: https://github.com/juhp/cabal-rpm
+
+Flag old-locale
+  Description:   Use old-locale and time < 1.5
+  Default:       False
+
+Flag curl
+  Description:   Use curl library to query Stackage instead of http-client
+  Default:       False
+
+Executable cabal-rpm
+    Main-is:            Main.hs
+    Build-depends: base < 5,
+                   Cabal > 1.10 && < 3.9,
+                   directory,
+                   extra,
+                   filepath,
+                   optparse-applicative,
+                   process,
+                   simple-cabal >= 0.1.3,
+                   simple-cmd >= 0.2.0,
+                   simple-cmd-args >= 0.1.6,
+                   unix
+    if flag(old-locale)
+       Build-Depends: old-locale >= 1 && < 1.1,
+                      time >= 1.2 && < 1.5
+    else
+       Build-Depends: time >= 1.5
+    if impl(ghc<8.0)
+       Build-Depends: semigroups
+    if impl(ghc >= 8.0) && !flag(curl)
+       Build-Depends: bytestring,
+                      http-client >= 0.4.30,
+                      http-client-tls,
+                      http-conduit
+    else
+       Build-Depends: curl
+       Cpp-options: -DCURL
+    Default-Language:    Haskell2010
+    Other-modules:
+                  Commands.BuildDep,
+                  Commands.Depends,
+                  Commands.Diff,
+                  Commands.Install,
+                  Commands.RpmBuild,
+                  Commands.Refresh,
+                  Commands.Spec,
+                  Commands.Update,
+                  Dependencies,
+                  FileUtils,
+                  Header,
+                  PackageUtils,
+                  Stackage,
+                  SysCmd,
+                  Types,
+                  Paths_cabal_rpm
+    Hs-Source-Dirs:     src
+    GHC-options:        -fwarn-missing-signatures -Wall

cabal-rpm.spec

@@ -4,20 +4,22 @@
 %bcond_without manpage
 
 Name:           cabal-rpm
-Version:        2.0.11
+Version:        2.0.11.1
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        RPM packaging tool for Haskell Cabal-based packages
 
 License:        GPL-3.0-or-later
 Url:            https://hackage.haskell.org/package/%{name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}.cabal#/%{name}-%{version}.cabal
 # End cabal-rpm sources
-Source1:        cblrpm.1
+Source2:        cblrpm.1
 # tweaked to add cblrpm
-Source2:        bash_completion
+Source3:        bash_completion
 
 # Begin cabal-rpm deps:
+BuildRequires:  dos2unix
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-base-devel
@@ -71,6 +73,7 @@ Standalone packages can also be made, built with cabal-install.
 %prep
 # Begin cabal-rpm setup:
 %setup -q
+dos2unix -k -n %{SOURCE1} %{name}.cabal
 # End cabal-rpm setup
 
 
@@ -89,12 +92,12 @@ pandoc -s -t man man/cabal-rpm.1.md > man/cabal-rpm.1
 mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
 %{buildroot}%{_bindir}/%{name} --bash-completion-script %{name} | sed s/filenames/default/ > %{buildroot}%{_datadir}/bash-completion/completions/%{name}
 # End cabal-rpm install
-
+install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_datadir}/bash-completion/completions/%{name}
 ln -s %{name} %{buildroot}%{_datadir}/bash-completion/completions/cblrpm
 
 %if %{with manpage}
 install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
-install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man1/
+install -p -m 0644 %SOURCE2 %{buildroot}%{_mandir}/man1/
 %endif
 
 ln -s %{name} %{buildroot}%{_bindir}/cblrpm
@@ -114,6 +117,10 @@ ln -s %{name} %{buildroot}%{_bindir}/cblrpm
 
 
 %changelog
+* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 2.0.11.1-1
+- https://hackage.haskell.org/package/cabal-rpm-2.0.11.1/changelog
+- refresh to cabal-rpm-2.1.0 with SPDX migration
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (cabal-rpm-2.0.11.tar.gz) = 3804fe16bd2d8ad69e211fa9549c6219841d499096108f3813b91323501c69e14d820fc5ee3b00a8ca1b4ad67dc1a38e8fc8875151a168a3b6b78fbc18fac788
+SHA512 (cabal-rpm-2.0.11.1.tar.gz) = 334f5c5245114c61f43ad90fc0ef25ab77df4e73eae8c4a326749ad5dee4c7154188e31cf32084ca5234a11a19262948373b1f9ad22ddf43286a37bdfc5bb870