From 88482e4ba7e6723cbe6a70d7b9ec46e3801e41e8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 4 Feb 2011 14:59:02 +1000 Subject: [PATCH] ghc_binlib_package's -x option should not take an arg --- ghc-rpm-macros.ghc | 2 +- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 160b0af..b7770c1 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -96,7 +96,7 @@ Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}}-devel = %{?pkgver}%{!?p %{nil} # ghc_binlib_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] (-o deprecated no-op) [-x] [name] [version] -%ghc_binlib_package(c:h:l:o:x:)\ +%ghc_binlib_package(c:h:l:o:x)\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgver %{?2}%{!?2:%{version}}\ %define pkgnamever %{pkgname}-%{pkgver}\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 98b39b1..398f7b3 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.10.50 +Version: 0.10.51 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -42,6 +42,9 @@ install -p -m 0644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc %changelog +* Fri Feb 4 2011 Jens Petersen - 0.10.51-1 +- ghc_binlib_package's -x option does not take an arg + * Sat Jan 29 2011 Jens Petersen - 0.10.50-1 - merge subpackaging support from 0.11.4: - drop ghcdocdir and ghcpkgdir