update to 0.8.10: new diff and missingdeps commands

- should now work on RHEL 5 and 6: dropped use use of rpmspec
- temporary cblrpm-diff compat script
- refresh description
This commit is contained in:
Jens Petersen 2014-03-03 18:20:52 +09:00
parent eb5cde05a5
commit da2eb6a340
4 changed files with 25 additions and 7 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@
/cabal-rpm-0.8.7.tar.gz /cabal-rpm-0.8.7.tar.gz
/cabal-rpm-0.8.8.tar.gz /cabal-rpm-0.8.8.tar.gz
/cabal-rpm-0.8.9.tar.gz /cabal-rpm-0.8.9.tar.gz
/cabal-rpm-0.8.10.tar.gz

View File

@ -1,14 +1,16 @@
# https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/Packaging:Haskell
Name: cabal-rpm Name: cabal-rpm
Version: 0.8.9 Version: 0.8.10
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM package creator for Haskell Cabal-based packages Summary: RPM packaging tool for Haskell Cabal-based packages
License: GPLv3+ License: GPLv3+
URL: http://hackage.haskell.org/package/%{name} URL: http://hackage.haskell.org/package/%{name}
Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
Source1: cabal-rpm.1 Source1: cabal-rpm.1
Source2: cblrpm-diff
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps: # Begin cabal-rpm deps:
@ -28,9 +30,10 @@ Requires: rpm-build
Requires: yum-utils Requires: yum-utils
%description %description
Cabal-rpm generates and builds RPM packages from Haskell Cabal packages, Cabal-rpm is a tool for RPM packaging of Haskell Cabal-based packages.
and also provides wrapper over "cabal install" for depends. The tool It interacts with yum to install build dependencies and can also act as
installs available build dependencies using yum. a cabal-install wrapper installing dependencies packaged in Fedora before
running "cabal install".
%prep %prep
@ -44,7 +47,7 @@ installs available build dependencies using yum.
%install %install
%ghc_bin_install %ghc_bin_install
install -p cblrpm-diff %{buildroot}%{_bindir} install -p %SOURCE2 %{buildroot}%{_bindir}
install -p -m 0644 -D man/cblrpm.1 %{buildroot}%{_mandir}/man1/cblrpm.1 install -p -m 0644 -D man/cblrpm.1 %{buildroot}%{_mandir}/man1/cblrpm.1
install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man1/ install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man1/
@ -65,6 +68,13 @@ ln -s cblrpm-diff %{buildroot}%{_bindir}/%{name}-diff
%changelog %changelog
* Mon Mar 3 2014 Jens Petersen <petersen@redhat.com> - 0.8.10-1
- new diff command replaces cblrpm-diff script
- new missingdeps command
- should now work on RHEL 5 and 6: dropped use use of rpmspec
- add a temporary cblrpm-diff compat script
- refresh description
* Mon Feb 10 2014 Jens Petersen <petersen@redhat.com> - 0.8.9-1 * Mon Feb 10 2014 Jens Petersen <petersen@redhat.com> - 0.8.9-1
- bugfix for error handling dir with spec file - bugfix for error handling dir with spec file
- cblrpm-diff arg is now optional - cblrpm-diff arg is now optional

7
cblrpm-diff Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
echo "$0 is deprecated. Please use 'cblrpm diff' instead"
echo "This script will be removed in a future update."
echo
cblrpm diff $*

View File

@ -1 +1 @@
267a24d62ec5058b58f59b12a2b447f8 cabal-rpm-0.8.9.tar.gz b288331af0d7272469b9759d6f5dea70 cabal-rpm-0.8.10.tar.gz