From 16f613158b6d90e8c7d6512b3108cb08cb1ff6e86e7fa687c348f961b8ab2fed Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Mon, 4 May 2015 19:00:03 +0000 Subject: [PATCH] Accepting request 304909 from devel:languages:haskell:lts - change libyaml deps from pkgconfig to direct libyaml-devel for SLE12 support - update to 0.8.11 * Function to print prettier parse exceptions [#59](https://github.com/snoyberg/yaml/pull/59) OBS-URL: https://build.opensuse.org/request/show/304909 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-yaml?expand=0&rev=7 --- _service | 3 --- ghc-yaml.changes | 11 +++++++++++ ghc-yaml.spec | 15 ++++++--------- yaml-0.8.10.1.tar.gz | 3 --- yaml-0.8.11.tar.gz | 3 +++ 5 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 _service delete mode 100644 yaml-0.8.10.1.tar.gz create mode 100644 yaml-0.8.11.tar.gz diff --git a/_service b/_service deleted file mode 100644 index 76e23bd..0000000 --- a/_service +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ghc-yaml.changes b/ghc-yaml.changes index 2849f8c..1ad7775 100644 --- a/ghc-yaml.changes +++ b/ghc-yaml.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Apr 28 10:44:08 UTC 2015 - mimi.vx@gmail.com + +- change libyaml deps from pkgconfig to direct libyaml-devel for SLE12 support + +------------------------------------------------------------------- +Mon Apr 27 08:33:55 UTC 2015 - mimi.vx@gmail.com + +- update to 0.8.11 +* Function to print prettier parse exceptions [#59](https://github.com/snoyberg/yaml/pull/59) + ------------------------------------------------------------------- Wed Feb 25 08:18:36 UTC 2015 - mpluskal@suse.com diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 6c3fb9a..90dc1ec 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -17,19 +17,17 @@ %global pkg_name yaml - Name: ghc-%{pkg_name} -Version: 0.8.10.1 +Version: 0.8.11 Release: 0 Summary: Support for parsing and rendering YAML documents License: BSD-3-Clause Group: System/Libraries Url: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +# End cabal-rpm deps +BuildRequires: chrpath BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel @@ -38,16 +36,14 @@ BuildRequires: ghc-conduit-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-enclosed-exceptions-devel BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel -# End cabal-rpm deps -BuildRequires: chrpath BuildRequires: libyaml-devel -BuildRequires: pkg-config - +BuildRequires: pkgconfig(pkg-config) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,6 +69,7 @@ This package provides the Haskell yaml library development files. %setup -q -n %{pkg_name}-%{version} %build + %define cabal_configure_options -f system-libyaml %ghc_lib_build diff --git a/yaml-0.8.10.1.tar.gz b/yaml-0.8.10.1.tar.gz deleted file mode 100644 index 4689c02..0000000 --- a/yaml-0.8.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e977912762e13571ec596173405ce328c8f7397aee4dd21f61ac9af762431ba9 -size 73448 diff --git a/yaml-0.8.11.tar.gz b/yaml-0.8.11.tar.gz new file mode 100644 index 0000000..b907ff4 --- /dev/null +++ b/yaml-0.8.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b9c70c1cd01f0d232b594703e940268575d5656194533c8b46f28c64d5259a1 +size 73566