From f3be8b6bc27e08e26d009a2e990666dbd60e240c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 15 Nov 2017 16:25:00 +0900 Subject: [PATCH] rename macros.ghc-fedora to macros.ghc-os --- ghc-rpm-macros.spec | 11 +++++++---- macros.ghc-fedora => macros.ghc-os | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) rename macros.ghc-fedora => macros.ghc-os (70%) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 6717828..2babfa6 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@ Name: ghc-rpm-macros Version: 1.6.50 -Release: 7%{?dist} +Release: 8%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -26,7 +26,7 @@ Source5: cabal-tweak-flag Source6: macros.ghc-extra Source7: ghc.attr Source8: ghc-pkg-wrapper -Source9: macros.ghc-fedora +Source9: macros.ghc-os Source11: cabal-tweak-drop-dep Requires: redhat-rpm-config # for ghc_version @@ -115,7 +115,7 @@ echo no build stage needed %install install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc install -p -D -m 0644 %{SOURCE6} %{buildroot}/%{macros_dir}/macros.ghc-extra -install -p -D -m 0644 %{SOURCE9} %{buildroot}/%{macros_dir}/macros.ghc-fedora +install -p -D -m 0644 %{SOURCE9} %{buildroot}/%{macros_dir}/macros.ghc-os install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh @@ -140,7 +140,7 @@ EOF %license COPYING %doc AUTHORS %{macros_dir}/macros.ghc -%{macros_dir}/macros.ghc-fedora +%{macros_dir}/macros.ghc-os %if 0%{?fedora} || 0%{?rhel} >= 7 %{_prefix}/lib/rpm/fileattrs/ghc.attr %endif @@ -161,6 +161,9 @@ EOF %changelog +* Wed Nov 15 2017 Jens Petersen - 1.6.50-8 +- rename macros.ghc-fedora to macros.ghc-os + * Wed Nov 15 2017 Jens Petersen - 1.6.50-7 - use shell variable instead of macro to carry licensedir version diff --git a/macros.ghc-fedora b/macros.ghc-os similarity index 70% rename from macros.ghc-fedora rename to macros.ghc-os index fbb087b..9caaf2c 100644 --- a/macros.ghc-fedora +++ b/macros.ghc-os @@ -1,4 +1,4 @@ -# Fedora specific settings +# OS specific settings %_ghcdocdir %{_ghclicensedir}/%{name}