diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index ecab5b1..1199f24 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -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 - 1.2.14-1 +- fix warning in macros.ghc-extra about unused pkgnamever + * Sat Aug 16 2014 Fedora Release Engineering - 1.2.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/macros.ghc-extra b/macros.ghc-extra index 554c57d..ae9e87b 100644 --- a/macros.ghc-extra +++ b/macros.ghc-extra @@ -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\