Hello community, here is the log from the commit of package ghc-zlib for openSUSE:Factory checked in at 2013-08-01 15:35:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-zlib (Old) and /work/SRC/openSUSE:Factory/.ghc-zlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-zlib" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-zlib/ghc-zlib.changes 2013-01-01 12:00:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-zlib.new/ghc-zlib.changes 2013-08-01 15:35:11.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 6 10:45:21 UTC 2013 - [email protected] + +- update to 0.5.4.1 +* no changelog +- part of Haskell Platform 2013.2 update +- more transparent packaging (fewer macros) + +------------------------------------------------------------------- Old: ---- zlib-0.5.4.0.tar.gz New: ---- zlib-0.5.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-zlib.spec ++++++ --- /var/tmp/diff_new_pack.0hI1h1/_old 2013-08-01 15:35:11.000000000 +0200 +++ /var/tmp/diff_new_pack.0hI1h1/_new 2013-08-01 15:35:11.000000000 +0200 @@ -1,8 +1,7 @@ # -# spec file for ghc-zlib +# spec file for package ghc-zlib # - -# Copyright (c) 2012 Peter Trommler [email protected] +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name zlib %global common_summary Haskell gzip and zlib formats library @@ -23,50 +23,59 @@ %global common_description This package provides a pure interface for compressing and decompressing streams of data represented as lazy ByteStrings. It uses the zlib C library so it has high performance. It supports the "zlib", "gzip" and "raw" compression formats. Name: ghc-zlib -Version: 0.5.4.0 -Release: 1 +Version: 0.5.4.1 +Release: 0 Summary: %{common_summary} - -Group: System/Libraries License: BSD-2-Clause +Group: System/Libraries + BuildRoot: %{_tmppath}/%{name}-%{version}-build # BEGIN cabal2spec -URL: http://hackage.haskell.org/package/%{pkg_name} +Url: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ix86} x86_64 %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-rpm-macros BuildRequires: zlib-devel # END cabal2spec %description %{common_description} +%package devel +Summary: Haskell %{pkg_name} library development files +Group: Development/Languages/Other +Requires: ghc-compiler +Requires: zlib-devel +Requires(post): ghc-compiler +Requires(postun): ghc-compiler +Requires: %{name} = %{version}-%{release} + +%description devel +%{common_description} +This package contains the development files. %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install +%post devel +%ghc_pkg_recache -# devel subpackage -%ghc_devel_package -Requires: zlib-devel - -%ghc_devel_description - - -%ghc_devel_post_postun - +%postun devel +%ghc_pkg_recache -%ghc_files LICENSE +%files -f %{name}.files +%defattr(-,root,root,-) +%doc LICENSE +%files devel -f %{name}-devel.files +%defattr(-,root,root,-) %changelog ++++++ zlib-0.5.4.0.tar.gz -> zlib-0.5.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zlib-0.5.4.0/Codec/Compression/Zlib/Internal.hs new/zlib-0.5.4.1/Codec/Compression/Zlib/Internal.hs --- old/zlib-0.5.4.0/Codec/Compression/Zlib/Internal.hs 2012-09-13 00:08:06.000000000 +0200 +++ new/zlib-0.5.4.1/Codec/Compression/Zlib/Internal.hs 2013-02-28 21:28:29.000000000 +0100 @@ -420,7 +420,15 @@ return $ StreamChunk (S.PS outFPtr offset length) outChunks else do fillBuffers defaultDecompressBufferSize inChunks - Stream.StreamEnd -> finish StreamEnd + Stream.StreamEnd -> inChunks `seq` finish StreamEnd + -- The decompressor tells us we're done, but that doesn't mean we have + -- consumed all the input (there could be trailing data). But more + -- subtle than that, the decompressor will actually never demand the + -- tail of the input (in the usual case where it's empty) because + -- the zlib and gzip formats know their own length. So we force the + -- tail of the input here because this can be important for closing + -- file handles etc. + Stream.Error code msg -> case code of Stream.BufferError -> finish (StreamError TruncatedInput msg') where msg' = "premature end of compressed stream" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zlib-0.5.4.0/zlib.cabal new/zlib-0.5.4.1/zlib.cabal --- old/zlib-0.5.4.0/zlib.cabal 2012-09-13 00:08:06.000000000 +0200 +++ new/zlib-0.5.4.1/zlib.cabal 2013-02-28 21:28:29.000000000 +0100 @@ -1,5 +1,5 @@ name: zlib -version: 0.5.4.0 +version: 0.5.4.1 copyright: (c) 2006-2012 Duncan Coutts license: BSD3 license-file: LICENSE -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
