From 9d2513d7281ea1e993a97d46d60c09b8c68b03c65e391a35fb001fa3fc7cdb60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:11 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-rpm-macros revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=102 --- ghc-rpm-macros-1.9.90.tar.xz | 3 +++ ghc-rpm-macros-1.9.95.tar.xz | 3 --- ghc-rpm-macros.changes | 5 ----- ghc-rpm-macros.spec | 13 ++++++++++++- 4 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 ghc-rpm-macros-1.9.90.tar.xz delete mode 100644 ghc-rpm-macros-1.9.95.tar.xz diff --git a/ghc-rpm-macros-1.9.90.tar.xz b/ghc-rpm-macros-1.9.90.tar.xz new file mode 100644 index 0000000..e787c5f --- /dev/null +++ b/ghc-rpm-macros-1.9.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d11b99299138dba57016436fcfaf9ff4a109bbe410bbe90e961be92738c57f36 +size 17200 diff --git a/ghc-rpm-macros-1.9.95.tar.xz b/ghc-rpm-macros-1.9.95.tar.xz deleted file mode 100644 index e8ba6ce..0000000 --- a/ghc-rpm-macros-1.9.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fd87d2f80e6f6f642cb853e418892190850855f81193e0b138bcea477f73ae3 -size 17088 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 6cd81c9..4bd0211 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu May 7 07:48:19 UTC 2020 - Peter Simons - -- Update to version 1.9.95. - ------------------------------------------------------------------- Mon Dec 30 20:05:43 UTC 2019 - Ondřej Súkup diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 94218a3..03c2b87 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -15,11 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} <= 1320 +%global license doc +%endif + %global macros_dir %{_sysconfdir}/rpm %global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.9.95 +Version: 1.9.90 Release: 0 Summary: RPM Macros for building packages for GHC License: GPL-3.0-or-later @@ -74,6 +78,10 @@ install -p -D -m 0755 ghc-pkg-wrapper %{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wr install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs +%if 0%{?suse_version} <= 1320 +install -d -D -m 0755 %{buildroot}%{_datadir}/licenses +%endif + %files %doc AUTHORS @@ -89,6 +97,9 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs %{_prefix}/lib/rpm/ghc-dirs.sh %dir %{_datadir}/%{name} %{_datadir}/%{name}/Setup.hs +%if 0%{?suse_version} <= 1320 +%dir %{_datadir}/licenses +%endif %files extra %config %{macros_dir}/macros.ghc-extra