From 9d2513d7281ea1e993a97d46d60c09b8c68b03c65e391a35fb001fa3fc7cdb60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:11 +0000 Subject: [PATCH 1/3] 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 From e6f15b161094dc472ac95f24b24b72a49c1d87a0abd5b90f4a0c3fc5f695dbc7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:30 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-rpm-macros revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=103 --- 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, 9 insertions(+), 15 deletions(-) delete mode 100644 ghc-rpm-macros-1.9.90.tar.xz create 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 deleted file mode 100644 index e787c5f..0000000 --- a/ghc-rpm-macros-1.9.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..e8ba6ce --- /dev/null +++ b/ghc-rpm-macros-1.9.95.tar.xz @@ -0,0 +1,3 @@ +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 4bd0211..6cd81c9 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 03c2b87..94218a3 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -15,15 +15,11 @@ # 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.90 +Version: 1.9.95 Release: 0 Summary: RPM Macros for building packages for GHC License: GPL-3.0-or-later @@ -78,10 +74,6 @@ 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 @@ -97,9 +89,6 @@ install -d -D -m 0755 %{buildroot}%{_datadir}/licenses %{_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 From cda8ba727276954a7551cdbb7504954dada46899e8408711a1b497175e8717a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 10 May 2021 13:31:53 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-rpm-macros revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=104 --- ghc-rpm-macros.changes | 5 +++++ ghc-rpm-macros.spec | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 6cd81c9..751ca71 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 10 10:37:06 UTC 2021 - Ondřej Súkup + +- move macros from etc - boo#1185672 + ------------------------------------------------------------------- Thu May 7 07:48:19 UTC 2020 - Peter Simons diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 94218a3..d4dd76b 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -16,7 +16,6 @@ # -%global macros_dir %{_sysconfdir}/rpm %global without_hscolour 1 Name: ghc-rpm-macros Version: 1.9.95 @@ -63,9 +62,9 @@ Macros used when generating source Haskell rpm packages. echo no build stage needed %install -install -p -D -m 0644 macros.ghc %{buildroot}%{macros_dir}/macros.ghc -install -p -D -m 0644 macros.ghc-extra %{buildroot}/%{macros_dir}/macros.ghc-extra -install -p -D -m 0644 macros.ghc-suse %{buildroot}/%{macros_dir}/macros.ghc-suse +install -p -D -m 0644 macros.ghc %{buildroot}%{_rpmmacrodir}/macros.ghc +install -p -D -m 0644 macros.ghc-extra %{buildroot}/%{_rpmmacrodir}/macros.ghc-extra +install -p -D -m 0644 macros.ghc-suse %{buildroot}/%{_rpmmacrodir}/macros.ghc-suse install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 cabal-tweak-drop-dep %{buildroot}/%{_bindir}/cabal-tweak-drop-dep @@ -78,8 +77,8 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs %files %doc AUTHORS %license COPYING -%config %{macros_dir}/macros.ghc -%config %{macros_dir}/macros.ghc-suse +%{_rpmmacrodir}/macros.ghc +%{_rpmmacrodir}/macros.ghc-suse %{_prefix}/lib/rpm/ghc-deps.sh %{_bindir}/cabal-tweak-dep-ver %{_bindir}/cabal-tweak-flag @@ -91,6 +90,6 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs %{_datadir}/%{name}/Setup.hs %files extra -%config %{macros_dir}/macros.ghc-extra +%{_rpmmacrodir}/macros.ghc-extra %changelog