fix warning in macros.ghc-extra about unused pkgnamever

This commit is contained in:
Jens Petersen 2014-08-20 22:46:57 +09:00
parent 5a6a2084b4
commit 3e2085dbb6
2 changed files with 6 additions and 4 deletions

View File

@ -6,8 +6,8 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
Version: 1.2.13
Release: 3%{?dist}
Version: 1.2.14
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
License: GPLv3+
@ -95,6 +95,9 @@ EOF
%changelog
* Wed Aug 20 2014 Jens Petersen <petersen@redhat.com> - 1.2.14-1
- fix warning in macros.ghc-extra about unused pkgnamever
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

View File

@ -4,8 +4,7 @@
%ghc_lib_subpackage(c:l:x)\
%define pkgname %{?1}%{!?1:%{pkg_name}}\
%define pkgver %{?2}%{!?2:%{version}}\
%define pkgnamever %{pkgname}-%{pkgver}\
%{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgnamever}}}\
%{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgname}-%{pkgver}}}\
%define basepkg ghc-%{pkgname}\
%package -n %{basepkg}\
Summary: Haskell %{pkgname} library\