From 22715fbfdfccb3a3ddd6cc60fb2d7225b6999ddb44c97482859eedc8dfd0642a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 18 Jul 2016 20:19:38 +0000 Subject: [PATCH] Accepting request 410326 from devel:languages:haskell:lts:6 See https://lists.opensuse.org/opensuse-haskell/2016-07/msg00000.html for details. OBS-URL: https://build.opensuse.org/request/show/410326 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-old-time?expand=0&rev=3 --- 1.cabal | 60 ++++++++++++++++++++++++++++++++++++++++++++ ghc-old-time.changes | 5 ++++ ghc-old-time.spec | 25 ++++++++---------- 3 files changed, 75 insertions(+), 15 deletions(-) create mode 100644 1.cabal diff --git a/1.cabal b/1.cabal new file mode 100644 index 0000000..367ef9d --- /dev/null +++ b/1.cabal @@ -0,0 +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 diff --git a/ghc-old-time.changes b/ghc-old-time.changes index db59266..9efda50 100644 --- a/ghc-old-time.changes +++ b/ghc-old-time.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 53c6ade..a5b0ef1 100644 --- a/ghc-old-time.spec +++ b/ghc-old-time.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-old-time # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,23 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global pkg_name old-time -Name: ghc-old-time +%global pkg_name old-time +Name: ghc-%{pkg_name} Version: 1.1.0.3 Release: 0 Summary: Time library -Group: System/Libraries - License: BSD-3-Clause +Group: System/Libraries Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-rpm-macros +BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description @@ -40,21 +39,20 @@ This package provides the old time library. For new projects, the newer is recommended. - %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other +Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. - %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build @@ -68,18 +66,15 @@ This package provides the Haskell %{pkg_name} library development files. %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE - %files devel -f %{name}-devel.files %defattr(-,root,root,-) - +%doc changelog.md %changelog