From f689dd1a8bd0d5b469cd55299a46e67962dee369638c672837d989e3f51f026a Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Wed, 12 Jul 2017 18:20:29 +0000 Subject: [PATCH 1/4] Accepting request 509815 from home:bmwiedemann:branches:devel:languages:haskell Add _service file to allow for easy updates with osc service dr OBS-URL: https://build.opensuse.org/request/show/509815 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=76 --- _service | 14 ++++++++++++++ ghc-rpm-macros-1.7.1.obscpio | 3 +++ ghc-rpm-macros-1.7.1.tar.xz | 3 --- ghc-rpm-macros.changes | 5 +++++ ghc-rpm-macros.obsinfo | 5 +++++ ghc-rpm-macros.spec | 2 +- 6 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 _service create mode 100644 ghc-rpm-macros-1.7.1.obscpio delete mode 100644 ghc-rpm-macros-1.7.1.tar.xz create mode 100644 ghc-rpm-macros.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..afcd187 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + https://github.com/opensuse-haskell/ghc-rpm-macros.git + git + current-opensuse + 1.7.1 + + + + + *.tar + xz + + diff --git a/ghc-rpm-macros-1.7.1.obscpio b/ghc-rpm-macros-1.7.1.obscpio new file mode 100644 index 0000000..ff4d856 --- /dev/null +++ b/ghc-rpm-macros-1.7.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5b523a164dec76a6b5a4e0da5f6d560c1d1d83ad03e379fb7cf34cb8202c44f +size 91147 diff --git a/ghc-rpm-macros-1.7.1.tar.xz b/ghc-rpm-macros-1.7.1.tar.xz deleted file mode 100644 index 595d6d9..0000000 --- a/ghc-rpm-macros-1.7.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1010fa54fa90c12efe77dbd895617a4db34be083e687d799988750a6026edd7 -size 17096 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index e4fbd84..362b4eb 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 12 15:56:49 UTC 2017 - bwiedemann@suse.com + +- Add _service file to allow for easy updates with osc service dr + ------------------------------------------------------------------- Mon May 29 06:43:58 UTC 2017 - mimi.vx@gmail.com diff --git a/ghc-rpm-macros.obsinfo b/ghc-rpm-macros.obsinfo new file mode 100644 index 0000000..2becee1 --- /dev/null +++ b/ghc-rpm-macros.obsinfo @@ -0,0 +1,5 @@ +name: ghc-rpm-macros +version: 1.7.1 +mtime: 1495975719 +commit: 393301c7fc6d5fac70caaee57d18b7cf1835d7f6 + diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 186ce05..f803342 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -25,7 +25,7 @@ Summary: RPM Macros for building packages for GHC License: GPL-3.0+ Group: Development/Libraries/Other Url: https://fedoraproject.org/wiki/Haskell_SIG -# source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros +# source gets updated with osc service dr Source0: %{name}-%{version}.tar.xz BuildRequires: xz Requires: rpm From b20136c38fb0e442768059e6616fa5454edaa42257155bee9e732ef5a49c9be8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Jul 2017 02:11:04 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:lts:8 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=77 --- _service | 14 -------------- ghc-rpm-macros-1.7.1.obscpio | 3 --- ghc-rpm-macros-1.7.1.tar.xz | 3 +++ ghc-rpm-macros.changes | 5 ----- ghc-rpm-macros.obsinfo | 5 ----- ghc-rpm-macros.spec | 2 +- 6 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 _service delete mode 100644 ghc-rpm-macros-1.7.1.obscpio create mode 100644 ghc-rpm-macros-1.7.1.tar.xz delete mode 100644 ghc-rpm-macros.obsinfo diff --git a/_service b/_service deleted file mode 100644 index afcd187..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - https://github.com/opensuse-haskell/ghc-rpm-macros.git - git - current-opensuse - 1.7.1 - - - - - *.tar - xz - - diff --git a/ghc-rpm-macros-1.7.1.obscpio b/ghc-rpm-macros-1.7.1.obscpio deleted file mode 100644 index ff4d856..0000000 --- a/ghc-rpm-macros-1.7.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5b523a164dec76a6b5a4e0da5f6d560c1d1d83ad03e379fb7cf34cb8202c44f -size 91147 diff --git a/ghc-rpm-macros-1.7.1.tar.xz b/ghc-rpm-macros-1.7.1.tar.xz new file mode 100644 index 0000000..595d6d9 --- /dev/null +++ b/ghc-rpm-macros-1.7.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1010fa54fa90c12efe77dbd895617a4db34be083e687d799988750a6026edd7 +size 17096 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 362b4eb..e4fbd84 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Jul 12 15:56:49 UTC 2017 - bwiedemann@suse.com - -- Add _service file to allow for easy updates with osc service dr - ------------------------------------------------------------------- Mon May 29 06:43:58 UTC 2017 - mimi.vx@gmail.com diff --git a/ghc-rpm-macros.obsinfo b/ghc-rpm-macros.obsinfo deleted file mode 100644 index 2becee1..0000000 --- a/ghc-rpm-macros.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: ghc-rpm-macros -version: 1.7.1 -mtime: 1495975719 -commit: 393301c7fc6d5fac70caaee57d18b7cf1835d7f6 - diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index f803342..186ce05 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -25,7 +25,7 @@ Summary: RPM Macros for building packages for GHC License: GPL-3.0+ Group: Development/Libraries/Other Url: https://fedoraproject.org/wiki/Haskell_SIG -# source gets updated with osc service dr +# source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros Source0: %{name}-%{version}.tar.xz BuildRequires: xz Requires: rpm From ffca8aca7f8eaf0ddc9c57a50d7c6565eeb6dba2d2c1fc98bad7bf9af8ab6ae7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 Jul 2017 12:56:12 +0000 Subject: [PATCH 3/4] apply https://build.opensuse.org/request/show/509815 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=78 --- _service | 14 ++++++++++++++ ghc-rpm-macros.changes | 5 +++++ ghc-rpm-macros.spec | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 _service diff --git a/_service b/_service new file mode 100644 index 0000000..afcd187 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + https://github.com/opensuse-haskell/ghc-rpm-macros.git + git + current-opensuse + 1.7.1 + + + + + *.tar + xz + + diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index e4fbd84..362b4eb 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 12 15:56:49 UTC 2017 - bwiedemann@suse.com + +- Add _service file to allow for easy updates with osc service dr + ------------------------------------------------------------------- Mon May 29 06:43:58 UTC 2017 - mimi.vx@gmail.com diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 186ce05..f803342 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -25,7 +25,7 @@ Summary: RPM Macros for building packages for GHC License: GPL-3.0+ Group: Development/Libraries/Other Url: https://fedoraproject.org/wiki/Haskell_SIG -# source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros +# source gets updated with osc service dr Source0: %{name}-%{version}.tar.xz BuildRequires: xz Requires: rpm From 76731637a7daeaeeed1019ef545271aa32ea0db63d496bc92ee5e733e2d74282 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Jul 2017 02:10:24 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:lts:8 package:ghc-rpm-macros revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=79 --- _service | 14 -------------- ghc-rpm-macros-1.7.1.tar.xz | 3 --- ghc-rpm-macros-1.7.2.tar.xz | 3 +++ ghc-rpm-macros.changes | 6 ++++-- ghc-rpm-macros.spec | 2 +- 5 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 _service delete mode 100644 ghc-rpm-macros-1.7.1.tar.xz create mode 100644 ghc-rpm-macros-1.7.2.tar.xz diff --git a/_service b/_service deleted file mode 100644 index afcd187..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - https://github.com/opensuse-haskell/ghc-rpm-macros.git - git - current-opensuse - 1.7.1 - - - - - *.tar - xz - - diff --git a/ghc-rpm-macros-1.7.1.tar.xz b/ghc-rpm-macros-1.7.1.tar.xz deleted file mode 100644 index 595d6d9..0000000 --- a/ghc-rpm-macros-1.7.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1010fa54fa90c12efe77dbd895617a4db34be083e687d799988750a6026edd7 -size 17096 diff --git a/ghc-rpm-macros-1.7.2.tar.xz b/ghc-rpm-macros-1.7.2.tar.xz new file mode 100644 index 0000000..8f56b9d --- /dev/null +++ b/ghc-rpm-macros-1.7.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1b0b857799c9d949758891bd4254dec7ed1ed075db1c73b5cdeb84ed0b20d3c +size 17140 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 362b4eb..d092184 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Wed Jul 12 15:56:49 UTC 2017 - bwiedemann@suse.com +Fri Jul 14 14:23:54 UTC 2017 - mimi.vx@gmail.com -- Add _service file to allow for easy updates with osc service dr +- update to 1.7.2 +- disabled smp build -- it brokes reproduciblity of haskell packages + * reported by bwiedemann@suse.com ------------------------------------------------------------------- Mon May 29 06:43:58 UTC 2017 - mimi.vx@gmail.com diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index f803342..bc55a12 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -19,7 +19,7 @@ %global macros_dir %{_sysconfdir}/rpm %global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: RPM Macros for building packages for GHC License: GPL-3.0+