Merge commit '9ea29cb' into epel7

This commit is contained in:
Jens Petersen 2016-11-16 12:18:37 +09:00
commit 1e46871090
1 changed files with 12 additions and 3 deletions

View File

@ -4,7 +4,7 @@
Name: %{pkg_name}
Version: 1.16
Release: 3%{?dist}
Release: 6%{?dist}
Summary: A liberalised C pre-processor for Haskell
License: GPL+ and LGPLv2+
@ -61,7 +61,7 @@ This package provides the Haskell %{name} library development files.
%install
%ghc_lib_install
rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENCE-LGPL
rm %{buildroot}%{_docdir}/%{name}*/LICENCE-LGPL
install -D -p -m 0644 docs/cpphs.1 %{buildroot}%{_mandir}/man1/%{name}.1
@ -88,8 +88,17 @@ install -D -p -m 0644 docs/cpphs.1 %{buildroot}%{_mandir}/man1/%{name}.1
%changelog
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Oct 25 2013 Jens Petersen <petersen@redhat.com> - 1.16-5
- replace ghc_docdir by _pkgdocdir
* Fri Jul 26 2013 Jens Petersen <petersen@redhat.com> - 1.16-4
- use ghc_docdir to handle F20 unversioned docdir
* Tue Jun 11 2013 Jens Petersen <petersen@redhat.com>
- update to new simplified Haskell Packaging Guidelines
- update to new approved simplified Haskell Packaging Guidelines
* Wed Apr 24 2013 Jens Petersen <petersen@redhat.com> - 1.16-2
- update to revised simplified Haskell Packaging Guidelines (cabal-rpm-0.8)