From 9b8cc15b77ade5d6a22d73caeb87605067682346f149789b329fe6dcbe4e5c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= <mimi.vx@gmail.com>
Date: Mon, 18 Jul 2016 12:28:34 +0000
Subject: [PATCH] Accepting request 411088 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/411088
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=18
---
 3.cabal          | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
 _service         |  3 --
 ghc-zlib.changes |  5 +++
 ghc-zlib.spec    | 35 ++++++++-----------
 4 files changed, 106 insertions(+), 24 deletions(-)
 create mode 100644 3.cabal
 delete mode 100644 _service

diff --git a/3.cabal b/3.cabal
new file mode 100644
index 0000000..2e81bea
--- /dev/null
+++ b/3.cabal
@@ -0,0 +1,87 @@
+name:            zlib
+version:         0.6.1.1
+x-revision: 3
+copyright:       (c) 2006-2015 Duncan Coutts
+license:         BSD3
+license-file:    LICENSE
+author:          Duncan Coutts <duncan@community.haskell.org>
+maintainer:      Duncan Coutts <duncan@community.haskell.org>
+bug-reports:     https://github.com/haskell/zlib/issues
+category:        Codec
+synopsis:        Compression and decompression in the gzip and zlib formats
+description:     This package provides a pure interface for compressing and 
+                 decompressing streams of data represented as lazy 
+                 'ByteString's. It uses the zlib C library so it has high
+                 performance. It supports the \"zlib\", \"gzip\" and \"raw\"
+                 compression formats.
+                 .
+                 It provides a convenient high level API suitable for most
+                 tasks and for the few cases where more control is needed it
+                 provides access to the full zlib feature set.
+build-type:      Simple
+cabal-version:   >= 1.10
+extra-source-files: changelog
+                    -- zlib C sources (for Windows)
+                    cbits/crc32.h cbits/inffast.h cbits/inflate.h
+                    cbits/trees.h cbits/deflate.h cbits/inffixed.h
+                    cbits/inftrees.h cbits/zutil.h cbits/gzguts.h
+                    -- test data files
+                    test/data/bad-crc.gz test/data/custom-dict.zlib
+                    test/data/custom-dict.zlib-dict test/data/hello.gz
+                    test/data/not-gzip test/data/two-files.gz
+                    -- demo programs:
+                    examples/gzip.hs examples/gunzip.hs
+
+source-repository head
+  type: git
+  location: https://github.com/haskell/zlib.git
+
+library
+  exposed-modules: Codec.Compression.GZip,
+                   Codec.Compression.Zlib,
+                   Codec.Compression.Zlib.Raw,
+                   Codec.Compression.Zlib.Internal
+  other-modules:   Codec.Compression.Zlib.Stream
+  if impl(ghc < 7)
+    default-language: Haskell98
+    default-extensions: PatternGuards
+  else
+    default-language: Haskell2010
+  other-extensions: CPP, ForeignFunctionInterface, RankNTypes, BangPatterns,
+                    DeriveDataTypeable
+  if impl(ghc >= 7.2)
+    other-extensions: DeriveGeneric
+  build-depends:   base >= 4 && < 5,
+                   bytestring >= 0.9 && < 0.12
+  if impl(ghc >= 7.2 && < 7.6)
+    build-depends: ghc-prim
+  includes:        zlib.h
+  ghc-options:     -Wall -fwarn-tabs
+  if !os(windows)
+    -- Normally we use the the standard system zlib:
+    extra-libraries: z
+  else
+    -- However for the benefit of users of Windows (which does not have zlib
+    -- by default) we bundle a complete copy of the C sources of zlib-1.2.8
+    c-sources:     cbits/adler32.c cbits/compress.c cbits/crc32.c
+                   cbits/deflate.c cbits/infback.c
+                   cbits/inffast.c cbits/inflate.c cbits/inftrees.c
+                   cbits/trees.c cbits/uncompr.c cbits/zutil.c
+    include-dirs:  cbits
+    install-includes: zlib.h zconf.h
+
+test-suite tests
+  type: exitcode-stdio-1.0
+  main-is:         Test.hs
+  other-modules:   Utils,
+                   Test.Codec.Compression.Zlib.Internal,
+                   Test.Codec.Compression.Zlib.Stream
+  hs-source-dirs:  test
+  default-language: Haskell2010
+  build-depends:   base, bytestring, zlib,
+                   QuickCheck       == 2.*,
+                   HUnit            >= 1.2 && <1.4,
+                   tasty            >= 0.8 && < 0.12,
+                   tasty-quickcheck == 0.8.*,
+                   tasty-hunit      >= 0.8 && < 0.9
+  ghc-options:     -Wall
diff --git a/_service b/_service
deleted file mode 100644
index a07f79b..0000000
--- a/_service
+++ /dev/null
@@ -1,3 +0,0 @@
-<services>
-  
-<service name="download_files" mode="localonly"/></services>
diff --git a/ghc-zlib.changes b/ghc-zlib.changes
index 73d1fdb..db3d9f0 100644
--- a/ghc-zlib.changes
+++ b/ghc-zlib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jul 10 17:32:48 UTC 2016 - psimons@suse.com
+
+- Update to version 0.6.1.1 revision 3 with cabal2obs.
+
 -------------------------------------------------------------------
 Wed Dec 30 11:25:25 UTC 2015 - mimi.vx@gmail.com
 
diff --git a/ghc-zlib.spec b/ghc-zlib.spec
index 095ed1d..ae02f5b 100644
--- a/ghc-zlib.spec
+++ b/ghc-zlib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-zlib
 #
-# 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,26 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %global pkg_name zlib
-
 %bcond_with tests
-
-Name:           ghc-zlib
+Name:           ghc-%{pkg_name}
 Version:        0.6.1.1
-Release:        0 
+Release:        0
 Summary:        Compression and decompression in the gzip and zlib formats
-Group:          System/Libraries
-
 License:        BSD-2-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/3.cabal
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-rpm-macros
 BuildRequires:  zlib-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with tests}
 BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-QuickCheck-devel
@@ -54,24 +52,23 @@ It provides a convenient high level API suitable for most tasks and for the few
 cases where more control is needed it provides access to the full zlib feature
 set.
 
-
 %package devel
 Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries/Other
-Requires:       ghc-compiler = %{ghc_version}
-Requires(post): ghc-compiler = %{ghc_version}
-Requires(postun): ghc-compiler = %{ghc_version}
 Requires:       %{name} = %{version}-%{release}
+Requires:       ghc-compiler = %{ghc_version}
 # Begin cabal-rpm deps:
 Requires:       zlib-devel
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
 # End cabal-rpm deps
 
 %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
@@ -84,26 +81,22 @@ This package provides the Haskell %{pkg_name} library development files.
 
 %check
 %if %{with tests}
-%cabal test
+%{cabal} test
 %endif
 
 
 %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 examples
-
+%doc changelog examples
 
 %changelog