From b683afa2b13fa15ae93bc3cefa3a8c235fc985f0b8e395ada20522bf7b0dfa10 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Wed, 6 Jun 2012 18:04:17 +0000 Subject: [PATCH] Accepting request 123931 from home:ptrommler:haskell-platform Haskell Platform 2012.2.0.0 update OBS-URL: https://build.opensuse.org/request/show/123931 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=4 --- _service | 2 +- _service:download_files:zlib-0.5.3.3.tar.gz | 3 + _service:download_url:zlib-0.5.3.1.tar.gz | 3 - ghc-zlib.changes | 6 ++ ghc-zlib.spec | 76 ++++++--------------- 5 files changed, 32 insertions(+), 58 deletions(-) create mode 100644 _service:download_files:zlib-0.5.3.3.tar.gz delete mode 100644 _service:download_url:zlib-0.5.3.1.tar.gz diff --git a/_service b/_service index e294c3d..76828d7 100644 --- a/_service +++ b/_service @@ -1,3 +1,3 @@ - /packages/archive/zlib/0.5.3.1/zlib-0.5.3.1.tar.gzhackage.haskell.org + \ No newline at end of file diff --git a/_service:download_files:zlib-0.5.3.3.tar.gz b/_service:download_files:zlib-0.5.3.3.tar.gz new file mode 100644 index 0000000..41b557d --- /dev/null +++ b/_service:download_files:zlib-0.5.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2adb6c55f5bc69eb1e931edcb2ef392ac96139cf6b6bca1b2a7229f381938c3 +size 125636 diff --git a/_service:download_url:zlib-0.5.3.1.tar.gz b/_service:download_url:zlib-0.5.3.1.tar.gz deleted file mode 100644 index 04aec7e..0000000 --- a/_service:download_url:zlib-0.5.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:382a16d09d47ba9c742d552b80cf3902c81556fc69a8d6983af98b47263545c2 -size 125087 diff --git a/ghc-zlib.changes b/ghc-zlib.changes index d6112f9..becf92a 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 4 06:51:40 UTC 2012 - peter.trommler@ohm-hochschule.de + +- update to 0.5.3.3 from upstream (no changelog) +- required by Haskell Platform 2012.2.0.0 + ------------------------------------------------------------------- Thu Feb 23 13:42:43 UTC 2012 - peter.trommler@ohm-hochschule.de diff --git a/ghc-zlib.spec b/ghc-zlib.spec index e428386..107c5f8 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,6 +1,6 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell +# +# spec file for ghc-zlib +# # Copyright (c) 2012 Peter Trommler peter.trommler@ohm-hochschule.de # @@ -16,68 +16,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# cabal2spec-0.25 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name zlib -# common part of summary for all the subpackages -%global common_summary Haskell %{pkg_name} library +%global common_summary Haskell gzip and zlib formats library -# main description used for all the subpackages -%global common_description A %{pkg_name} library for Haskell. +%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.3.1 +Name: ghc-%{pkg_name} +Version: 0.5.3.3 Release: 1 Summary: %{common_summary} -Group: Development/Libraries/Other +Group: System/Libraries License: BSD-3-Clause +BuildRoot: %{_tmppath}/%{name}-%{version}-build # BEGIN cabal2spec 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 -%if %{undefined without_hscolour} -BuildRequires: hscolour -%endif -# END cabal2spec -# BR any C devel dependency here -# list ghc-*-prof dependencies: +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} BuildRequires: ghc-bytestring-devel BuildRequires: zlib-devel - -%if %{defined sles_version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif +# END cabal2spec %description %{common_description} -%package -n ghc-%{pkg_name}-devel -Summary: Development files for %{common_summary} -Group: Development/Libraries/Other -# BEGIN cabal2spec -%{?ghc_devel_requires} -Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} -Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END cabal2spec -# remember to require any C devel dependency here -# Haskell devel dependencies are autogenerated by ghc-deps.sh -Requires: zlib-devel - -%description -n ghc-%{pkg_name}-devel -%{common_description} - -This package contains the development files. - - %prep %setup -q -n %{pkg_name}-%{version} %build -#%%define cabal_configure_options -f "opt1 -opt2 ..." %ghc_lib_build @@ -85,24 +60,17 @@ This package contains the development files. %ghc_lib_install -%post -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +# devel subpackage +%ghc_devel_package +Requires: zlib-devel + +%ghc_devel_description -%postun -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_post_postun -%if %{undefined ghc_without_shared} -%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files -%defattr(-,root,root,-) -%endif - - -%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files -%defattr(-,root,root,-) +%ghc_files LICENSE %changelog -* Thu Dec 15 2011 Fedora Haskell SIG - 0.5.3.1-0 -- initial packaging for Fedora automatically generated by cabal2spec-0.24.1