From 9cba7b3e862e6e71da29444415108fd0e918f9611258e068f2af3ff822506c04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2016 08:23:53 +0000 Subject: [PATCH 1/5] Accepting request 432779 from devel:languages:haskell:lts:7 version / revision update OBS-URL: https://build.opensuse.org/request/show/432779 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-old-time?expand=0&rev=5 --- ghc-old-time.changes | 5 -- ghc-old-time.spec | 10 +--- 1.cabal => old-time.cabal | 120 +++++++++++++++++++------------------- 3 files changed, 62 insertions(+), 73 deletions(-) rename 1.cabal => old-time.cabal (95%) diff --git a/ghc-old-time.changes b/ghc-old-time.changes index 9efda50..db59266 100644 --- a/ghc-old-time.changes +++ b/ghc-old-time.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Jul 10 17:16:04 UTC 2016 - psimons@suse.com - -- Update to version 1.1.0.3 revision 1 with cabal2obs. - ------------------------------------------------------------------- Thu May 14 07:35:57 UTC 2015 - mimi.vx@gmail.com diff --git a/ghc-old-time.spec b/ghc-old-time.spec index a5b0ef1..7440201 100644 --- a/ghc-old-time.spec +++ b/ghc-old-time.spec @@ -22,16 +22,14 @@ Version: 1.1.0.3 Release: 0 Summary: Time library License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-old-locale-devel BuildRequires: ghc-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description This package provides the old time library. @@ -54,15 +52,12 @@ This package provides the Haskell %{pkg_name} library development files. %setup -q -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache @@ -75,6 +70,5 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc changelog.md %changelog diff --git a/1.cabal b/old-time.cabal similarity index 95% rename from 1.cabal rename to old-time.cabal index 367ef9d..9fc569c 100644 --- a/1.cabal +++ b/old-time.cabal @@ -1,60 +1,60 @@ -name: old-time -version: 1.1.0.3 -x-revision: 1 --- NOTE: Don't forget to update ./changelog.md -license: BSD3 -license-file: LICENSE -maintainer: libraries@haskell.org -bug-reports: https://github.com/haskell/old-time/issues -synopsis: Time library -category: System -build-type: Configure -cabal-Version: >=1.10 -description: - This package provides the old time library. - . - For new projects, the newer - - is recommended. - -extra-source-files: - aclocal.m4 - changelog.md - config.guess - config.sub - configure - configure.ac - include/HsTimeConfig.h.in - install-sh - old-time.buildinfo - -extra-tmp-files: - autom4te.cache - config.log - config.status - include/HsTimeConfig.h - -source-repository head - type: git - location: https://github.com/haskell/old-time.git - -Library - default-language: Haskell2010 - other-extensions: Trustworthy - - exposed-modules: - System.Time - - c-sources: - cbits/timeUtils.c - - include-dirs: include - includes: HsTime.h - install-includes: - HsTime.h - - build-depends: - base >= 4.7 && < 4.10, - old-locale == 1.0.* - - ghc-options: -Wall +name: old-time +version: 1.1.0.3 +x-revision: 1 +-- NOTE: Don't forget to update ./changelog.md +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +bug-reports: https://github.com/haskell/old-time/issues +synopsis: Time library +category: System +build-type: Configure +cabal-Version: >=1.10 +description: + This package provides the old time library. + . + For new projects, the newer + + is recommended. + +extra-source-files: + aclocal.m4 + changelog.md + config.guess + config.sub + configure + configure.ac + include/HsTimeConfig.h.in + install-sh + old-time.buildinfo + +extra-tmp-files: + autom4te.cache + config.log + config.status + include/HsTimeConfig.h + +source-repository head + type: git + location: https://github.com/haskell/old-time.git + +Library + default-language: Haskell2010 + other-extensions: Trustworthy + + exposed-modules: + System.Time + + c-sources: + cbits/timeUtils.c + + include-dirs: include + includes: HsTime.h + install-includes: + HsTime.h + + build-depends: + base >= 4.7 && < 4.10, + old-locale == 1.0.* + + ghc-options: -Wall From 57cdfba5bfad44dec2138d68914e4ab5d184d5165778b31086af68711514ee17 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2016 18:52:50 +0000 Subject: [PATCH 2/5] Use pristine copy of edited Cabal file from upstream. OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-old-time?expand=0&rev=6 --- old-time.cabal | 120 ++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/old-time.cabal b/old-time.cabal index 9fc569c..367ef9d 100644 --- a/old-time.cabal +++ b/old-time.cabal @@ -1,60 +1,60 @@ -name: old-time -version: 1.1.0.3 -x-revision: 1 --- NOTE: Don't forget to update ./changelog.md -license: BSD3 -license-file: LICENSE -maintainer: libraries@haskell.org -bug-reports: https://github.com/haskell/old-time/issues -synopsis: Time library -category: System -build-type: Configure -cabal-Version: >=1.10 -description: - This package provides the old time library. - . - For new projects, the newer - - is recommended. - -extra-source-files: - aclocal.m4 - changelog.md - config.guess - config.sub - configure - configure.ac - include/HsTimeConfig.h.in - install-sh - old-time.buildinfo - -extra-tmp-files: - autom4te.cache - config.log - config.status - include/HsTimeConfig.h - -source-repository head - type: git - location: https://github.com/haskell/old-time.git - -Library - default-language: Haskell2010 - other-extensions: Trustworthy - - exposed-modules: - System.Time - - c-sources: - cbits/timeUtils.c - - include-dirs: include - includes: HsTime.h - install-includes: - HsTime.h - - build-depends: - base >= 4.7 && < 4.10, - old-locale == 1.0.* - - ghc-options: -Wall +name: old-time +version: 1.1.0.3 +x-revision: 1 +-- NOTE: Don't forget to update ./changelog.md +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +bug-reports: https://github.com/haskell/old-time/issues +synopsis: Time library +category: System +build-type: Configure +cabal-Version: >=1.10 +description: + This package provides the old time library. + . + For new projects, the newer + + is recommended. + +extra-source-files: + aclocal.m4 + changelog.md + config.guess + config.sub + configure + configure.ac + include/HsTimeConfig.h.in + install-sh + old-time.buildinfo + +extra-tmp-files: + autom4te.cache + config.log + config.status + include/HsTimeConfig.h + +source-repository head + type: git + location: https://github.com/haskell/old-time.git + +Library + default-language: Haskell2010 + other-extensions: Trustworthy + + exposed-modules: + System.Time + + c-sources: + cbits/timeUtils.c + + include-dirs: include + includes: HsTime.h + install-includes: + HsTime.h + + build-depends: + base >= 4.7 && < 4.10, + old-locale == 1.0.* + + ghc-options: -Wall From bc937d5938800050057b29fa96eefabdcbb409410eed329fb858b55053a7a98e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2017 18:17:42 +0000 Subject: [PATCH 3/5] synchronize with lts-8 package sett from configuration 0cb270c8d22a0823ab5130d95cc499e186cf864e OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-old-time?expand=0&rev=7 --- ghc-old-time.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-old-time.spec b/ghc-old-time.spec index 7440201..08bae36 100644 --- a/ghc-old-time.spec +++ b/ghc-old-time.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-old-time # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 391ffe8be2034c11ba3103f8029c08c37f18adfc8cfaa14b9a443d6d2d6287cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Feb 2017 10:39:19 +0000 Subject: [PATCH 4/5] synchronize with lts-8 project from configuration b1f9faeb9ef431eed42de296b621d35661a39011 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-old-time?expand=0&rev=8 --- ghc-old-time.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-old-time.spec b/ghc-old-time.spec index 08bae36..c83721d 100644 --- a/ghc-old-time.spec +++ b/ghc-old-time.spec @@ -70,5 +70,6 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%doc changelog.md %changelog From 3c6a7f23ec7dfc1f25c1ad05fb22fde0d5c097d578f61741f76d05db92bb9fd4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 May 2017 11:40:43 +0000 Subject: [PATCH 5/5] synchronize with lts:8 at 27d82acd4aecec9d6ec7f65048ad62d72911ed17 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-old-time?expand=0&rev=9 --- ghc-old-time.changes | 10 ++++++++++ ghc-old-time.spec | 2 +- old-time.cabal | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ghc-old-time.changes b/ghc-old-time.changes index db59266..382b07f 100644 --- a/ghc-old-time.changes +++ b/ghc-old-time.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 18 09:52:23 UTC 2017 - psimons@suse.com + +- Update to version 1.1.0.3 revision 2 with cabal2obs. + +------------------------------------------------------------------- +Sun Jul 10 17:16:04 UTC 2016 - psimons@suse.com + +- Update to version 1.1.0.3 revision 1 with cabal2obs. + ------------------------------------------------------------------- Thu May 14 07:35:57 UTC 2015 - mimi.vx@gmail.com diff --git a/ghc-old-time.spec b/ghc-old-time.spec index c83721d..406d9ba 100644 --- a/ghc-old-time.spec +++ b/ghc-old-time.spec @@ -25,7 +25,7 @@ License: BSD-3-Clause Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-rpm-macros diff --git a/old-time.cabal b/old-time.cabal index 367ef9d..c447c09 100644 --- a/old-time.cabal +++ b/old-time.cabal @@ -1,6 +1,6 @@ name: old-time version: 1.1.0.3 -x-revision: 1 +x-revision: 2 -- NOTE: Don't forget to update ./changelog.md license: BSD3 license-file: LICENSE @@ -54,7 +54,7 @@ Library HsTime.h build-depends: - base >= 4.7 && < 4.10, + base >= 4.7 && < 5, old-locale == 1.0.* ghc-options: -Wall