From 7a5198b86befdaad91eb97320bd7d1ab81d5a813 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Wed, 20 Aug 2014 22:09:31 +0900
Subject: [PATCH] fix warning in macros.ghc-extra about unused %pkgnamever

---
 ghc-rpm-macros.spec | 7 +++++--
 macros.ghc-extra    | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index e1bbd3a..f2569e4 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.3.0
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
 License:        GPLv3+
@@ -80,6 +80,9 @@ install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
 
 
 %changelog
+* Wed Aug 20 2014 Jens Petersen <petersen@redhat.com> - 1.3.1-1
+- fix warning in macros.ghc-extra about unused pkgnamever
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-2
 - 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\