From be2e133fe19ef48b8f85c9cc39238aa15c8900b7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 Jun 2014 10:34:10 +0900 Subject: [PATCH] add URL, GPLv2+, and %ghc_arches for backwards compatibility --- ghc-srpm-macros.spec | 10 ++++++++-- macros.ghc-srpm | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-srpm-macros.spec b/ghc-srpm-macros.spec index b8d8631..e7b948a 100644 --- a/ghc-srpm-macros.spec +++ b/ghc-srpm-macros.spec @@ -5,10 +5,11 @@ Name: ghc-srpm-macros Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM macros for building Haskell source packages -License: GPLv3+ +License: GPLv2+ +Url: http://pkgs.fedoraproject.org/cgit/ghc-srpm-macros.git BuildArch: noarch Source0: macros.ghc-srpm @@ -34,5 +35,10 @@ install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc-srpm %changelog +* Fri Jun 27 2014 Jens Petersen - 1.3-2 +- add pkg git as URL (#1093541) +- downgrade license tag to GPLv2+ in line with rpm (redhat-rpm-config is GPL+) +- sync with current ghc-rpm-macros: add ghc_arches for backwards compatibility + * Fri May 2 2014 Jens Petersen - 1.3-1 - separate from ghc-rpm-macros diff --git a/macros.ghc-srpm b/macros.ghc-srpm index e79f0cc..6ca954f 100644 --- a/macros.ghc-srpm +++ b/macros.ghc-srpm @@ -2,3 +2,7 @@ # ghci is currently only supported on the following archs %ghc_arches_with_ghci %{ix86} x86_64 ppc sparcv9 armv7hl armv5tel + +# ghc_arches is not used in current packages but still here for back compat +# old archs: alpha sparcv9 +%ghc_arches %{ix86} x86_64 ppc ppc64 ppc64le armv7hl armv5tel aarch64 s390 s390x