Compare commits

..

17 Commits
f28 ... master

Author SHA1 Message Date
Jens Petersen
ed2f748318 update to 2.0.4 2020-02-27 12:28:14 +08:00
Jens Petersen
d9009656cf refresh to cabal-rpm-2.0.2 2020-02-20 10:14:49 +08:00
Fedora Release Engineering
afe81abf5b - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 13:30:27 +00:00
Jens Petersen
eaa47d7b25 update to 2.0.0 2020-01-20 23:34:28 +08:00
Jens Petersen
6883cfa237 replace changelog url with entries 2019-12-31 17:22:50 +08:00
Jens Petersen
3d3e710550 add changelog url 2019-12-31 17:15:56 +08:00
Jens Petersen
828be0e412 update to 1.0.3 2019-12-31 17:13:05 +08:00
Jens Petersen
d1b6180e90 refresh to cabal-rpm-1.0.3 2019-12-31 17:11:47 +08:00
Jens Petersen
b4e6c00173 drop https bcond 2019-12-31 17:08:32 +08:00
Jens Petersen
a4742fcf0b drop cabal-rpm-0.13.3-simple-cmd_sudo.patch 2019-12-31 17:07:56 +08:00
Jens Petersen
adbb68b293 update to 1.0.2 2019-12-09 23:48:42 +08:00
Jens Petersen
60829c0edd simple-cmd patch would now be for old releases 2019-11-01 18:35:44 +08:00
Jens Petersen
983cb8c348 update to 1.0.1 2019-10-01 18:39:02 +08:00
Jens Petersen
1c7c44667e generate manpage and patch build for simple-cmd-0.2 2019-09-04 18:35:48 +08:00
Jens Petersen
c187e7c158 BR prof for lib and static for executable 2019-08-05 18:26:53 +08:00
Jens Petersen
1335074b1d bump release 2019-08-01 19:56:22 +05:30
Fedora Release Engineering
f5dab2e207 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 19:46:43 +00:00
3 changed files with 92 additions and 27 deletions

5
.gitignore vendored
View File

@ -44,3 +44,8 @@
/cabal-rpm-0.13.1.tar.gz
/cabal-rpm-0.13.2.tar.gz
/cabal-rpm-0.13.3.tar.gz
/cabal-rpm-1.0.1.tar.gz
/cabal-rpm-1.0.2.tar.gz
/cabal-rpm-1.0.3.tar.gz
/cabal-rpm-2.0.0.tar.gz
/cabal-rpm-2.0.4.tar.gz

View File

@ -1,14 +1,10 @@
# generated by cabal-rpm-0.13.2
# generated by cabal-rpm-2.0.2 --stream hackage
# https://fedoraproject.org/wiki/Packaging:Haskell
%if 0%{?fedora} >= 27
%bcond_without https
%else
%bcond_with https
%endif
%bcond_without manpage
Name: cabal-rpm
Version: 0.13.3
Version: 2.0.4
Release: 1%{?dist}
Summary: RPM packaging tool for Haskell Cabal-based packages
@ -20,31 +16,32 @@ Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%
Source1: cblrpm.1
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
%if %{with https}
BuildRequires: ghc-bytestring-devel
%endif
BuildRequires: ghc-directory-devel
BuildRequires: ghc-filepath-devel
%if %{with https}
BuildRequires: ghc-http-client-devel
BuildRequires: ghc-http-client-tls-devel
BuildRequires: ghc-http-conduit-devel
%else
BuildRequires: ghc-old-locale-devel
%endif
BuildRequires: ghc-process-devel
BuildRequires: ghc-simple-cmd-devel
BuildRequires: ghc-time-devel
BuildRequires: ghc-unix-devel
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
# End cabal-rpm deps
%if %{with manpage}
BuildRequires: pandoc
%endif
Obsoletes: cabal2spec < 0.26
Provides: cblrpm = %{version}-%{release}
Requires: cabal-install
Requires: rpm-build
# for repoquery
%if 0%{?fedora} >= 22
%if 0%{?fedora} || 0%{?rhel} > 7
Requires: dnf-plugins-core
%else
Requires: yum-utils
@ -64,7 +61,7 @@ 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 packaged built with cabal-install.
Standalone packages can also be made, built with cabal-install.
%prep
@ -77,6 +74,9 @@ Standalone packages can also be packaged built with cabal-install.
# Begin cabal-rpm build:
%ghc_bin_build
# End cabal-rpm build
%if %{with manpage}
pandoc -s -t man man/cabal-rpm.1.md > man/cabal-rpm.1
%endif
%install
@ -84,11 +84,14 @@ Standalone packages can also be packaged built with cabal-install.
%ghc_bin_install
# End cabal-rpm install
%if %{with manpage}
install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man1/
%endif
ln -s %{name} %{buildroot}%{_bindir}/cblrpm
%files
# Begin cabal-rpm files:
%license COPYING
@ -101,6 +104,63 @@ ln -s %{name} %{buildroot}%{_bindir}/cblrpm
%changelog
* Thu Feb 27 2020 Jens Petersen <petersen@redhat.com> - 2.0.4-1
- drop %_devel compat macro
- default stream is now lts-14
- spec: detect local revised .cabal file
- 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
- quote macros in commented fields
- read --subpackage from spec header
- generate BRs for subpackages
* Thu Feb 20 2020 Jens Petersen <petersen@redhat.com> - 2.0.0-3
- refresh to cabal-rpm-2.0.2
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 20 2020 Jens Petersen <petersen@redhat.com> - 2.0.0-1
- update to 2.0.0:
- major refactor to handle stream/pkgid more precisely and correctly
(hence major version bump due to behavior changes)
- eg can no longer specify both stream and pkg-ver
- check for package first in default LTS, then latest LTS, and Nightly,
before Hackage
- respect and read/write --standalone and --stream in spec header consistently
(note default LTS stream is not written to header)
- fix infinite loop for 'install'
* Tue Dec 31 2019 Jens Petersen <petersen@redhat.com> - 1.0.3-1
- update to 1.0.3
- define _devel for f30 packaging compatibility
- missingdeps and builddep fixes
- --standalone: adds BRs for deps of missing deps
* Mon Dec 09 2019 Jens Petersen <petersen@redhat.com> - 1.0.2-1
- minor bugfixes
- https://hackage.haskell.org/package/cabal-rpm-1.0.2/changelog
* Tue Oct 01 2019 Jens Petersen <petersen@redhat.com> - 1.0.1-1
- doc and prof subpackages for libraries
- reworked to use optparse-applicative (simple-cmd-args)
- default to Stackage LTS 13
- F31+ uses triggers for ghc-pkg recache
- wait 10^4s (< 3 hours) between cabal update's
- refactor using simple-cabal, PackageName and LibPkgType
- handle setup-depends
- diff: autodetect subpackaging
- https://hackage.haskell.org/package/cabal-rpm-1.0.1/changelog
* Thu Aug 01 2019 Jens Petersen <petersen@redhat.com> - 0.13.3-3
- generate manpage (#1725973)
- fix build with simple-cmd 0.2
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat May 11 2019 fedora-toolbox <petersen@redhat.com> - 0.13.3-1
- repoquery for missing deps' package .conf file to avoid modular ghc conflicts
- only --assumeyes for dnf install when not tty

View File

@ -1 +1 @@
SHA512 (cabal-rpm-0.13.3.tar.gz) = 4a3eab0ee280be2bd0a8de678f09cf26f9267aa151b560180a0fdfdf1d256a1bfd6df4c4a22b5f3d9928ac6058dbb005a4eac32e751eff6b4a78701ef10f0d9b
SHA512 (cabal-rpm-2.0.4.tar.gz) = f5ee97a80bdc595d96902edc261bf90725b3e0381b404d5768f1c0b823de28a1710576c5877f90bd702523202bfa84cef2f6653746b8fff7df7b226e43dfd2ec