Fix manpage option

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -49,3 +49,12 @@
 /cabal-rpm-1.0.3.tar.gz
 /cabal-rpm-2.0.0.tar.gz
 /cabal-rpm-2.0.4.tar.gz
+/cabal-rpm-2.0.5.1.tar.gz
+/cabal-rpm-2.0.6.tar.gz
+/cabal-rpm-2.0.7.tar.gz
+/cabal-rpm-2.0.8.tar.gz
+/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.1.0.tar.gz

bash_completion

@@ -0,0 +1,14 @@
+_cabal-rpm()
+{
+    local CMDLINE
+    local IFS=$'\n'
+    CMDLINE=(--bash-completion-index $COMP_CWORD)
+
+    for arg in ${COMP_WORDS[@]}; do
+        CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
+    done
+
+    COMPREPLY=( $(cabal-rpm "${CMDLINE[@]}") )
+}
+
+complete -o filenames -F _cabal-rpm cabal-rpm cblrpm

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

@@ -1,37 +1,44 @@
-# generated by cabal-rpm-2.0.2 --stream hackage
-# https://fedoraproject.org/wiki/Packaging:Haskell
+# generated by cabal-rpm-2.1.0 --stream hackage
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
+%ifnarch riscv64
 %bcond_without manpage
+%else
+%bcond_with manpage
+%endif
 
 Name:           cabal-rpm
-Version:        2.0.4
-Release:        1%{?dist}
+Version:        2.1.0
+Release:        1.rvre0%{?dist}
 Summary:        RPM packaging tool for Haskell Cabal-based packages
 
-License:        GPLv3+
+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
 # End cabal-rpm sources
-Source1:        cblrpm.1
+Source2:        cblrpm.1
+# tweaked to add cblrpm
+Source3:        bash_completion
 
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-rpm-macros
-BuildRequires:  ghc-Cabal-static
-BuildRequires:  ghc-base-static
-BuildRequires:  ghc-bytestring-static
-BuildRequires:  ghc-directory-static
-BuildRequires:  ghc-filepath-static
-BuildRequires:  ghc-http-client-static
-BuildRequires:  ghc-http-client-tls-static
-BuildRequires:  ghc-http-conduit-static
-BuildRequires:  ghc-optparse-applicative-static
-BuildRequires:  ghc-process-static
-BuildRequires:  ghc-simple-cabal-static
-BuildRequires:  ghc-simple-cmd-static
-BuildRequires:  ghc-simple-cmd-args-static
-BuildRequires:  ghc-time-static
-BuildRequires:  ghc-unix-static
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-base-devel
+BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-extra-devel
+BuildRequires:  ghc-filepath-devel
+BuildRequires:  ghc-http-client-devel
+BuildRequires:  ghc-http-client-tls-devel
+BuildRequires:  ghc-http-conduit-devel
+BuildRequires:  ghc-optparse-applicative-devel
+BuildRequires:  ghc-process-devel
+BuildRequires:  ghc-simple-cabal-devel
+BuildRequires:  ghc-simple-cmd-devel
+BuildRequires:  ghc-simple-cmd-args-devel
+BuildRequires:  ghc-time-devel
+BuildRequires:  ghc-unix-devel
 # End cabal-rpm deps
 %if %{with manpage}
 BuildRequires:  pandoc
@@ -39,6 +46,8 @@ BuildRequires:  pandoc
 Obsoletes:      cabal2spec < 0.26
 Provides:       cblrpm = %{version}-%{release}
 Requires:       cabal-install
+Requires:       dos2unix
+Requires:       ghc-rpm-macros
 Requires:       rpm-build
 # for repoquery
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -46,7 +55,6 @@ Requires:       dnf-plugins-core
 %else
 Requires:       yum-utils
 %endif
-Requires:       dos2unix
 # for rpmdev-bumpspec
 Requires:       rpmdevtools
 Requires:       wget
@@ -82,11 +90,15 @@ pandoc -s -t man man/cabal-rpm.1.md > man/cabal-rpm.1
 %install
 # Begin cabal-rpm install
 %ghc_bin_install
+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
@@ -97,15 +109,126 @@ ln -s %{name} %{buildroot}%{_bindir}/cblrpm
 %license COPYING
 %doc ChangeLog README.md TODO
 %{_bindir}/%{name}
+%{_datadir}/bash-completion/completions/%{name}
 # End cabal-rpm files
 %{_bindir}/cblrpm
+%{_datadir}/bash-completion/completions/cblrpm
+%if %{with manpage}
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/cblrpm.1*
+%endif
 
 
 %changelog
+* Mon Jun 26 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2.1.0-1.rvre0
+- Rebuilt for Fedora/RISCV (riscv64)
+- Disable manpage on riscv64
+
+* Wed Feb 22 2023 Jens Petersen <petersen@redhat.com> - 2.1.0-1
+- spec: list out ghc-*-prof BRs separately from ghc-*-devel
+- spec: output SPDX license tags
+- spec: for standalone f36+ cabal-install needs ghc_set_gcc_flags
+- spec: handle '.' paragraph separator lines in description
+- spec: initial support for --with-ghc version to build with ghcX.Y
+- spec: check if deps of missing deps available
+- Stackage: default to latest lts-20 stream
+- refresh: build cabal-rpm in tempdir
+- PackageUtils rpmbuild: no longer override _builddir, _rpmdir, _srcrpmdir
+- PackageUtils tryUnpack: now into _builddir
+- PackageUtils patchSpec: show .rej if patch fails
+- PackageUtils: handle tools like ghc-tags which are not a library
+- always assume revised .cabal is wanted/used
+
+* 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
+
+* Fri Jun 17 2022 Jens Petersen <petersen@redhat.com> - 2.0.11-2
+- rebuild
+
+* Mon Mar 14 2022 Jens Petersen <petersen@redhat.com> - 2.0.11-1
+- take build-tool-depends into account (#65)
+- 'spec','update': detect autorelease and preserve autochangelog (#66)
+- 'spec --standalone': strip executable
+- support _builddir
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 2.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
+
+* Sat Aug 14 2021 Jens Petersen <petersen@redhat.com> - 2.0.10-1
+- Spec: drop ghc_fix_rpath for subpkgs
+- Stackage: bump to LTS 18
+- update: only output old version if upgrading
+- pkgSpecPkgData: try allowing versioned dir
+
+* Fri Aug 06 2021 Jens Petersen <petersen@redhat.com> - 2.0.9-3
+- rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jun 09 2021 Jens Petersen <petersen@redhat.com> - 2.0.9-1
+- spec: doc requires ghc-filesystem
+- spec: make cabal_test conditional explicit
+- refresh: fix installation of cabal-rpm-version with cabal install
+- spec: tweak conditions for standalone sandbox (ie rhel8)
+
+* Sat Mar 27 2021 Jens Petersen <petersen@redhat.com> - 2.0.8-1
+- update: make sure krb ticket exists before uploading source
+- spec: executable doc files now handled by ghc-rpm-macros
+- move dos2unix for revised DOS .cabal from download to spec build time
+- spec: do not enable testsuite for standalone package
+- spec: also bash-completion for simple-cmd-args
+- spec: for bash-completions use default not filenames
+- Stackage: use lts-17
+- pkgInstallMissing: also install ghc-rpm-macros
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Oct  7 13:49:30 +08 2020 Jens Petersen <petersen@redhat.com> - 2.0.7-1
+- update to 2.0.7
+
+* Thu Aug 13 2020 Jens Petersen <petersen@redhat.com> - 2.0.6-4
+- also bash completion for cblrpm alias
+
+* Mon Aug 10 2020 Jens Petersen <petersen@redhat.com> - 2.0.6-3
+- setup bash completion
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 16 2020 Jens Petersen <petersen@redhat.com> - 2.0.6-1
+- spec: use packager's name in %%changelog
+- spec: default package versions to Stackage LTS 16
+- spec now also leaves newly prepped source tree around
+- spec: handle testsuite tool deps separately
+- spec,refresh,update: more care about whether to revise or not
+- diff: ignore release field
+- prep: be quiet
+- spec: add a comment for missing testsuite deps
+- only allow specifying major Stackage LTS versions (not minor):
+  for more progressive updating logic (lts-n -> lts-(n+1) -> nightly -> Hackage)
+- spec: take specified stream into account for subpackaging
+- update: finally run prep to check update okay
+- prep/srpm --verbose and local --quiet options
+- spec: move chmod for docs to %%prep
+- spec: check existing .spec file for detecting dropped deps and executable deps
+- update: also commit revised .cabal file when no update
+- fix copying of cached tarballs (longstanding defect)
+
+* Fri Jun 19 2020 Jens Petersen <petersen@redhat.com> - 2.0.5.1-1
+- refresh and update now leave newly prepped source tree around
+- spec: dropped deprecated %%post and %%postun scriptlets
+
 * Thu Feb 27 2020 Jens Petersen <petersen@redhat.com> - 2.0.4-1
-- drop %_devel compat macro
+- drop %%_devel compat macro
 - default stream is now lts-14
 - spec: detect local revised .cabal file
 - sort deps of subpackages
@@ -117,7 +240,12 @@ ln -s %{name} %{buildroot}%{_bindir}/cblrpm
 - generate BRs for subpackages
 
 * Thu Feb 20 2020 Jens Petersen <petersen@redhat.com> - 2.0.0-3
-- refresh to cabal-rpm-2.0.2
+- drop %%_devel compat macro
+- default stream is now lts-14
+- sort deps of subpackages
+- metapkgs don't have prof or doc
+- fix generation of subpackages for a new package
+- update: logic reworked to reduce redundant downloads
 
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

sources

@@ -1 +1 @@
-SHA512 (cabal-rpm-2.0.4.tar.gz) = f5ee97a80bdc595d96902edc261bf90725b3e0381b404d5768f1c0b823de28a1710576c5877f90bd702523202bfa84cef2f6653746b8fff7df7b226e43dfd2ec
+SHA512 (cabal-rpm-2.1.0.tar.gz) = 1f28150feb3622eac10d4618a4c67696d67dd2863c381c90c868bce8bf57fbfea4d482bb72c5b91efd4322c4c3c7b85305c544f79af2c2b15ff69dbf36788fa3