From 4538837d060e23fbcc987e9befed0ba21aac7ca3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 27 Nov 2008 02:42:49 +0000 Subject: [PATCH 001/107] Setup of module ghc-zlib --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..dd77cee --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: ghc-zlib +# $Id$ +NAME := ghc-zlib +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 251b104fe3a8a075268111497b427a61a63efdf7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 28 Nov 2008 01:12:47 +0000 Subject: [PATCH 002/107] *** empty log message *** --- .cvsignore | 1 + ghc-zlib.spec | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 125 insertions(+) create mode 100644 ghc-zlib.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..74089ad 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +zlib-0.5.0.0.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec new file mode 100644 index 0000000..0ef948a --- /dev/null +++ b/ghc-zlib.spec @@ -0,0 +1,122 @@ +# Haskell package name +%define pkg_name zlib +# Haskell compiler +%define ghc_version 6.10.1 + +%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} +%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name} +# Haskell compilers do not emit debug information. +%define debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 0.5.0.0 +Release: 2%{?dist} +License: BSD +Group: Development/Libraries +URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +Source: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Summary: Haskell compression and decompression in the zlib and gzip formats +Provides: %{name}-devel = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveArch: i386 x86_64 ppc +BuildRequires: ghc = %{ghc_version} +BuildRequires: ghc-prof = %{ghc_version} +BuildRequires: zlib-devel +Requires: zlib-devel +Requires: ghc = %{ghc_version} +# for ghc-pkg and haddock +Requires(post): ghc = %{ghc_version} +Requires(preun): ghc = %{ghc_version} +Requires(postun): ghc = %{ghc_version} + +%description +This package provides a pure Haskell 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. + +It provides a convenient high level API suitable for most tasks. For +the few cases where more control is needed, it provides access to the +full zlib feature set. + + +%package prof +Summary: Profiling libraries for %{name} +Group: Development/Libraries +Requires: ghc-prof = %{ghc_version} + +%description prof +This package contains profiling libraries for %{name}. + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%cabal_configure -p --ghc +%cabal build +%cabal haddock +%ghc_gen_scripts + + +%install +rm -rf ${RPM_BUILD_ROOT} +%cabal_install +%ghc_install_scripts +%ghc_gen_filelists %{name} + + +%clean +rm -rf ${RPM_BUILD_ROOT} + + +%post +%ghc_postinst_script +%ghc_reindex_haddock + + +%preun +%ghc_preun_script + + +%postun +if [ "$1" -eq 0 ] ; then + %ghc_reindex_haddock +fi + + +%files -f %{name}.files +%defattr(-,root,root,-) +%doc LICENSE +%{pkg_docdir} + + +%files prof -f %{name}-prof.files +%defattr(-,root,root,-) + + +%changelog +* Tue Nov 25 2008 Jens Petersen - 0.5.0.0-2 +- build with ghc-6.10.1 +- no longer buildrequire haddock09 +- provide devel +- add exclusivearch for current ghc archs +- reindex haddock docs only when uninstalling in postun + +* Tue Nov 11 2008 Bryan O'Sullivan - 0.5.0.0-1 +- Update to 0.5.0.0 + +* Thu Oct 23 2008 Jens Petersen - 0.4.0.4-2 +- update for current rawhide +- add pkg_docdir and remove hsc_name +- use haddock09 + +* Tue Oct 14 2008 Bryan O'Sullivan - 0.4.0.4-1 +- Revised to follow Haskell packaging guidelines + +* Sun Feb 17 2008 Yaakov Nemoy - 0.4.0.2-1 +- added in url + +* Sun Feb 17 2008 cabal-rpm - 0.4.0.2-1 +- spec file autogenerated by cabal-rpm diff --git a/import.log b/import.log new file mode 100644 index 0000000..e6cfab4 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ghc-zlib-0_5_0_0-2_fc10:HEAD:ghc-zlib-0.5.0.0-2.fc10.src.rpm:1227834470 diff --git a/sources b/sources index e69de29..c23291d 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +22fa6d394c42c8584b234799b923f860 zlib-0.5.0.0.tar.gz From 9dadcbd710a35293ca0d0a767758743ab38a2830 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 1 Dec 2008 08:06:59 +0000 Subject: [PATCH 003/107] sync with lib template: - add build_prof and build_doc - prof requires main package - update scriptlet macro names --- ghc-zlib.spec | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 0ef948a..b5e4167 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,21 +1,23 @@ -# Haskell package name %define pkg_name zlib -# Haskell compiler %define ghc_version 6.10.1 %define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} %define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name} -# Haskell compilers do not emit debug information. + +%define build_prof 1 +%define build_doc 1 + +# ghc does not emit debug information %define debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.5.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Development/Libraries URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -Summary: Haskell compression and decompression in the zlib and gzip formats +Summary: Haskell compression and decompression library binding Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 x86_64 ppc @@ -40,13 +42,16 @@ the few cases where more control is needed, it provides access to the full zlib feature set. +%if %{build_prof} %package prof Summary: Profiling libraries for %{name} Group: Development/Libraries +Requires: %{name} = %{version}-%{release} Requires: ghc-prof = %{ghc_version} %description prof This package contains profiling libraries for %{name}. +%endif %prep @@ -54,49 +59,72 @@ This package contains profiling libraries for %{name}. %build -%cabal_configure -p --ghc +%cabal_configure --ghc \ +%if %{build_prof} + -p +%else +%{nil} +%endif %cabal build +%if %{build_doc} %cabal haddock +%endif %ghc_gen_scripts %install -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %cabal_install %ghc_install_scripts %ghc_gen_filelists %{name} %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %post -%ghc_postinst_script +%ghc_register_pkg +%if %{build_doc} %ghc_reindex_haddock +%endif %preun -%ghc_preun_script +if [ "$1" -eq 0 ] ; then + %ghc_unregister_pkg +fi %postun if [ "$1" -eq 0 ] ; then +%if %{build_doc} %ghc_reindex_haddock +%endif fi %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE +%if %{build_doc} %{pkg_docdir} +%endif +%if %{build_prof} %files prof -f %{name}-prof.files %defattr(-,root,root,-) +%endif %changelog +* Mon Dec 1 2008 Jens Petersen - 0.5.0.0-3 +- sync with lib template: + - add build_prof and build_doc + - prof requires main package + - update scriptlet macro names + * Tue Nov 25 2008 Jens Petersen - 0.5.0.0-2 - build with ghc-6.10.1 - no longer buildrequire haddock09 From 59108cef1ab6dff5979767a52a8cdba71a93c47b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Dec 2008 05:41:58 +0000 Subject: [PATCH 004/107] - no longer hard code ghc_version (Till Maas, #426751) - use bcond for doc and prof build flags (Till Maas, #426751) --- ghc-zlib.spec | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index b5e4167..e2caf24 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,18 +1,18 @@ %define pkg_name zlib -%define ghc_version 6.10.1 +%define ghc_version %(ghc --numeric-version) %define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} %define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name} -%define build_prof 1 -%define build_doc 1 +%bcond_without prof +%bcond_without doc # ghc does not emit debug information %define debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.5.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Development/Libraries URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} @@ -42,7 +42,7 @@ the few cases where more control is needed, it provides access to the full zlib feature set. -%if %{build_prof} +%if %{with prof} %package prof Summary: Profiling libraries for %{name} Group: Development/Libraries @@ -59,14 +59,9 @@ This package contains profiling libraries for %{name}. %build -%cabal_configure --ghc \ -%if %{build_prof} - -p -%else -%{nil} -%endif +%cabal_configure --ghc %{!?without_prof:-p} %cabal build -%if %{build_doc} +%if %{with doc} %cabal haddock %endif %ghc_gen_scripts @@ -85,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT %post %ghc_register_pkg -%if %{build_doc} +%if %{with doc} %ghc_reindex_haddock %endif @@ -98,7 +93,7 @@ fi %postun if [ "$1" -eq 0 ] ; then -%if %{build_doc} +%if %{with doc} %ghc_reindex_haddock %endif fi @@ -107,18 +102,22 @@ fi %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE -%if %{build_doc} +%if %{with doc} %{pkg_docdir} %endif -%if %{build_prof} +%if %{with prof} %files prof -f %{name}-prof.files %defattr(-,root,root,-) %endif %changelog +* Wed Dec 17 2008 Jens Petersen - 0.5.0.0-4 +- no longer hard code ghc_version (Till Maas, #426751) +- use bcond for doc and prof build flags (Till Maas, #426751) + * Mon Dec 1 2008 Jens Petersen - 0.5.0.0-3 - sync with lib template: - add build_prof and build_doc From fd499780a5644902fa1554bb5365eb3feee69170 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Dec 2008 05:56:49 +0000 Subject: [PATCH 005/107] no longer make buildrequires ghc_version explicit --- ghc-zlib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index e2caf24..8374a58 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -21,8 +21,8 @@ Summary: Haskell compression and decompression library binding Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 x86_64 ppc -BuildRequires: ghc = %{ghc_version} -BuildRequires: ghc-prof = %{ghc_version} +BuildRequires: ghc +BuildRequires: ghc-prof BuildRequires: zlib-devel Requires: zlib-devel Requires: ghc = %{ghc_version} From 97c7317a2f2841f57feb9eea9f500c36b6b7bfe6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 9 Feb 2009 13:08:39 +0000 Subject: [PATCH 006/107] - rebuild to fix unexpanded post preun macros - add doc subpackage and BR ghc-doc - add doc requires(post) ghc-doc --- ghc-zlib.spec | 53 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 8374a58..817d5c0 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,8 +1,8 @@ %define pkg_name zlib -%define ghc_version %(ghc --numeric-version) +%define ghc_version 6.10.1 %define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} -%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name} +%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} %bcond_without prof %bcond_without doc @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.5.0.0 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Development/Libraries URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} @@ -21,15 +21,18 @@ Summary: Haskell compression and decompression library binding Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 x86_64 ppc -BuildRequires: ghc -BuildRequires: ghc-prof +BuildRequires: ghc = %{ghc_version} +%if %{with doc} +BuildRequires: ghc-doc = %{ghc_version} +%endif +%if %{with prof} +BuildRequires: ghc-prof = %{ghc_version} +%endif BuildRequires: zlib-devel Requires: zlib-devel Requires: ghc = %{ghc_version} -# for ghc-pkg and haddock Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} -Requires(postun): ghc = %{ghc_version} %description This package provides a pure Haskell interface for compressing and @@ -42,6 +45,19 @@ the few cases where more control is needed, it provides access to the full zlib feature set. +%if %{with doc} +%package doc +Summary: Documentation for %{name} +Group: Development/Libraries +Requires: ghc-doc = %{ghc_version} +Requires(post): ghc-doc = %{ghc_version} +Requires(postun): ghc-doc = %{ghc_version} + +%description doc +This package contains development documentation files for the %{name} library. +%endif + + %if %{with prof} %package prof Summary: Profiling libraries for %{name} @@ -78,9 +94,12 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT -%post +%post %ghc_register_pkg + + %if %{with doc} +%post doc %ghc_reindex_haddock %endif @@ -91,18 +110,22 @@ if [ "$1" -eq 0 ] ; then fi -%postun -if [ "$1" -eq 0 ] ; then %if %{with doc} +%postun doc +if [ "$1" -eq 0 ] ; then %ghc_reindex_haddock -%endif fi +%endif %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE + + %if %{with doc} +%files doc +%defattr(-,root,root,-) %{pkg_docdir} %endif @@ -114,8 +137,12 @@ fi %changelog -* Wed Dec 17 2008 Jens Petersen - 0.5.0.0-4 -- no longer hard code ghc_version (Till Maas, #426751) +* Mon Feb 9 2009 Jens Petersen - 0.5.0.0-5 +- rebuild to fix unexpanded post preun macros +- add doc subpackage and BR ghc-doc +- add doc requires(post) ghc-doc + +* Mon Dec 22 2008 Jens Petersen - 0.5.0.0-4 - use bcond for doc and prof build flags (Till Maas, #426751) * Mon Dec 1 2008 Jens Petersen - 0.5.0.0-3 From 304bc47fcffdf2fff4d48b53cafad6c51a1015e6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Feb 2009 06:08:58 +0000 Subject: [PATCH 007/107] tab to space --- ghc-zlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 817d5c0..63e9696 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -20,7 +20,7 @@ Source: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg Summary: Haskell compression and decompression library binding Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: i386 x86_64 ppc BuildRequires: ghc = %{ghc_version} %if %{with doc} BuildRequires: ghc-doc = %{ghc_version} From 9afa6d35a5e59efbbe9434c289641591fcad5ec8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 21:17:49 +0000 Subject: [PATCH 008/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 63e9696..f14b787 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.5.0.0 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: Development/Libraries URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} @@ -137,6 +137,9 @@ fi %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 9 2009 Jens Petersen - 0.5.0.0-5 - rebuild to fix unexpanded post preun macros - add doc subpackage and BR ghc-doc From 61ea922f43c66bbedc0d3e742e036ffb6593dca8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 26 Feb 2009 23:35:10 +0000 Subject: [PATCH 009/107] - update to cabal2spec-0.9: - add devel subpackage - use ix86 macro for archs - use global rather than define --- ghc-zlib.spec | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index f14b787..27057be 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,26 +1,26 @@ %define pkg_name zlib %define ghc_version 6.10.1 -%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} -%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} +%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} +%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} -%bcond_without prof %bcond_without doc +%bcond_without prof # ghc does not emit debug information -%define debug_package %{nil} +%global debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.5.0.0 -Release: 6%{?dist} -License: BSD +Release: 7%{?dist} +Summary: Haskell compression and decompression library binding + Group: Development/Libraries +License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -Summary: Haskell compression and decompression library binding -Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc BuildRequires: ghc = %{ghc_version} %if %{with doc} BuildRequires: ghc-doc = %{ghc_version} @@ -29,10 +29,6 @@ BuildRequires: ghc-doc = %{ghc_version} BuildRequires: ghc-prof = %{ghc_version} %endif BuildRequires: zlib-devel -Requires: zlib-devel -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(preun): ghc = %{ghc_version} %description This package provides a pure Haskell interface for compressing and @@ -44,6 +40,18 @@ It provides a convenient high level API suitable for most tasks. For the few cases where more control is needed, it provides access to the full zlib feature set. +%package devel +Summary: Development libraries for %{name} +Group: Development/Libraries +Requires: zlib-devel +Requires: ghc = %{ghc_version} +Requires(post): ghc = %{ghc_version} +Requires(preun): ghc = %{ghc_version} + +%description devel +This package contains the development files for %{name} +built for ghc-%{ghc_version}. + %if %{with doc} %package doc @@ -62,7 +70,7 @@ This package contains development documentation files for the %{name} library. %package prof Summary: Profiling libraries for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} Requires: ghc-prof = %{ghc_version} %description prof @@ -94,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT -%post +%post devel %ghc_register_pkg @@ -104,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT %endif -%preun +%preun devel if [ "$1" -eq 0 ] ; then %ghc_unregister_pkg fi @@ -118,7 +126,7 @@ fi %endif -%files -f %{name}.files +%files devel -f %{name}-devel.files %defattr(-,root,root,-) %doc LICENSE @@ -137,6 +145,12 @@ fi %changelog +* Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 +- update to cabal2spec-0.9: +- add devel subpackage +- use ix86 macro for archs +- use global rather than define + * Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 749192f12d5b07e7ffd4163a48f59546a9f353ad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 Feb 2009 04:12:58 +0000 Subject: [PATCH 010/107] - sync whitespace with template - add alpha arch (cabal2spec-0.11) --- ghc-zlib.spec | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 27057be..d2b1edb 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,5 +1,5 @@ -%define pkg_name zlib -%define ghc_version 6.10.1 +%global pkg_name zlib +%global ghc_version 6.10.1 %global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} %global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} @@ -10,25 +10,26 @@ # ghc does not emit debug information %global debug_package %{nil} -Name: ghc-%{pkg_name} -Version: 0.5.0.0 -Release: 7%{?dist} -Summary: Haskell compression and decompression library binding +Name: ghc-%{pkg_name} +Version: 0.5.0.0 +Release: 7%{?dist} +Summary: Haskell compression and decompression library binding -Group: Development/Libraries -License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} -Source: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Group: Development/Libraries +License: BSD +URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 ppc -BuildRequires: ghc = %{ghc_version} +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha +BuildRequires: ghc = %{ghc_version} %if %{with doc} BuildRequires: ghc-doc = %{ghc_version} %endif %if %{with prof} BuildRequires: ghc-prof = %{ghc_version} %endif -BuildRequires: zlib-devel +BuildRequires: zlib-devel %description This package provides a pure Haskell interface for compressing and @@ -41,10 +42,10 @@ the few cases where more control is needed, it provides access to the full zlib feature set. %package devel -Summary: Development libraries for %{name} -Group: Development/Libraries -Requires: zlib-devel -Requires: ghc = %{ghc_version} +Summary: Haskell %{pkg_name} library +Group: Development/Libraries +Requires: zlib-devel +Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} @@ -146,9 +147,9 @@ fi %changelog * Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 -- update to cabal2spec-0.9: +- update to cabal2spec-0.11: - add devel subpackage -- use ix86 macro for archs +- use ix86 macro for archs and add alpha - use global rather than define * Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 From 3f170f2079fd8ba41e58b48abafa250701405d1d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 Feb 2009 06:21:43 +0000 Subject: [PATCH 011/107] let devel subpackage own docdir for now --- ghc-zlib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d2b1edb..d4ed151 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %ghc_install_scripts %ghc_gen_filelists %{name} +# no base package +#rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE + %clean rm -rf $RPM_BUILD_ROOT @@ -129,7 +132,7 @@ fi %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc LICENSE +%{_docdir}/%{name}-%{version} %if %{with doc} @@ -151,6 +154,7 @@ fi - add devel subpackage - use ix86 macro for archs and add alpha - use global rather than define +- make devel own docdir for now * Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 9dedaa43f6d788bea60d52fac29250eddbf94a6f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Apr 2009 13:44:58 +0000 Subject: [PATCH 012/107] sync with cabal2spec-0.14 --- ghc-zlib.spec | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d4ed151..2e188a6 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,8 +1,4 @@ %global pkg_name zlib -%global ghc_version 6.10.1 - -%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} -%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} %bcond_without doc %bcond_without prof @@ -12,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.5.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Haskell compression and decompression library binding Group: Development/Libraries @@ -22,12 +18,13 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc = %{ghc_version} +# for latest macros.ghc +BuildRequires: ghc >= 6.10.2-3 %if %{with doc} -BuildRequires: ghc-doc = %{ghc_version} +BuildRequires: ghc-doc %endif %if %{with prof} -BuildRequires: ghc-prof = %{ghc_version} +BuildRequires: ghc-prof %endif BuildRequires: zlib-devel @@ -56,9 +53,9 @@ built for ghc-%{ghc_version}. %if %{with doc} %package doc -Summary: Documentation for %{name} -Group: Development/Libraries -Requires: ghc-doc = %{ghc_version} +Summary: Documentation for %{name} +Group: Development/Libraries +Requires: ghc-doc = %{ghc_version} Requires(post): ghc-doc = %{ghc_version} Requires(postun): ghc-doc = %{ghc_version} @@ -69,13 +66,14 @@ This package contains development documentation files for the %{name} library. %if %{with prof} %package prof -Summary: Profiling libraries for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} +Summary: Profiling libraries for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: ghc-prof = %{ghc_version} %description prof -This package contains profiling libraries for %{name}. +This package contains profiling libraries for %{name} +built for ghc-%{ghc_version}. %endif @@ -84,7 +82,7 @@ This package contains profiling libraries for %{name}. %build -%cabal_configure --ghc %{!?without_prof:-p} +%cabal_configure --ghc %{?with_prof:-p} %cabal build %if %{with doc} %cabal haddock @@ -98,9 +96,6 @@ rm -rf $RPM_BUILD_ROOT %ghc_install_scripts %ghc_gen_filelists %{name} -# no base package -#rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE - %clean rm -rf $RPM_BUILD_ROOT @@ -136,9 +131,8 @@ fi %if %{with doc} -%files doc +%files doc -f %{name}-doc.files %defattr(-,root,root,-) -%{pkg_docdir} %endif @@ -149,6 +143,9 @@ fi %changelog +* Fri Apr 24 2009 Jens Petersen - 0.5.0.0-8 +- sync with cabal2spec-0.14 + * Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 - update to cabal2spec-0.11: - add devel subpackage From e11a483be9c38a3b821df61265cafb729d145442 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 16 May 2009 04:53:56 +0000 Subject: [PATCH 013/107] buildrequires ghc-rpm-macros (cabal2spec-0.16); rebuild for ghc-6.10.3 --- ghc-zlib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 2e188a6..96b5c23 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.5.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Haskell compression and decompression library binding Group: Development/Libraries @@ -18,8 +18,7 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -# for latest macros.ghc -BuildRequires: ghc >= 6.10.2-3 +BuildRequires: ghc, ghc-rpm-macros %if %{with doc} BuildRequires: ghc-doc %endif @@ -143,6 +142,9 @@ fi %changelog +* Sat May 16 2009 Jens Petersen - 0.5.0.0-9 +- buildrequires ghc-rpm-macros (cabal2spec-0.16) + * Fri Apr 24 2009 Jens Petersen - 0.5.0.0-8 - sync with cabal2spec-0.14 From 13c3ff57ee2481f7877aecc57063a89743e2bb9c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 30 May 2009 10:06:10 +0000 Subject: [PATCH 014/107] add comment about part of haskell-platform --- ghc-zlib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 96b5c23..f061424 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,6 +7,7 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} +# part of haskell-platform Version: 0.5.0.0 Release: 9%{?dist} Summary: Haskell compression and decompression library binding From a904853a5a7d9a1ad0ce959995bfc48bd699d0f3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 00:05:57 +0000 Subject: [PATCH 015/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index f061424..83a526f 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.5.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Haskell compression and decompression library binding Group: Development/Libraries @@ -143,6 +143,9 @@ fi %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.5.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sat May 16 2009 Jens Petersen - 0.5.0.0-9 - buildrequires ghc-rpm-macros (cabal2spec-0.16) From 8e3f8ce32647f054c73f8917b32a47a2d78185ff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 16 Sep 2009 09:31:12 +0000 Subject: [PATCH 016/107] note the haskell-platform version --- ghc-zlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 83a526f..064b64e 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform +# part of haskell-platform-2009.2.0.2 Version: 0.5.0.0 Release: 10%{?dist} Summary: Haskell compression and decompression library binding From 1662d5bd8f2a1517fdef43c20e0f15b413522871 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:25 +0000 Subject: [PATCH 017/107] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dd77cee..8a9e153 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: ghc-zlib -# $Id$ +# $Id: Makefile,v 1.1 2008/11/27 02:42:49 ausil Exp $ NAME := ghc-zlib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fc22668a9f1c59e41fcfb18364d9180f99d399c1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 16 Dec 2009 10:00:18 +0000 Subject: [PATCH 018/107] - build for ghc-6.12.1 - added shared library support: needs ghc-rpm-macros 0.3.1 - use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache --- ghc-zlib.spec | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 064b64e..f5f11d8 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -2,6 +2,7 @@ %bcond_without doc %bcond_without prof +%bcond_without shared # ghc does not emit debug information %global debug_package %{nil} @@ -9,17 +10,16 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2009.2.0.2 Version: 0.5.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Haskell compression and decompression library binding Group: Development/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros +BuildRequires: ghc, ghc-rpm-macros >= 0.3.1 %if %{with doc} BuildRequires: ghc-doc %endif @@ -41,10 +41,13 @@ full zlib feature set. %package devel Summary: Haskell %{pkg_name} library Group: Development/Libraries -Requires: zlib-devel Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} -Requires(preun): ghc = %{ghc_version} +Requires(postun): ghc = %{ghc_version} +%if %{with shared} +Requires: %{name} = %{version}-%{release} +%endif +Requires: zlib-devel %description devel This package contains the development files for %{name} @@ -87,13 +90,12 @@ built for ghc-%{ghc_version}. %if %{with doc} %cabal haddock %endif -%ghc_gen_scripts %install -rm -rf $RPM_BUILD_ROOT %cabal_install -%ghc_install_scripts +%cabal_pkg_conf + %ghc_gen_filelists %{name} @@ -102,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT %post devel -%ghc_register_pkg +ghc-pkg recache %if %{with doc} @@ -111,10 +113,8 @@ rm -rf $RPM_BUILD_ROOT %endif -%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi +%postun devel +ghc-pkg recache %if %{with doc} @@ -125,6 +125,13 @@ fi %endif +%if %{with shared} +%files -f %{name}.files +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version} +%endif + + %files devel -f %{name}-devel.files %defattr(-,root,root,-) %{_docdir}/%{name}-%{version} @@ -143,6 +150,11 @@ fi %changelog +* Wed Dec 16 2009 Jens Petersen - 0.5.0.0-11 +- build for ghc-6.12.1 +- added shared library support: needs ghc-rpm-macros 0.3.1 +- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache + * Fri Jul 24 2009 Fedora Release Engineering - 0.5.0.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -157,7 +169,7 @@ fi - add devel subpackage - use ix86 macro for archs and add alpha - use global rather than define -- make devel own docdir for now +- make devel subpackage own docdir for now * Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cb58d10403360a71195823e3863b7f7557b51ff6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 22 Dec 2009 09:12:01 +0000 Subject: [PATCH 019/107] minor fixes: - fix base Group and devel Summary - only include docdir in devel if not shared build --- ghc-zlib.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index f5f11d8..0447c4a 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -13,7 +13,7 @@ Version: 0.5.0.0 Release: 11%{?dist} Summary: Haskell compression and decompression library binding -Group: Development/Libraries +Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz @@ -39,7 +39,7 @@ the few cases where more control is needed, it provides access to the full zlib feature set. %package devel -Summary: Haskell %{pkg_name} library +Summary: Haskell %{pkg_name} library development files Group: Development/Libraries Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} @@ -134,7 +134,9 @@ fi %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%if %{without shared} %{_docdir}/%{name}-%{version} +%endif %if %{with doc} @@ -150,6 +152,10 @@ fi %changelog +* Tue Dec 22 2009 Jens Petersen +- fix base Group and devel Summary +- only include docdir in devel if not shared build + * Wed Dec 16 2009 Jens Petersen - 0.5.0.0-11 - build for ghc-6.12.1 - added shared library support: needs ghc-rpm-macros 0.3.1 From 40b11069fcb2eae8579b8d5a65a71962b5c2f4dc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 25 Dec 2009 15:39:20 +0000 Subject: [PATCH 020/107] - update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0: - use common_summary and common_description - reenable debuginfo for stripping - use ghc_requires, ghc_doc_requires, and ghc_prof_requires --- ghc-zlib.spec | 72 +++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 0447c4a..7e01f4f 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,17 +1,28 @@ %global pkg_name zlib +%global common_summary Haskell compression and decompression library + +%global common_description This package provides a pure Haskell 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.\ +\ +It provides a convenient high level API suitable for most tasks. For\ +the few cases where more control is needed, it provides access to the\ +full zlib feature set. + %bcond_without doc %bcond_without prof %bcond_without shared -# ghc does not emit debug information -%global debug_package %{nil} +# stripping produces smaller .so +#%%global debug_package %{nil} Name: ghc-%{pkg_name} # part of haskell-platform-2009.2.0.2 Version: 0.5.0.0 -Release: 11%{?dist} -Summary: Haskell compression and decompression library binding +Release: 12%{?dist} +Summary: %{common_summary} Group: System Environment/Libraries License: BSD @@ -19,7 +30,7 @@ URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.3.1 +BuildRequires: ghc, ghc-rpm-macros >= 0.4.0 %if %{with doc} BuildRequires: ghc-doc %endif @@ -29,54 +40,47 @@ BuildRequires: ghc-prof BuildRequires: zlib-devel %description -This package provides a pure Haskell 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. +%{common_description} +%if %{with shared} +This package provides the shared library. +%endif -It provides a convenient high level API suitable for most tasks. 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 +Summary: %{common_summary} development files Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(postun): ghc = %{ghc_version} -%if %{with shared} -Requires: %{name} = %{version}-%{release} -%endif +%{?ghc_requires} Requires: zlib-devel %description devel -This package contains the development files for %{name} -built for ghc-%{ghc_version}. +%{common_description} + +This package contains the development files. %if %{with doc} %package doc -Summary: Documentation for %{name} +Summary: Documentation for %{common_summary} Group: Development/Libraries -Requires: ghc-doc = %{ghc_version} -Requires(post): ghc-doc = %{ghc_version} -Requires(postun): ghc-doc = %{ghc_version} +%{?ghc_doc_requires} %description doc -This package contains development documentation files for the %{name} library. +%{common_description} + +This package contains development documentation files. %endif %if %{with prof} %package prof -Summary: Profiling libraries for %{name} +Summary: Profiling libraries for %{common_summary} Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} +%{?ghc_prof_requires} %description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. +%{common_description} + +This package contains the profiling library. %endif @@ -152,6 +156,12 @@ fi %changelog +* Sat Dec 26 2009 Jens Petersen - 0.5.0.0-12 +- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0: +- use common_summary and common_description +- reenable debuginfo for stripping +- use ghc_requires, ghc_doc_requires, and ghc_prof_requires + * Tue Dec 22 2009 Jens Petersen - fix base Group and devel Summary - only include docdir in devel if not shared build From 8b43ae01626d1837df177db5b1bf04a192cb15e8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 04:50:30 +0000 Subject: [PATCH 021/107] - update to 0.5.2.0 (haskell-platform-2009.3.1) - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: - drop doc and prof bcond - use common summary and common_description - use ghc_lib_package and ghc_pkg_c_deps --- .cvsignore | 2 +- ghc-zlib.spec | 122 +++++++++----------------------------------------- sources | 2 +- 3 files changed, 22 insertions(+), 104 deletions(-) diff --git a/.cvsignore b/.cvsignore index 74089ad..7ee0efb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zlib-0.5.0.0.tar.gz +zlib-0.5.2.0.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 7e01f4f..4aa50f0 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -11,17 +11,17 @@ It provides a convenient high level API suitable for most tasks. For\ the few cases where more control is needed, it provides access to the\ full zlib feature set. -%bcond_without doc -%bcond_without prof +%global ghc_pkg_c_deps zlib-devel + %bcond_without shared -# stripping produces smaller .so -#%%global debug_package %{nil} +# debuginfo is not useful for ghc +%global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2009.2.0.2 -Version: 0.5.0.0 -Release: 12%{?dist} +# part of haskell-platform-2009.3.1 +Version: 0.5.2.0 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -30,14 +30,11 @@ URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.4.0 -%if %{with doc} +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc -%endif -%if %{with prof} BuildRequires: ghc-prof -%endif -BuildRequires: zlib-devel +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description %{common_description} @@ -46,42 +43,7 @@ This package provides the shared library. %endif -%package devel -Summary: %{common_summary} development files -Group: Development/Libraries -%{?ghc_requires} -Requires: zlib-devel - -%description devel -%{common_description} - -This package contains the development files. - - -%if %{with doc} -%package doc -Summary: Documentation for %{common_summary} -Group: Development/Libraries -%{?ghc_doc_requires} - -%description doc -%{common_description} - -This package contains development documentation files. -%endif - - -%if %{with prof} -%package prof -Summary: Profiling libraries for %{common_summary} -Group: Development/Libraries -%{?ghc_prof_requires} - -%description prof -%{common_description} - -This package contains the profiling library. -%endif +%ghc_lib_package %prep @@ -89,73 +51,29 @@ This package contains the profiling library. %build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif %install %cabal_install %cabal_pkg_conf -%ghc_gen_filelists %{name} +%ghc_gen_filelists %clean rm -rf $RPM_BUILD_ROOT - -%post devel -ghc-pkg recache - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%postun devel -ghc-pkg recache - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%if %{with shared} -%files -f %{name}.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%if %{without shared} -%{_docdir}/%{name}-%{version} -%endif - - -%if %{with doc} -%files doc -f %{name}-doc.files -%defattr(-,root,root,-) -%endif - - -%if %{with prof} -%files prof -f %{name}-prof.files -%defattr(-,root,root,-) -%endif - - %changelog +* Mon Jan 11 2010 Jens Petersen - 0.5.2.0-1 +- update to 0.5.2.0 (haskell-platform-2009.3.1) +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use common summary and common_description +- use ghc_lib_package and ghc_pkg_c_deps + * Sat Dec 26 2009 Jens Petersen - 0.5.0.0-12 - update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0: - use common_summary and common_description diff --git a/sources b/sources index c23291d..229af08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22fa6d394c42c8584b234799b923f860 zlib-0.5.0.0.tar.gz +19859e241dc18ef1501a5d44d8523507 zlib-0.5.2.0.tar.gz From e39743d7e5fb6f857f31fd6989b59197c5a78a19 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 24 Apr 2010 08:16:07 +0000 Subject: [PATCH 022/107] part of haskell-platform-2010.1.0.0 --- ghc-zlib.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 4aa50f0..4dc5b15 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -19,9 +19,9 @@ full zlib feature set. %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2009.3.1 +# part of haskell-platform-2010.1.0.0 Version: 0.5.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -67,6 +67,10 @@ This package provides the shared library. rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 24 2010 Jens Petersen - 0.5.2.0-2 +- part of haskell-platform-2010.1.0.0 +- rebuild against ghc-6.12.2 + * Mon Jan 11 2010 Jens Petersen - 0.5.2.0-1 - update to 0.5.2.0 (haskell-platform-2009.3.1) - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: From 42f4191ab333cad183381178528baf322d57c940 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 24 Apr 2010 08:25:01 +0000 Subject: [PATCH 023/107] condition ghc_lib_package --- ghc-zlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 4dc5b15..444cefe 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -43,7 +43,7 @@ This package provides the shared library. %endif -%ghc_lib_package +%{?ghc_lib_package} %prep From 54169c08141b05e5f1a9f7831d4a535e6f849885 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 26 Jun 2010 13:01:17 +0000 Subject: [PATCH 024/107] sync cabal2spec-0.22 --- ghc-zlib.spec | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 444cefe..2bf8b98 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -21,19 +21,18 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2010.1.0.0 Version: 0.5.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 -BuildRequires: ghc-doc -BuildRequires: ghc-prof -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.7.0 %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description @@ -51,22 +50,21 @@ This package provides the shared library. %build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build %install -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists +rm -rf $RPM_BUILD_ROOT +%ghc_lib_install %clean rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 +- sync cabal2spec-0.22 + * Sat Apr 24 2010 Jens Petersen - 0.5.2.0-2 - part of haskell-platform-2010.1.0.0 - rebuild against ghc-6.12.2 From ef07629bb166fdbb91ebcd19f00735e96e1fcf9e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 26 Jun 2010 13:02:32 +0000 Subject: [PATCH 025/107] newline before changelog --- ghc-zlib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 2bf8b98..aacb9a4 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -61,6 +61,7 @@ rm -rf $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT + %changelog * Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 - sync cabal2spec-0.22 From be2b7d83b1e38f6ede6190d73c19f3f2ee7fbd3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:35:10 +0000 Subject: [PATCH 026/107] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8a9e153..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ghc-zlib -# $Id: Makefile,v 1.1 2008/11/27 02:42:49 ausil Exp $ -NAME := ghc-zlib -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index e6cfab4..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -ghc-zlib-0_5_0_0-2_fc10:HEAD:ghc-zlib-0.5.0.0-2.fc10.src.rpm:1227834470 From ee99bd8db97fdadac6c033c3a3301feead6e6514 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 4 Sep 2010 16:58:10 +1000 Subject: [PATCH 027/107] add hscolour and doc obsolete (cabal2spec-0.22.2) --- ghc-zlib.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index aacb9a4..9ae1310 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -14,14 +14,15 @@ full zlib feature set. %global ghc_pkg_c_deps zlib-devel %bcond_without shared +%bcond_without hscolour # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2010.1.0.0 +# part of haskell-platform-2010.2.0.0 Version: 0.5.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -32,7 +33,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.0 +BuildRequires: ghc-rpm-macros >= 0.8.1 +%if %{with hscolour} +BuildRequires: hscolour +%endif %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description @@ -42,9 +46,6 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} @@ -62,7 +63,14 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 0.5.2.0-4 + + %changelog +* Sat Sep 4 2010 Jens Petersen - 0.5.2.0-4 +- add hscolour and doc obsolete (cabal2spec-0.22.2) +- part of haskell-platform-2010.2.0.0 + * Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 - sync cabal2spec-0.22 From 85d12fcb46f5cd545ab190f03b54bec119d658a0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Nov 2010 11:30:54 +1000 Subject: [PATCH 028/107] rebuild with ghc-7.0.1 --- ghc-zlib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 9ae1310..15505cb 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -22,7 +22,7 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 0.5.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -63,10 +63,13 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT -%ghc_lib_package -o 0.5.2.0-4 +%ghc_lib_package %changelog +* Thu Nov 25 2010 Jens Petersen - 0.5.2.0-5 +- rebuild with ghc-7.0.1 + * Sat Sep 4 2010 Jens Petersen - 0.5.2.0-4 - add hscolour and doc obsolete (cabal2spec-0.22.2) - part of haskell-platform-2010.2.0.0 From a0e6f7c8a7282a02c42f09f3e697353dbc502c39 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 15 Jan 2011 22:24:12 +0900 Subject: [PATCH 029/107] update to cabal2spec-0.22.4 --- ghc-zlib.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 15505cb..487db89 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -13,30 +13,24 @@ full zlib feature set. %global ghc_pkg_c_deps zlib-devel -%bcond_without shared -%bcond_without hscolour - # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 0.5.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.8.1 -%if %{with hscolour} +BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour -%endif %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description @@ -55,18 +49,16 @@ This package provides the shared library. %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install -%clean -rm -rf $RPM_BUILD_ROOT - - %ghc_lib_package %changelog +* Sat Jan 15 2011 Jens Petersen - 0.5.2.0-6 +- update to cabal2spec-0.22.4 + * Thu Nov 25 2010 Jens Petersen - 0.5.2.0-5 - rebuild with ghc-7.0.1 From 6681ea90c440ec56f79ef567ca66a7ef5e840901 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 19:42:04 -0600 Subject: [PATCH 030/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 487db89..6913dd3 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -19,7 +19,7 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 0.5.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -56,6 +56,9 @@ This package provides the shared library. %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.5.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jan 15 2011 Jens Petersen - 0.5.2.0-6 - update to cabal2spec-0.22.4 From a633c382130d842364b85198ad7d8ef7359f92e6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 15 Feb 2011 18:35:11 +1000 Subject: [PATCH 031/107] update to 0.5.3.1 --- .gitignore | 1 + ghc-zlib.spec | 15 ++++++--------- sources | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 7ee0efb..e6b89b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ zlib-0.5.2.0.tar.gz +/zlib-0.5.3.1.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 6913dd3..e6ca596 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -13,13 +13,10 @@ full zlib feature set. %global ghc_pkg_c_deps zlib-devel -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} -# part of haskell-platform-2010.2.0.0 -Version: 0.5.2.0 -Release: 7%{?dist} +# part of haskell-platform-2011.1.0.0 +Version: 0.5.3.1 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -35,9 +32,6 @@ BuildRequires: hscolour %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif %prep @@ -56,6 +50,9 @@ This package provides the shared library. %changelog +* Tue Feb 15 2011 Jens Petersen - 0.5.3.1-1 +- update to 0.5.3.1 for haskell-platform-2011.1 + * Tue Feb 08 2011 Fedora Release Engineering - 0.5.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 229af08..05b85ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19859e241dc18ef1501a5d44d8523507 zlib-0.5.2.0.tar.gz +8fb2988b112e38d04a527b892f770507 zlib-0.5.3.1.tar.gz From ffc0ed9dd154d4dde7454777425ec7d41f5118ef Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 10 Mar 2011 09:15:38 +0100 Subject: [PATCH 032/107] Enable build on sparcv9 Signed-off-by: Fabio M. Di Nitto --- ghc-zlib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index e6ca596..bd7f0af 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -16,7 +16,7 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2011.1.0.0 Version: 0.5.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -24,7 +24,7 @@ License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour @@ -50,6 +50,9 @@ BuildRequires: hscolour %changelog +* Thu Mar 10 2011 Fabio M. Di Nitto - 0.5.3.1-2 +- Enable build on sparcv9 + * Tue Feb 15 2011 Jens Petersen - 0.5.3.1-1 - update to 0.5.3.1 for haskell-platform-2011.1 From b1c5a62369a4978fb18928ae5e0c88780de315af Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 May 2011 18:20:10 +0900 Subject: [PATCH 033/107] update to cabal2spec-0.23: add ppc64 --- ghc-zlib.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index bd7f0af..8e33bfe 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -14,9 +14,9 @@ full zlib feature set. %global ghc_pkg_c_deps zlib-devel Name: ghc-%{pkg_name} -# part of haskell-platform-2011.1.0.0 +# part of haskell-platform-2011.2.0.0 Version: 0.5.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -24,9 +24,9 @@ License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.3 +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 +BuildRequires: ghc-prof +BuildRequires: ghc-rpm-macros BuildRequires: hscolour %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} @@ -50,6 +50,9 @@ BuildRequires: hscolour %changelog +* Fri May 27 2011 Jens Petersen - 0.5.3.1-3 +- update to cabal2spec-0.23: add ppc64 + * Thu Mar 10 2011 Fabio M. Di Nitto - 0.5.3.1-2 - Enable build on sparcv9 From 7c41c8e7267487fca8c095b315e28ab461ecec6c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Jun 2011 11:43:39 +0900 Subject: [PATCH 034/107] BR ghc-Cabal-devel and use ghc_excluded_archs --- ghc-zlib.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 8e33bfe..14307ec 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -14,18 +14,18 @@ full zlib feature set. %global ghc_pkg_c_deps zlib-devel Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.0 +# part of haskell-platform-2011.2.0.1 Version: 0.5.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 -BuildRequires: ghc-prof +# ghc_excluded_archs is defined in redhat-rpm-config +ExcludeArch: %{ghc_excluded_archs} +BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} @@ -50,6 +50,9 @@ BuildRequires: hscolour %changelog +* Mon Jun 20 2011 Jens Petersen - 0.5.3.1-4 +- BR ghc-Cabal-devel and use ghc_excluded_archs + * Fri May 27 2011 Jens Petersen - 0.5.3.1-3 - update to cabal2spec-0.23: add ppc64 From f276cce2b433e0cee26f86edc7a8e7250859eeb2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Jun 2011 15:10:18 +0900 Subject: [PATCH 035/107] also BR bytestring --- ghc-zlib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 14307ec..bfcd633 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -28,6 +28,7 @@ ExcludeArch: %{ghc_excluded_archs} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour +BuildRequires: ghc-bytestring-prof %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description From b49ef77ea5d8eee683264d67370b624393cdde3e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Jun 2011 17:43:46 +0900 Subject: [PATCH 036/107] ghc_arches replaces ghc_excluded_archs (cabal2spec-0.23.2) --- ghc-zlib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index bfcd633..3ddb865 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -16,15 +16,14 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 0.5.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# ghc_excluded_archs is defined in redhat-rpm-config -ExcludeArch: %{ghc_excluded_archs} +ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour @@ -51,6 +50,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Tue Jun 21 2011 Jens Petersen - 0.5.3.1-5 +- ghc_arches replaces ghc_excluded_archs + * Mon Jun 20 2011 Jens Petersen - 0.5.3.1-4 - BR ghc-Cabal-devel and use ghc_excluded_archs From f2ffbea34e996c43558a9cbb7ff7a37ea706e4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 11 Oct 2011 21:50:17 +0200 Subject: [PATCH 037/107] rebuild with new gmp --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 3ddb865..471ca1c 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -16,7 +16,7 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 0.5.3.1 -Release: 5%{?dist} +Release: 5%{?dist}.1 Summary: %{common_summary} Group: System Environment/Libraries @@ -50,6 +50,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Tue Oct 11 2011 Peter Schiffer - 0.5.3.1-5.1 +- rebuild with new gmp + * Tue Jun 21 2011 Jens Petersen - 0.5.3.1-5 - ghc_arches replaces ghc_excluded_archs From 2374ccd9103bde4679f2c764654dfba0f0dceddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 21 Oct 2011 06:18:27 +0200 Subject: [PATCH 038/107] rebuild with new gmp without compat lib --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 471ca1c..102d19a 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -16,7 +16,7 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 0.5.3.1 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 Summary: %{common_summary} Group: System Environment/Libraries @@ -50,6 +50,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Fri Oct 21 2011 Marcela Mašláňová - 0.5.3.1-5.2 +- rebuild with new gmp without compat lib + * Tue Oct 11 2011 Peter Schiffer - 0.5.3.1-5.1 - rebuild with new gmp From 439a92ffe0e2df0471456316c0277e2cb1fba510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 24 Oct 2011 15:23:50 +0200 Subject: [PATCH 039/107] rebuild with new gmp without compat lib --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 102d19a..d72d22e 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -16,7 +16,7 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 0.5.3.1 -Release: 5%{?dist}.2 +Release: 5%{?dist}.3 Summary: %{common_summary} Group: System Environment/Libraries @@ -50,6 +50,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Mon Oct 24 2011 Marcela Mašláňová - 0.5.3.1-5.3 +- rebuild with new gmp without compat lib + * Fri Oct 21 2011 Marcela Mašláňová - 0.5.3.1-5.2 - rebuild with new gmp without compat lib From 68bb7a14057d8768fc6b32e1ad05060928afbed5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 Jan 2012 23:00:21 +0900 Subject: [PATCH 040/107] update to cabal2spec-0.25.2; use _isa; include examples --- ghc-zlib.spec | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d72d22e..8374d68 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,3 +1,7 @@ +# cabal2spec-0.25.2 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name zlib %global common_summary Haskell compression and decompression library @@ -11,24 +15,23 @@ It provides a convenient high level API suitable for most tasks. For\ the few cases where more control is needed, it provides access to the\ full zlib feature set. -%global ghc_pkg_c_deps zlib-devel - Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.1 +# part of haskell-platform-2011.4.0.0 Version: 0.5.3.1 -Release: 5%{?dist}.3 +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +# 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: %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -BuildRequires: hscolour +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec BuildRequires: ghc-bytestring-prof -%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} +BuildRequires: zlib-devel%{?_isa} %description %{common_description} @@ -46,10 +49,25 @@ BuildRequires: ghc-bytestring-prof %ghc_lib_install -%ghc_lib_package +%ghc_devel_package +Requires: zlib-devel%{?_isa} + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files +%doc examples %changelog +* Mon Jan 2 2012 Jens Petersen - 0.5.3.1-6 +- update to cabal2spec-0.25.2 +- use _isa +- include examples + * Mon Oct 24 2011 Marcela Mašláňová - 0.5.3.1-5.3 - rebuild with new gmp without compat lib From 99b82f11f74177bc629ddc881bbd276ae99a5c5b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 21:27:43 -0600 Subject: [PATCH 041/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 8374d68..895edc2 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -18,7 +18,7 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2011.4.0.0 Version: 0.5.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -63,6 +63,9 @@ Requires: zlib-devel%{?_isa} %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.5.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Jan 2 2012 Jens Petersen - 0.5.3.1-6 - update to cabal2spec-0.25.2 - use _isa From 991696b1abb07e46d44c13fdf829eac7d21b29aa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 21 Mar 2012 23:34:45 +0900 Subject: [PATCH 042/107] rebuild --- ghc-zlib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 895edc2..94f4515 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -18,7 +18,7 @@ full zlib feature set. Name: ghc-%{pkg_name} # part of haskell-platform-2011.4.0.0 Version: 0.5.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -58,11 +58,14 @@ Requires: zlib-devel%{?_isa} %ghc_devel_post_postun -%ghc_files +%ghc_files LICENSE %doc examples %changelog +* Wed Mar 21 2012 Jens Petersen - 0.5.3.1-8 +- rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.5.3.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 34b1cb4a0f0e2d31f774651cbb2a0969db360475 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 21 Mar 2012 23:54:59 +0900 Subject: [PATCH 043/107] update to 0.5.3.3 --- .gitignore | 1 + ghc-zlib.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e6b89b1..7f833d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ zlib-0.5.2.0.tar.gz /zlib-0.5.3.1.tar.gz +/zlib-0.5.3.3.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 94f4515..c14d9b7 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -16,9 +16,9 @@ the few cases where more control is needed, it provides access to the\ full zlib feature set. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.4.0.0 -Version: 0.5.3.1 -Release: 8%{?dist} +# part of haskell-platform +Version: 0.5.3.3 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -63,6 +63,9 @@ Requires: zlib-devel%{?_isa} %changelog +* Wed Mar 21 2012 Jens Petersen - 0.5.3.3-1 +- update to 0.5.3.3 + * Wed Mar 21 2012 Jens Petersen - 0.5.3.1-8 - rebuild diff --git a/sources b/sources index 05b85ff..155868f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fb2988b112e38d04a527b892f770507 zlib-0.5.3.1.tar.gz +1649e56d13ce2c6a6a9210227401dbbc zlib-0.5.3.3.tar.gz From 83e00f58c4bb866324c419f6c03de8ad880d9e75 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2012 09:43:39 +0900 Subject: [PATCH 044/107] obsoleted by haskell-platform subpackage --- .gitignore | 3 - dead.package | 1 + ghc-zlib.spec | 201 -------------------------------------------------- sources | 1 - 4 files changed, 1 insertion(+), 205 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 ghc-zlib.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7f833d0..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -zlib-0.5.2.0.tar.gz -/zlib-0.5.3.1.tar.gz -/zlib-0.5.3.3.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..6dee5e4 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +obsoleted by haskell-platform subpackage diff --git a/ghc-zlib.spec b/ghc-zlib.spec deleted file mode 100644 index c14d9b7..0000000 --- a/ghc-zlib.spec +++ /dev/null @@ -1,201 +0,0 @@ -# cabal2spec-0.25.2 -# https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell - -%global pkg_name zlib - -%global common_summary Haskell compression and decompression library - -%global common_description This package provides a pure Haskell 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.\ -\ -It provides a convenient high level API suitable for most tasks. For\ -the few cases where more control is needed, it provides access to the\ -full zlib feature set. - -Name: ghc-%{pkg_name} -# part of haskell-platform -Version: 0.5.3.3 -Release: 1%{?dist} -Summary: %{common_summary} - -Group: System Environment/Libraries -License: BSD -# 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: %{ghc_arches} -BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec -BuildRequires: ghc-bytestring-prof -BuildRequires: zlib-devel%{?_isa} - -%description -%{common_description} - - -%prep -%setup -q -n %{pkg_name}-%{version} - - -%build -%ghc_lib_build - - -%install -%ghc_lib_install - - -%ghc_devel_package -Requires: zlib-devel%{?_isa} - -%ghc_devel_description - - -%ghc_devel_post_postun - - -%ghc_files LICENSE -%doc examples - - -%changelog -* Wed Mar 21 2012 Jens Petersen - 0.5.3.3-1 -- update to 0.5.3.3 - -* Wed Mar 21 2012 Jens Petersen - 0.5.3.1-8 -- rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.5.3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Jan 2 2012 Jens Petersen - 0.5.3.1-6 -- update to cabal2spec-0.25.2 -- use _isa -- include examples - -* Mon Oct 24 2011 Marcela Mašláňová - 0.5.3.1-5.3 -- rebuild with new gmp without compat lib - -* Fri Oct 21 2011 Marcela Mašláňová - 0.5.3.1-5.2 -- rebuild with new gmp without compat lib - -* Tue Oct 11 2011 Peter Schiffer - 0.5.3.1-5.1 -- rebuild with new gmp - -* Tue Jun 21 2011 Jens Petersen - 0.5.3.1-5 -- ghc_arches replaces ghc_excluded_archs - -* Mon Jun 20 2011 Jens Petersen - 0.5.3.1-4 -- BR ghc-Cabal-devel and use ghc_excluded_archs - -* Fri May 27 2011 Jens Petersen - 0.5.3.1-3 -- update to cabal2spec-0.23: add ppc64 - -* Thu Mar 10 2011 Fabio M. Di Nitto - 0.5.3.1-2 -- Enable build on sparcv9 - -* Tue Feb 15 2011 Jens Petersen - 0.5.3.1-1 -- update to 0.5.3.1 for haskell-platform-2011.1 - -* Tue Feb 08 2011 Fedora Release Engineering - 0.5.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 15 2011 Jens Petersen - 0.5.2.0-6 -- update to cabal2spec-0.22.4 - -* Thu Nov 25 2010 Jens Petersen - 0.5.2.0-5 -- rebuild with ghc-7.0.1 - -* Sat Sep 4 2010 Jens Petersen - 0.5.2.0-4 -- add hscolour and doc obsolete (cabal2spec-0.22.2) -- part of haskell-platform-2010.2.0.0 - -* Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 -- sync cabal2spec-0.22 - -* Sat Apr 24 2010 Jens Petersen - 0.5.2.0-2 -- part of haskell-platform-2010.1.0.0 -- rebuild against ghc-6.12.2 - -* Mon Jan 11 2010 Jens Petersen - 0.5.2.0-1 -- update to 0.5.2.0 (haskell-platform-2009.3.1) -- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: -- drop doc and prof bcond -- use common summary and common_description -- use ghc_lib_package and ghc_pkg_c_deps - -* Sat Dec 26 2009 Jens Petersen - 0.5.0.0-12 -- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0: -- use common_summary and common_description -- reenable debuginfo for stripping -- use ghc_requires, ghc_doc_requires, and ghc_prof_requires - -* Tue Dec 22 2009 Jens Petersen -- fix base Group and devel Summary -- only include docdir in devel if not shared build - -* Wed Dec 16 2009 Jens Petersen - 0.5.0.0-11 -- build for ghc-6.12.1 -- added shared library support: needs ghc-rpm-macros 0.3.1 -- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache - -* Fri Jul 24 2009 Fedora Release Engineering - 0.5.0.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat May 16 2009 Jens Petersen - 0.5.0.0-9 -- buildrequires ghc-rpm-macros (cabal2spec-0.16) - -* Fri Apr 24 2009 Jens Petersen - 0.5.0.0-8 -- sync with cabal2spec-0.14 - -* Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 -- update to cabal2spec-0.11: -- add devel subpackage -- use ix86 macro for archs and add alpha -- use global rather than define -- make devel subpackage own docdir for now - -* Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 9 2009 Jens Petersen - 0.5.0.0-5 -- rebuild to fix unexpanded post preun macros -- add doc subpackage and BR ghc-doc -- add doc requires(post) ghc-doc - -* Mon Dec 22 2008 Jens Petersen - 0.5.0.0-4 -- use bcond for doc and prof build flags (Till Maas, #426751) - -* Mon Dec 1 2008 Jens Petersen - 0.5.0.0-3 -- sync with lib template: - - add build_prof and build_doc - - prof requires main package - - update scriptlet macro names - -* Tue Nov 25 2008 Jens Petersen - 0.5.0.0-2 -- build with ghc-6.10.1 -- no longer buildrequire haddock09 -- provide devel -- add exclusivearch for current ghc archs -- reindex haddock docs only when uninstalling in postun - -* Tue Nov 11 2008 Bryan O'Sullivan - 0.5.0.0-1 -- Update to 0.5.0.0 - -* Thu Oct 23 2008 Jens Petersen - 0.4.0.4-2 -- update for current rawhide -- add pkg_docdir and remove hsc_name -- use haddock09 - -* Tue Oct 14 2008 Bryan O'Sullivan - 0.4.0.4-1 -- Revised to follow Haskell packaging guidelines - -* Sun Feb 17 2008 Yaakov Nemoy - 0.4.0.2-1 -- added in url - -* Sun Feb 17 2008 cabal-rpm - 0.4.0.2-1 -- spec file autogenerated by cabal-rpm diff --git a/sources b/sources deleted file mode 100644 index 155868f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -1649e56d13ce2c6a6a9210227401dbbc zlib-0.5.3.3.tar.gz From 47a3cf1a53f4de38d2a5815c9d8aff27a20b8edb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Dec 2013 17:17:32 +1000 Subject: [PATCH 045/107] import re-review - unsplit from haskell-platform (#1023706) --- .gitignore | 1 + dead.package | 1 - ghc-zlib.spec | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 ghc-zlib.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..97915a4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/zlib-0.5.4.1.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 6dee5e4..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -obsoleted by haskell-platform subpackage diff --git a/ghc-zlib.spec b/ghc-zlib.spec new file mode 100644 index 0000000..3fc4f83 --- /dev/null +++ b/ghc-zlib.spec @@ -0,0 +1,218 @@ +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name zlib + +Name: ghc-%{pkg_name} +# part of haskell-platform +Version: 0.5.4.1 +Release: 26%{?dist} +Summary: Compression and decompression in the gzip and zlib formats + +License: BSD +URL: http://hackage.haskell.org/package/%{pkg_name} +Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-bytestring-devel +BuildRequires: zlib-devel%{?_isa} +# End cabal-rpm deps + +%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. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} +# Begin cabal-rpm deps: +Requires: zlib-devel%{?_isa} +# End cabal-rpm deps + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files +%doc examples + + +%changelog +* Sun Oct 27 2013 Jens Petersen - 0.5.4.1-26 +- tidy description + +* Sun Oct 27 2013 Jens Petersen - 0.5.4.1-25 +- spec file updated with cabal-rpm-0.8.6 + +* Wed Mar 21 2012 Jens Petersen - 0.5.3.3-1 +- update to 0.5.3.3 + +* Wed Mar 21 2012 Jens Petersen - 0.5.3.1-8 +- rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.5.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jan 2 2012 Jens Petersen - 0.5.3.1-6 +- update to cabal2spec-0.25.2 +- use _isa +- include examples + +* Mon Oct 24 2011 Marcela Mašláňová - 0.5.3.1-5.3 +- rebuild with new gmp without compat lib + +* Fri Oct 21 2011 Marcela Mašláňová - 0.5.3.1-5.2 +- rebuild with new gmp without compat lib + +* Tue Oct 11 2011 Peter Schiffer - 0.5.3.1-5.1 +- rebuild with new gmp + +* Tue Jun 21 2011 Jens Petersen - 0.5.3.1-5 +- ghc_arches replaces ghc_excluded_archs + +* Mon Jun 20 2011 Jens Petersen - 0.5.3.1-4 +- BR ghc-Cabal-devel and use ghc_excluded_archs + +* Fri May 27 2011 Jens Petersen - 0.5.3.1-3 +- update to cabal2spec-0.23: add ppc64 + +* Thu Mar 10 2011 Fabio M. Di Nitto - 0.5.3.1-2 +- Enable build on sparcv9 + +* Tue Feb 15 2011 Jens Petersen - 0.5.3.1-1 +- update to 0.5.3.1 for haskell-platform-2011.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 0.5.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 15 2011 Jens Petersen - 0.5.2.0-6 +- update to cabal2spec-0.22.4 + +* Thu Nov 25 2010 Jens Petersen - 0.5.2.0-5 +- rebuild with ghc-7.0.1 + +* Sat Sep 4 2010 Jens Petersen - 0.5.2.0-4 +- add hscolour and doc obsolete (cabal2spec-0.22.2) +- part of haskell-platform-2010.2.0.0 + +* Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 +- sync cabal2spec-0.22 + +* Sat Apr 24 2010 Jens Petersen - 0.5.2.0-2 +- part of haskell-platform-2010.1.0.0 +- rebuild against ghc-6.12.2 + +* Mon Jan 11 2010 Jens Petersen - 0.5.2.0-1 +- update to 0.5.2.0 (haskell-platform-2009.3.1) +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use common summary and common_description +- use ghc_lib_package and ghc_pkg_c_deps + +* Sat Dec 26 2009 Jens Petersen - 0.5.0.0-12 +- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0: +- use common_summary and common_description +- reenable debuginfo for stripping +- use ghc_requires, ghc_doc_requires, and ghc_prof_requires + +* Tue Dec 22 2009 Jens Petersen +- fix base Group and devel Summary +- only include docdir in devel if not shared build + +* Wed Dec 16 2009 Jens Petersen - 0.5.0.0-11 +- build for ghc-6.12.1 +- added shared library support: needs ghc-rpm-macros 0.3.1 +- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache + +* Fri Jul 24 2009 Fedora Release Engineering - 0.5.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat May 16 2009 Jens Petersen - 0.5.0.0-9 +- buildrequires ghc-rpm-macros (cabal2spec-0.16) + +* Fri Apr 24 2009 Jens Petersen - 0.5.0.0-8 +- sync with cabal2spec-0.14 + +* Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 +- update to cabal2spec-0.11: +- add devel subpackage +- use ix86 macro for archs and add alpha +- use global rather than define +- make devel subpackage own docdir for now + +* Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 9 2009 Jens Petersen - 0.5.0.0-5 +- rebuild to fix unexpanded post preun macros +- add doc subpackage and BR ghc-doc +- add doc requires(post) ghc-doc + +* Mon Dec 22 2008 Jens Petersen - 0.5.0.0-4 +- use bcond for doc and prof build flags (Till Maas, #426751) + +* Mon Dec 1 2008 Jens Petersen - 0.5.0.0-3 +- sync with lib template: + - add build_prof and build_doc + - prof requires main package + - update scriptlet macro names + +* Tue Nov 25 2008 Jens Petersen - 0.5.0.0-2 +- build with ghc-6.10.1 +- no longer buildrequire haddock09 +- provide devel +- add exclusivearch for current ghc archs +- reindex haddock docs only when uninstalling in postun + +* Tue Nov 11 2008 Bryan O'Sullivan - 0.5.0.0-1 +- Update to 0.5.0.0 + +* Thu Oct 23 2008 Jens Petersen - 0.4.0.4-2 +- update for current rawhide +- add pkg_docdir and remove hsc_name +- use haddock09 + +* Tue Oct 14 2008 Bryan O'Sullivan - 0.4.0.4-1 +- Revised to follow Haskell packaging guidelines + +* Sun Feb 17 2008 Yaakov Nemoy - 0.4.0.2-1 +- added in url + +* Sun Feb 17 2008 cabal-rpm - 0.4.0.2-1 +- spec file autogenerated by cabal-rpm diff --git a/sources b/sources new file mode 100644 index 0000000..314d227 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +d0d10786d2bbd1d401a8b28a83e88475 zlib-0.5.4.1.tar.gz From d14c65ab2ab979a531335d5a8b4cab7af59a159c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Dec 2013 17:44:02 +1000 Subject: [PATCH 046/107] bump release --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 3fc4f83..53d4a0e 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -5,7 +5,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.5.4.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -74,6 +74,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Dec 4 2013 Jens Petersen - 0.5.4.1-27 +- bump release + * Sun Oct 27 2013 Jens Petersen - 0.5.4.1-26 - tidy description From 2a0a06d7074eefd46553b97845f9a7c1dbd34a62 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:32:23 -0500 Subject: [PATCH 047/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 53d4a0e..edf224d 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -5,7 +5,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.5.4.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -74,6 +74,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.4.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Dec 4 2013 Jens Petersen - 0.5.4.1-27 - bump release From b007f24d1db9324296c53d7f1302c762dd0869ad Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 16:15:18 +0000 Subject: [PATCH 048/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index edf224d..c036e3c 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -5,7 +5,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.5.4.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -74,6 +74,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.5.4.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.5.4.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 331d007e8afa1c9d8a707cfa2985ea2a9c703ba3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 27 Oct 2014 12:20:46 +0900 Subject: [PATCH 049/107] disable debuginfo --- ghc-zlib.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index c036e3c..1ff86ea 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -2,10 +2,13 @@ %global pkg_name zlib +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.5.4.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -22,7 +25,7 @@ BuildRequires: zlib-devel%{?_isa} %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 +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 @@ -74,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Oct 27 2014 Jens Petersen - 0.5.4.1-30 +- disable debuginfo + * Sat Aug 16 2014 Fedora Release Engineering - 0.5.4.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From a65c971e89e78cad06c025b09ebbfb8684dc67e5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 27 Oct 2014 12:21:22 +0900 Subject: [PATCH 050/107] mention cblrpm-0.8.11 refresh --- ghc-zlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 1ff86ea..7d4c6ef 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -78,7 +78,7 @@ This package provides the Haskell %{pkg_name} library development files. %changelog * Mon Oct 27 2014 Jens Petersen - 0.5.4.1-30 -- disable debuginfo +- disable debuginfo (cblrpm-0.8.11) * Sat Aug 16 2014 Fedora Release Engineering - 0.5.4.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 7ec975013d2cd15270111ef5108e79c90e1620cd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 17 Feb 2015 11:05:25 +0900 Subject: [PATCH 051/107] remove the copy library in %prep --- ghc-zlib.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 7d4c6ef..e64aed1 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -51,6 +51,9 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +#remove the copy library +rm -r cbits + %build %ghc_lib_build @@ -77,6 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Feb 17 2015 Jens Petersen +- remove the copy library in prep + * Mon Oct 27 2014 Jens Petersen - 0.5.4.1-30 - disable debuginfo (cblrpm-0.8.11) From 49553080e3cd6c03639fc503ad3d3822be51e4cf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 08:07:55 +0000 Subject: [PATCH 052/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index e64aed1..b9a7f55 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.5.4.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -80,6 +80,9 @@ rm -r cbits %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.5.4.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Feb 17 2015 Jens Petersen - remove the copy library in prep From 155b250d04e46c6a744cbbd115ba03795aa967d2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 16 Sep 2015 14:04:32 +0900 Subject: [PATCH 053/107] update to 0.5.4.2 --- .gitignore | 1 + ghc-zlib.spec | 18 ++++++++++-------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 97915a4..f1dd24e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zlib-0.5.4.1.tar.gz +/zlib-0.5.4.2.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index b9a7f55..b85730e 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -2,18 +2,15 @@ %global pkg_name zlib -# no useful debuginfo for Haskell packages without C sources -%global debug_package %{nil} - Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.5.4.1 -Release: 31%{?dist} +Version: 0.5.4.2 +Release: 1%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -62,6 +59,8 @@ rm -r cbits %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %post devel %ghc_pkg_recache @@ -72,7 +71,7 @@ rm -r cbits %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files @@ -80,6 +79,9 @@ rm -r cbits %changelog +* Wed Sep 16 2015 Jens Petersen - 0.5.4.2-1 +- update to 0.5.4.2 for ghc-7.10 + * Wed Jun 17 2015 Fedora Release Engineering - 0.5.4.1-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 314d227..8b25baf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0d10786d2bbd1d401a8b28a83e88475 zlib-0.5.4.1.tar.gz +79f01f01f859b0ef68d5787756d181c1 zlib-0.5.4.2.tar.gz From 9761796035a10a5b1e7674773a3e8434e2317fbb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:50:14 +0900 Subject: [PATCH 054/107] Reverting "update to 0.5.4.2" This reverts commit 155b250d04e46c6a744cbbd115ba03795aa967d2. --- .gitignore | 1 - ghc-zlib.spec | 18 ++++++++---------- sources | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index f1dd24e..97915a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /zlib-0.5.4.1.tar.gz -/zlib-0.5.4.2.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index b85730e..b9a7f55 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -2,15 +2,18 @@ %global pkg_name zlib +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.5.4.2 -Release: 1%{?dist} +Version: 0.5.4.1 +Release: 31%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD -Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +URL: http://hackage.haskell.org/package/%{pkg_name} +Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -59,8 +62,6 @@ rm -r cbits %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %post devel %ghc_pkg_recache @@ -71,7 +72,7 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc LICENSE %files devel -f %{name}-devel.files @@ -79,9 +80,6 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %changelog -* Wed Sep 16 2015 Jens Petersen - 0.5.4.2-1 -- update to 0.5.4.2 for ghc-7.10 - * Wed Jun 17 2015 Fedora Release Engineering - 0.5.4.1-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 8b25baf..314d227 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79f01f01f859b0ef68d5787756d181c1 zlib-0.5.4.2.tar.gz +d0d10786d2bbd1d401a8b28a83e88475 zlib-0.5.4.1.tar.gz From 3ba2e1c92037893ceba713863b8c6a09c37b67e9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:50:21 +0000 Subject: [PATCH 055/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index b9a7f55..4247efe 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.5.4.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -80,6 +80,9 @@ rm -r cbits %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.5.4.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.5.4.1-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From e21f2eea079d6ba37bf8ec583bd5469f255f35f4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 6 Jun 2016 18:31:31 +0900 Subject: [PATCH 056/107] update to 0.5.4.2 This reverts commit 9761796035a10a5b1e7674773a3e8434e2317fbb. --- .gitignore | 1 + ghc-zlib.spec | 18 ++++++++++-------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 97915a4..f1dd24e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zlib-0.5.4.1.tar.gz +/zlib-0.5.4.2.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 4247efe..f5574c9 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -2,18 +2,15 @@ %global pkg_name zlib -# no useful debuginfo for Haskell packages without C sources -%global debug_package %{nil} - Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.5.4.1 -Release: 32%{?dist} +Version: 0.5.4.2 +Release: 1%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -62,6 +59,8 @@ rm -r cbits %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %post devel %ghc_pkg_recache @@ -72,7 +71,7 @@ rm -r cbits %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files @@ -80,6 +79,9 @@ rm -r cbits %changelog +* Mon Jun 6 2016 Jens Petersen - 0.5.4.2-1 +- update to 0.5.4.2 for ghc-7.10 + * Wed Feb 03 2016 Fedora Release Engineering - 0.5.4.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 314d227..8b25baf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0d10786d2bbd1d401a8b28a83e88475 zlib-0.5.4.1.tar.gz +79f01f01f859b0ef68d5787756d181c1 zlib-0.5.4.2.tar.gz From 6ba68edb3f8fe6e14d0863815462fa5b07732fbe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 26 Jun 2016 20:28:33 +0900 Subject: [PATCH 057/107] update to 0.6.1.1 --- .gitignore | 1 + ghc-zlib.spec | 21 +++++++++++++++++++-- sources | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f1dd24e..691fd09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /zlib-0.5.4.1.tar.gz /zlib-0.5.4.2.tar.gz +/zlib-0.6.1.1.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index f5574c9..28b5cca 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,10 +1,11 @@ +# generated by cabal-rpm-0.9.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name zlib Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.5.4.2 +Version: 0.6.1.1 Release: 1%{?dist} Summary: Compression and decompression in the gzip and zlib formats @@ -17,6 +18,13 @@ BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: zlib-devel%{?_isa} +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel +%endif # End cabal-rpm deps %description @@ -62,6 +70,12 @@ rm -r cbits rm %{buildroot}%{ghc_pkgdocdir}/LICENSE +%check +%if %{with tests} +%cabal test +%endif + + %post devel %ghc_pkg_recache @@ -75,10 +89,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files devel -f %{name}-devel.files -%doc examples +%doc changelog examples %changelog +* Sun Jun 26 2016 Jens Petersen - 0.6.1.1-1 +- update to 0.6.1.1 + * Mon Jun 6 2016 Jens Petersen - 0.5.4.2-1 - update to 0.5.4.2 for ghc-7.10 diff --git a/sources b/sources index 8b25baf..7df9756 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79f01f01f859b0ef68d5787756d181c1 zlib-0.5.4.2.tar.gz +d841c86562542a55dd086df69764ee17 zlib-0.6.1.1.tar.gz From fa9be64e4d1d75c423246c2401159ccc4c370567 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:58 +0900 Subject: [PATCH 058/107] no longer remove license; use cabal_test --- ghc-zlib.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 28b5cca..97b0f32 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -67,13 +67,9 @@ rm -r cbits %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel From a8d466e835c7ef078f7909bb467cc24b61e46d92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:54:28 +0000 Subject: [PATCH 059/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 97b0f32..d039477 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.6.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -89,6 +89,9 @@ rm -r cbits %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Jun 26 2016 Jens Petersen - 0.6.1.1-1 - update to 0.6.1.1 From cef84c4e233abb0e34be1b5233bae0240c130d0d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 10:06:54 +0900 Subject: [PATCH 060/107] update to 0.6.1.2 --- .gitignore | 1 + ghc-zlib.spec | 21 ++++++++++++--------- sources | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 691fd09..cf647d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /zlib-0.5.4.1.tar.gz /zlib-0.5.4.2.tar.gz /zlib-0.6.1.1.tar.gz +/zlib-0.6.1.2.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d039477..c8af97e 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,17 +1,18 @@ -# generated by cabal-rpm-0.9.12 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name zlib +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.6.1.1 -Release: 2%{?dist} +Version: 0.6.1.2 +Release: 1%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -19,7 +20,6 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-bytestring-devel BuildRequires: zlib-devel%{?_isa} %if %{with tests} -BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel @@ -29,9 +29,9 @@ BuildRequires: ghc-tasty-quickcheck-devel %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. +streams of data represented as lazy 'ByteString's. It uses the + 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 @@ -54,7 +54,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} #remove the copy library rm -r cbits @@ -89,6 +89,9 @@ rm -r cbits %changelog +* Wed Feb 22 2017 Jens Petersen - 0.6.1.2-1 +- update to 0.6.1.2 + * Fri Feb 10 2017 Fedora Release Engineering - 0.6.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 7df9756..36677d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d841c86562542a55dd086df69764ee17 zlib-0.6.1.1.tar.gz +SHA512 (zlib-0.6.1.2.tar.gz) = 0034eb1297eaf20ab64e5cbfc835cee1985d34bc248325bf57f7bf5cdf2918ab72f339fe5b8b3f5f16dee862f190e0c71612960b9021cf2ca70c951788b73fc1 From ac88046ced03a36357f2ceac33b174733b9145dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 10:03:01 +0000 Subject: [PATCH 061/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index c8af97e..f9c9232 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.6.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -89,6 +89,9 @@ rm -r cbits %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.6.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jens Petersen - 0.6.1.2-1 - update to 0.6.1.2 From 0dde1a4494f18b0980a65d540bf663a6e796c188 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:38:32 +0000 Subject: [PATCH 062/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index f9c9232..81122e0 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.6.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -89,6 +89,9 @@ rm -r cbits %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.6.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.6.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e38f38b8d5194743e50477da675b9ff488c2dca3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:27 +0100 Subject: [PATCH 063/107] refresh to cabal-rpm-0.12.1 --- ghc-zlib.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 81122e0..83c402a 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name zlib @@ -41,9 +41,12 @@ set. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} # Begin cabal-rpm deps: Requires: zlib-devel%{?_isa} @@ -72,6 +75,12 @@ rm -r cbits %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From bbfb2b6f78024a45e442f2c02e048bb59184b593 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 12:07:42 +0100 Subject: [PATCH 064/107] bump release --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 83c402a..abdec6a 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.6.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -98,6 +98,9 @@ rm -r cbits %changelog +* Fri Jan 26 2018 Jens Petersen - 0.6.1.2-4 +- rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 0.6.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 60d587dd8f61b6059bb9d904dd7954649a401fb2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:53 +0900 Subject: [PATCH 065/107] drop ldconfig scriptlets --- ghc-zlib.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index abdec6a..2d7fc0c 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -75,12 +75,6 @@ rm -r cbits %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From a6baeac12eaca3ed54aa5e3bef0e2ea35cf58132 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:24:45 +0000 Subject: [PATCH 066/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 2d7fc0c..27d61ed 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.6.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -92,6 +92,9 @@ rm -r cbits %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.6.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Jens Petersen - 0.6.1.2-4 - rebuild From 585d9b939c0a1cbf98a7b7e031154eb7b0e9ba4f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 15 Feb 2018 13:20:44 +0900 Subject: [PATCH 067/107] remove %_isa from buildrequires (#1545183) --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 27d61ed..5bc4086 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -18,7 +18,7 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel -BuildRequires: zlib-devel%{?_isa} +BuildRequires: zlib-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-tasty-devel @@ -92,6 +92,9 @@ rm -r cbits %changelog +* Thu Feb 15 2018 Jens Petersen - 0.6.1.2-5 +- remove _isa from buildrequires (#1545183) + * Wed Feb 07 2018 Fedora Release Engineering - 0.6.1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b13eab78d6e7d73478eac2fe7870edd23ee6f6f6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 15 Feb 2018 13:21:39 +0900 Subject: [PATCH 068/107] bump release --- ghc-zlib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 5bc4086..3ef5883 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.6.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -92,7 +92,7 @@ rm -r cbits %changelog -* Thu Feb 15 2018 Jens Petersen - 0.6.1.2-5 +* Thu Feb 15 2018 Jens Petersen - 0.6.1.2-6 - remove _isa from buildrequires (#1545183) * Wed Feb 07 2018 Fedora Release Engineering - 0.6.1.2-5 From 8d07e5edc0976ed3bd877f723e064ed9982375e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:18:39 +0000 Subject: [PATCH 069/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 3ef5883..9f0e260 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.6.1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -92,6 +92,9 @@ rm -r cbits %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.6.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 15 2018 Jens Petersen - 0.6.1.2-6 - remove _isa from buildrequires (#1545183) From afb62089e089411de9d19972f1f771600419f5ee Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 00:24:28 +0900 Subject: [PATCH 070/107] remove part of haskell-platform comment --- ghc-zlib.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 9f0e260..0f02e1f 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -5,7 +5,6 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -# part of haskell-platform Version: 0.6.1.2 Release: 7%{?dist} Summary: Compression and decompression in the gzip and zlib formats From 10528eb724a2d71ea73bfa7c45901c17962bbf15 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 23:40:17 +0900 Subject: [PATCH 071/107] update to 0.6.2 --- .gitignore | 1 + ghc-zlib.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cf647d6..30787b4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /zlib-0.5.4.2.tar.gz /zlib-0.6.1.1.tar.gz /zlib-0.6.1.2.tar.gz +/zlib-0.6.2.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 0f02e1f..f6e5867 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,12 +1,12 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name zlib %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.6.1.2 -Release: 7%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -91,6 +91,9 @@ rm -r cbits %changelog +* Sun Jul 22 2018 Jens Petersen - 0.6.2-1 +- update to 0.6.2 + * Fri Jul 13 2018 Fedora Release Engineering - 0.6.1.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 36677d4..d1095ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-0.6.1.2.tar.gz) = 0034eb1297eaf20ab64e5cbfc835cee1985d34bc248325bf57f7bf5cdf2918ab72f339fe5b8b3f5f16dee862f190e0c71612960b9021cf2ca70c951788b73fc1 +SHA512 (zlib-0.6.2.tar.gz) = b899bcc2b015f83d0327915a1d48a76faeea086ed3fefd2b7a10db417d9929afbca2bc5b127bec22e360181abef55a91374d83262b10bbac43ccb99e3b4759e3 From 57a89390c4e4557c0676f56d4d248dab81c5df7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:17:44 +0000 Subject: [PATCH 072/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index f6e5867..e8986dd 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -91,6 +91,9 @@ rm -r cbits %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jul 22 2018 Jens Petersen - 0.6.2-1 - update to 0.6.2 From dc302ed267aebdb314d67a56a07a3beb0b32338f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:48:03 +0800 Subject: [PATCH 073/107] refresh to cabal-rpm-0.13 --- ghc-zlib.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index e8986dd..9b98d3c 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,21 +1,25 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name zlib %global pkgver %{pkg_name}-%{version} +%bcond_with tests + Name: ghc-%{pkg_name} Version: 0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: zlib-devel %if %{with tests} @@ -56,18 +60,23 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} - +# End cabal-rpm setup #remove the copy library rm -r cbits %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %check @@ -83,7 +92,9 @@ rm -r cbits %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -91,6 +102,9 @@ rm -r cbits %changelog +* Sun Feb 17 2019 Jens Petersen - 0.6.2-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 964b3e4f882714835c37ba157363ef40d9ee891c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:18:08 +0000 Subject: [PATCH 074/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 9b98d3c..be4d4af 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -102,6 +102,9 @@ rm -r cbits %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.6.2-3 - refresh to cabal-rpm-0.13 From 3f4ad4f722cef66c6c7ccb56e8a2df34c1179caf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:27:18 +0000 Subject: [PATCH 075/107] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-zlib.spec | 53 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index be4d4af..7d1968e 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name zlib @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -19,6 +19,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-bytestring-devel BuildRequires: zlib-devel @@ -44,11 +50,8 @@ set. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} # Begin cabal-rpm deps: @@ -59,6 +62,25 @@ Requires: zlib-devel%{?_isa} This package provides the Haskell %{pkg_name} library development files. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation + +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -83,14 +105,6 @@ rm -r cbits %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -101,7 +115,20 @@ rm -r cbits %doc changelog examples +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog +* Fri Aug 02 2019 Jens Petersen - 0.6.2-5 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.6.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5f04c1d4c9ae68073d9c9bb002399be36500c672 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:33:17 +0800 Subject: [PATCH 076/107] BR prof for lib and static for executable --- ghc-zlib.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 7d1968e..dd967e8 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name zlib @@ -19,14 +19,9 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros -BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof BuildRequires: zlib-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel @@ -50,6 +45,7 @@ set. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From c3996e340d141c9385f2f669c4e8b426c11ca14f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 13 Aug 2019 15:48:25 +0200 Subject: [PATCH 077/107] comment about disabled tests --- ghc-zlib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index dd967e8..004d63e 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -4,6 +4,7 @@ %global pkg_name zlib %global pkgver %{pkg_name}-%{version} +# old tasty* upperbounds %bcond_with tests Name: ghc-%{pkg_name} From 8ade92caa125b7e0e649616c22d0c4d3c4d413ea Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 13 Aug 2019 17:53:10 +0200 Subject: [PATCH 078/107] enable testsuite using new cabal-tweak-remove-upperbound --- ghc-zlib.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 004d63e..98c4523 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -4,8 +4,7 @@ %global pkg_name zlib %global pkgver %{pkg_name}-%{version} -# old tasty* upperbounds -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} Version: 0.6.2 @@ -84,6 +83,11 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm setup #remove the copy library rm -r cbits +%if %{with tests} +cabal-tweak-remove-upperbound tasty +cabal-tweak-remove-upperbound tasty-hunit +cabal-tweak-remove-upperbound tasty-quickcheck +%endif %build From 72a492bda28935142c83b6da0e414939d7d58f4b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 14 Aug 2019 13:42:46 +0200 Subject: [PATCH 079/107] bump --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 98c4523..0a6ba43 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -127,6 +127,9 @@ cabal-tweak-remove-upperbound tasty-quickcheck %changelog +* Wed Aug 14 2019 Jens Petersen - 0.6.2-6 +- enable testsuite + * Fri Aug 02 2019 Jens Petersen - 0.6.2-5 - add doc and prof subpackages (cabal-rpm-1.0.0) From 6e408f4b82b06ecf46ec561652bfa4ef66a5d283 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 14 Aug 2019 16:48:53 +0200 Subject: [PATCH 080/107] disable testsuite since it caused ABI hash change --- ghc-zlib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 0a6ba43..0e16e1c 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -4,11 +4,11 @@ %global pkg_name zlib %global pkgver %{pkg_name}-%{version} -%bcond_without tests +%bcond_with tests Name: ghc-%{pkg_name} Version: 0.6.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -127,6 +127,9 @@ cabal-tweak-remove-upperbound tasty-quickcheck %changelog +* Wed Aug 14 2019 Jens Petersen - 0.6.2-7 +- disable testsuite since it caused ABI hash change + * Wed Aug 14 2019 Jens Petersen - 0.6.2-6 - enable testsuite From 6d27e4088ad4d9c09dd966f58b2bf5a5c3bf3900 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 14 Aug 2019 18:15:25 +0200 Subject: [PATCH 081/107] run testsuite in CI --- ghc-zlib.spec | 9 ++++----- tests/simple/runtest.sh | 11 +++++++++++ tests/tests.yaml | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100755 tests/simple/runtest.sh create mode 100644 tests/tests.yaml diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 0e16e1c..b538210 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -83,11 +83,10 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm setup #remove the copy library rm -r cbits -%if %{with tests} -cabal-tweak-remove-upperbound tasty -cabal-tweak-remove-upperbound tasty-hunit -cabal-tweak-remove-upperbound tasty-quickcheck -%endif +# upperbounds +cabal-tweak-dep-ver tasty '< 0.12' '< 1.3' +cabal-tweak-dep-ver tasty-hunit '< 0.10' '< 0.11' +cabal-tweak-dep-ver tasty-quickcheck '== 0.8.*' '> 0.8' %build diff --git a/tests/simple/runtest.sh b/tests/simple/runtest.sh new file mode 100755 index 0000000..6ca8bfc --- /dev/null +++ b/tests/simple/runtest.sh @@ -0,0 +1,11 @@ +#!/usr/bin/sh +set -ex + +SOURCEDIR=$1 + +cd "${SOURCEDIR}" || exit 1 + +cabal update +cabal install --enable-tests --only-dependencies + +cabal test diff --git a/tests/tests.yaml b/tests/tests.yaml new file mode 100644 index 0000000..f2f636a --- /dev/null +++ b/tests/tests.yaml @@ -0,0 +1,20 @@ +--- +- hosts: localhost + roles: + - role: standard-test-source + tags: + - classic + + - role: standard-test-basic + tags: + - classic + required_packages: + - cabal-install + - ghc-tasty-hunit-devel + - ghc-tasty-quickcheck-devel + - ghc-zlib-devel + tests: + - simple: + dir: simple + run: ./runtest.sh {{ tenv_workdir }}/source/ +... From 9efe28454e5468dbf4721a8bc09f6ca2133afea6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Aug 2019 17:06:39 +0300 Subject: [PATCH 082/107] tweak tasty bounds comment --- ghc-zlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index b538210..19808bf 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -83,7 +83,7 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm setup #remove the copy library rm -r cbits -# upperbounds +# allow newer tasty cabal-tweak-dep-ver tasty '< 0.12' '< 1.3' cabal-tweak-dep-ver tasty-hunit '< 0.10' '< 0.11' cabal-tweak-dep-ver tasty-quickcheck '== 0.8.*' '> 0.8' From 7cccf1b291276d15fafcc7bb57f254ee2bfcf17e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Aug 2019 02:02:41 +0300 Subject: [PATCH 083/107] bump for rebuild --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 19808bf..4830c20 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -126,6 +126,9 @@ cabal-tweak-dep-ver tasty-quickcheck '== 0.8.*' '> 0.8' %changelog +* Wed Aug 28 2019 Jens Petersen - 0.6.2-8 +- bump the tasty upperbounds instead of removing + * Wed Aug 14 2019 Jens Petersen - 0.6.2-7 - disable testsuite since it caused ABI hash change From 25dd953cf2e3703e12e1d774c4ff3e17371c28c7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Sep 2019 16:24:23 +0800 Subject: [PATCH 084/107] rename tests.yaml to tests.yml --- tests/{tests.yaml => tests.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{tests.yaml => tests.yml} (100%) diff --git a/tests/tests.yaml b/tests/tests.yml similarity index 100% rename from tests/tests.yaml rename to tests/tests.yml From a1bda226c7fbf873f5739ab250645d4e35e0ef78 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Sep 2019 17:34:25 +0800 Subject: [PATCH 085/107] tests: requires ghc-rpm-macros --- tests/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests.yml b/tests/tests.yml index f2f636a..ed61081 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -13,6 +13,7 @@ - ghc-tasty-hunit-devel - ghc-tasty-quickcheck-devel - ghc-zlib-devel + - ghc-rpm-macros tests: - simple: dir: simple From 5fc1633b8755f53dcd027275ef7762bc7e7ce250 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Sep 2019 18:39:48 +0800 Subject: [PATCH 086/107] tests: switch to fetch_only for source https://pagure.io/standard-test-roles/blob/master/f/roles/standard-test-source --- tests/tests.yml | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index ed61081..c10bd63 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,21 +1,40 @@ --- - hosts: localhost - roles: - - role: standard-test-source - tags: - - classic + tags: + - classic + vars: + # standard-test-basic directory for tests are relative to {{ tenv_workdir }} + tenv_workdir: /var/test + pre_tasks: + - import_role: + name: standard-test-source + vars: + fetch_only: True + + - name: Copy files including source to test environment + synchronize: + src: "{{ playbook_dir }}/.." + dest: "{{ tenv_workdir }}" + mode: push + ssh_args: "-o UserKnownHostsFile=/dev/null" + roles: - role: standard-test-basic - tags: - - classic required_packages: - cabal-install - ghc-tasty-hunit-devel - ghc-tasty-quickcheck-devel - ghc-zlib-devel - ghc-rpm-macros + - rpm-build tests: - - simple: + - prepare-source: + dir: ./ + run: rpmbuild -bp {{ tenv_workdir }}/*.spec --nodeps --define "_sourcedir {{ tenv_workdir }}" --define "_builddir {{ tenv_workdir }}/source" + - flatten-source: + dir: ./ + run: shopt -s dotglob; mv {{ tenv_workdir }}/source/*/* {{ tenv_workdir }}/source + - smoke: dir: simple run: ./runtest.sh {{ tenv_workdir }}/source/ ... From d9fadc1cba62d9164a29cb9f175d5561b13f8768 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:47:30 +0000 Subject: [PATCH 087/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 4830c20..39099cd 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -126,6 +126,9 @@ cabal-tweak-dep-ver tasty-quickcheck '== 0.8.*' '> 0.8' %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.6.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Aug 28 2019 Jens Petersen - 0.6.2-8 - bump the tasty upperbounds instead of removing From de06efeb3ebe41e86efe3fbe39d70d15dc1cc5de Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:53:07 +0800 Subject: [PATCH 088/107] refresh to cabal-rpm-2.0.2 --- ghc-zlib.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 39099cd..b1f602f 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name zlib @@ -61,6 +61,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -71,6 +72,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -105,6 +107,16 @@ cabal-tweak-dep-ver tasty-quickcheck '== 0.8.*' '> 0.8' %cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -117,6 +129,7 @@ cabal-tweak-dep-ver tasty-quickcheck '== 0.8.*' '> 0.8' %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 63bce8c8322f33466d409149b5b408ce856c7428 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 12:39:23 +0800 Subject: [PATCH 089/107] update to 0.6.2.1 --- .gitignore | 1 + ghc-zlib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 30787b4..09c4d2e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /zlib-0.6.1.1.tar.gz /zlib-0.6.1.2.tar.gz /zlib-0.6.2.tar.gz +/zlib-0.6.2.1.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index b1f602f..aecf91b 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.2 -Release: 9%{?dist} +Version: 0.6.2.1 +Release: 1%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -139,6 +139,9 @@ cabal-tweak-dep-ver tasty-quickcheck '== 0.8.*' '> 0.8' %changelog +* Fri Feb 14 2020 Jens Petersen - 0.6.2.1-1 +- update to 0.6.2.1 + * Tue Jan 28 2020 Fedora Release Engineering - 0.6.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d1095ce..357f34f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-0.6.2.tar.gz) = b899bcc2b015f83d0327915a1d48a76faeea086ed3fefd2b7a10db417d9929afbca2bc5b127bec22e360181abef55a91374d83262b10bbac43ccb99e3b4759e3 +SHA512 (zlib-0.6.2.1.tar.gz) = cee7942a86afbd08f03c19abd88154cc866a3ccc52342264d4d5b28a71643adf30bf03ba939d6a98b7c065752f9ec326729fc38cfe72b66998551c89186048c5 From 0ce88f1733cf60fe8f751caec65ef1b16f351881 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 20 Feb 2020 12:13:57 +0800 Subject: [PATCH 090/107] drop tasty bound tweaks --- ghc-zlib.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index aecf91b..11ef138 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -85,10 +85,6 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm setup #remove the copy library rm -r cbits -# allow newer tasty -cabal-tweak-dep-ver tasty '< 0.12' '< 1.3' -cabal-tweak-dep-ver tasty-hunit '< 0.10' '< 0.11' -cabal-tweak-dep-ver tasty-quickcheck '== 0.8.*' '> 0.8' %build From 74eb164a63507087745b87feff10bce4c71c4d3a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:29:18 +0800 Subject: [PATCH 091/107] refresh to cabal-rpm-2.0.5 --- ghc-zlib.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 11ef138..67b61ea 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name zlib %global pkgver %{pkg_name}-%{version} @@ -96,6 +96,7 @@ rm -r cbits %install # Begin cabal-rpm install %ghc_lib_install +chmod a-x changelog # End cabal-rpm install From 2b34cfc5850a09d79dc51ff1204d709b0523a548 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:57:55 +0800 Subject: [PATCH 092/107] refresh to cabal-rpm-2.0.6 --- ghc-zlib.spec | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 67b61ea..ca95b3e 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name zlib @@ -82,6 +82,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +chmod a-x changelog # End cabal-rpm setup #remove the copy library rm -r cbits @@ -96,7 +97,6 @@ rm -r cbits %install # Begin cabal-rpm install %ghc_lib_install -chmod a-x changelog # End cabal-rpm install @@ -104,16 +104,6 @@ chmod a-x changelog %cabal_test -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From 89124c0c49a09349366600ac645f45fd4ac8dd80 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 16:38:02 +0800 Subject: [PATCH 093/107] add revision --- ghc-zlib.spec | 2 + zlib-0.6.2.1.cabal | 111 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 zlib-0.6.2.1.cabal diff --git a/ghc-zlib.spec b/ghc-zlib.spec index ca95b3e..f5a2b57 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -15,6 +15,7 @@ License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -82,6 +83,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal chmod a-x changelog # End cabal-rpm setup #remove the copy library diff --git a/zlib-0.6.2.1.cabal b/zlib-0.6.2.1.cabal new file mode 100644 index 0000000..c29ade1 --- /dev/null +++ b/zlib-0.6.2.1.cabal @@ -0,0 +1,111 @@ +cabal-version: >= 1.10 +name: zlib +version: 0.6.2.1 +x-revision: 1 + +copyright: (c) 2006-2016 Duncan Coutts +license: BSD3 +license-file: LICENSE +author: Duncan Coutts +maintainer: Duncan Coutts +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 + + 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 +tested-with: GHC ==7.0.4, GHC ==7.2.2, GHC ==7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3, GHC ==8.0.1, GHC==8.0.2, GHC ==8.2.2, GHC ==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.1 + +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 + +flag non-blocking-ffi + default: False + manual: True + description: The (de)compression calls can sometimes take a long time, which + prevents other Haskell threads running. Enabling this flag + avoids this unfairness, but with greater overall cost. + +flag pkg-config + default: False + manual: True + description: Use @pkg-config(1)@ to locate foreign @zlib@ library. + +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 + if impl(ghc >= 7.6) + other-extensions: CApiFFI + build-depends: base >= 4 && < 4.15, + bytestring >= 0.9 && < 0.11 + if impl(ghc >= 7.2 && < 7.6) + build-depends: ghc-prim + includes: zlib.h + ghc-options: -Wall -fwarn-tabs + if flag(non-blocking-ffi) + cpp-options: -DNON_BLOCKING_FFI + if flag(pkg-config) + -- NB: pkg-config is available on windows as well when using msys2 + pkgconfig-depends: zlib + else + -- don't use pkg-config + 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.*, + tasty >= 0.8 && < 1.3, + tasty-quickcheck >= 0.8 && < 0.11, + tasty-hunit >= 0.8 && < 0.11 + ghc-options: -Wall From 694014b3101217b2c5e44f19289d6494f6dc127c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 18:52:29 +0800 Subject: [PATCH 094/107] bump release --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index f5a2b57..cb30525 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -128,6 +128,9 @@ rm -r cbits %changelog +* Fri Jul 17 2020 Jens Petersen - 0.6.2.1-2 +- refresh to cabal-rpm-2.0.6 + * Fri Feb 14 2020 Jens Petersen - 0.6.2.1-1 - update to 0.6.2.1 From 130dce1b6ae03582dd69cec861d6d7704e8cb628 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:56:43 +0000 Subject: [PATCH 095/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index cb30525..a85a070 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -128,6 +128,9 @@ rm -r cbits %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.6.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.6.2.1-2 - refresh to cabal-rpm-2.0.6 From eb7a51a4590b34d593bbc9cc0590158e32e182ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:46:34 +0000 Subject: [PATCH 096/107] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index a85a070..c07dfaf 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -128,6 +128,10 @@ rm -r cbits %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.6.2.1-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.6.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2dbc3f186a0801863ac673fdb6c77ddae1aa789d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:00:52 +0000 Subject: [PATCH 097/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index c07dfaf..dd51a59 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -128,6 +128,9 @@ rm -r cbits %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.6.2.1-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d04859a6562828b504dae414da8397eb90bac638 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:33:04 +0000 Subject: [PATCH 098/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index dd51a59..3b853c0 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -128,6 +128,9 @@ rm -r cbits %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.6.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 43b459e0559b3092419b8b66d0efa839365cad44 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 3 Aug 2021 17:01:44 +0800 Subject: [PATCH 099/107] update to 0.6.2.2 --- .gitignore | 1 + ghc-zlib.spec | 14 +++--- sources | 2 +- zlib-0.6.2.1.cabal | 111 --------------------------------------------- 4 files changed, 9 insertions(+), 119 deletions(-) delete mode 100644 zlib-0.6.2.1.cabal diff --git a/.gitignore b/.gitignore index 09c4d2e..4d8d4b9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zlib-0.6.1.2.tar.gz /zlib-0.6.2.tar.gz /zlib-0.6.2.1.tar.gz +/zlib-0.6.2.2.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 3b853c0..ecc2165 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,21 +1,20 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.8 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name zlib %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} -Version: 0.6.2.1 -Release: 6%{?dist} +Version: 0.6.2.2 +Release: 1%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -83,8 +82,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal -chmod a-x changelog # End cabal-rpm setup #remove the copy library rm -r cbits @@ -128,6 +125,9 @@ rm -r cbits %changelog +* Tue Aug 3 2021 Jens Petersen - 0.6.2.2-1 +- update to 0.6.2.2 + * Thu Jul 22 2021 Fedora Release Engineering - 0.6.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 357f34f..b214b8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-0.6.2.1.tar.gz) = cee7942a86afbd08f03c19abd88154cc866a3ccc52342264d4d5b28a71643adf30bf03ba939d6a98b7c065752f9ec326729fc38cfe72b66998551c89186048c5 +SHA512 (zlib-0.6.2.2.tar.gz) = 3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea diff --git a/zlib-0.6.2.1.cabal b/zlib-0.6.2.1.cabal deleted file mode 100644 index c29ade1..0000000 --- a/zlib-0.6.2.1.cabal +++ /dev/null @@ -1,111 +0,0 @@ -cabal-version: >= 1.10 -name: zlib -version: 0.6.2.1 -x-revision: 1 - -copyright: (c) 2006-2016 Duncan Coutts -license: BSD3 -license-file: LICENSE -author: Duncan Coutts -maintainer: Duncan Coutts -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 - - 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 -tested-with: GHC ==7.0.4, GHC ==7.2.2, GHC ==7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3, GHC ==8.0.1, GHC==8.0.2, GHC ==8.2.2, GHC ==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.1 - -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 - -flag non-blocking-ffi - default: False - manual: True - description: The (de)compression calls can sometimes take a long time, which - prevents other Haskell threads running. Enabling this flag - avoids this unfairness, but with greater overall cost. - -flag pkg-config - default: False - manual: True - description: Use @pkg-config(1)@ to locate foreign @zlib@ library. - -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 - if impl(ghc >= 7.6) - other-extensions: CApiFFI - build-depends: base >= 4 && < 4.15, - bytestring >= 0.9 && < 0.11 - if impl(ghc >= 7.2 && < 7.6) - build-depends: ghc-prim - includes: zlib.h - ghc-options: -Wall -fwarn-tabs - if flag(non-blocking-ffi) - cpp-options: -DNON_BLOCKING_FFI - if flag(pkg-config) - -- NB: pkg-config is available on windows as well when using msys2 - pkgconfig-depends: zlib - else - -- don't use pkg-config - 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.*, - tasty >= 0.8 && < 1.3, - tasty-quickcheck >= 0.8 && < 0.11, - tasty-hunit >= 0.8 && < 0.11 - ghc-options: -Wall From 3e32d671bdff94ad075caed3c43fc93c6496548d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:14 +0800 Subject: [PATCH 100/107] refresh to cabal-rpm-2.0.9 --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index ecc2165..2d2fa49 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.8 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name zlib @@ -62,6 +62,7 @@ This package provides the Haskell %{pkg_name} library development files. %package doc Summary: Haskell %{pkg_name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -100,7 +101,9 @@ rm -r cbits %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 148f4729a03d4ef8f95c1f4aaac251dd2c12813d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 3 Aug 2021 17:03:05 +0800 Subject: [PATCH 101/107] update to 0.6.2.3 --- .gitignore | 1 + ghc-zlib.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4d8d4b9..83758cd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /zlib-0.6.2.tar.gz /zlib-0.6.2.1.tar.gz /zlib-0.6.2.2.tar.gz +/zlib-0.6.2.3.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 2d2fa49..0496556 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 0.6.2.2 +Version: 0.6.2.3 Release: 1%{?dist} Summary: Compression and decompression in the gzip and zlib formats @@ -128,8 +128,8 @@ rm -r cbits %changelog -* Tue Aug 3 2021 Jens Petersen - 0.6.2.2-1 -- update to 0.6.2.2 +* Tue Aug 3 2021 Jens Petersen - 0.6.2.3-1 +- update to 0.6.2.3 * Thu Jul 22 2021 Fedora Release Engineering - 0.6.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index b214b8a..b9ac62f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-0.6.2.2.tar.gz) = 3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea +SHA512 (zlib-0.6.2.3.tar.gz) = 535fc711af639967c032791c6a0c09680ac186c706e02a28cfabd9b2dcddc84a6ee5f6007e2ed67c1dc19dd6d561cb821d8840dba7386b63cc002418c4d5040a From 1ad098d5c92c44ecce4acaf3f66f96ff3d3c6a3c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Aug 2021 13:26:18 +0800 Subject: [PATCH 102/107] bump release --- ghc-zlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 0496556..36f7a81 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -128,6 +128,9 @@ rm -r cbits %changelog +* Fri Aug 06 2021 Jens Petersen - 0.6.2.3-2 +- rebuild + * Tue Aug 3 2021 Jens Petersen - 0.6.2.3-1 - update to 0.6.2.3 From fc119cfaa6e639aad6a771ca41c65103466b1137 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 8 Aug 2021 13:28:07 +0800 Subject: [PATCH 103/107] use rpmautospec --- changelog | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++ ghc-zlib.spec | 248 +------------------------------------------------- 2 files changed, 250 insertions(+), 246 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..03dc5cc --- /dev/null +++ b/changelog @@ -0,0 +1,248 @@ +* Sun Aug 8 2021 Jens Petersen - 0.6.2.3-3 +- use rpmautospec + +* Fri Aug 06 2021 Jens Petersen - 0.6.2.3-2 +- rebuild + +* Tue Aug 3 2021 Jens Petersen - 0.6.2.3-1 +- update to 0.6.2.3 + +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 0.6.2.1-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.6.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 17 2020 Jens Petersen - 0.6.2.1-2 +- refresh to cabal-rpm-2.0.6 + +* Fri Feb 14 2020 Jens Petersen - 0.6.2.1-1 +- update to 0.6.2.1 + +* Tue Jan 28 2020 Fedora Release Engineering - 0.6.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Aug 28 2019 Jens Petersen - 0.6.2-8 +- bump the tasty upperbounds instead of removing + +* Wed Aug 14 2019 Jens Petersen - 0.6.2-7 +- disable testsuite since it caused ABI hash change + +* Wed Aug 14 2019 Jens Petersen - 0.6.2-6 +- enable testsuite + +* Fri Aug 02 2019 Jens Petersen - 0.6.2-5 +- add doc and prof subpackages (cabal-rpm-1.0.0) + +* Thu Jul 25 2019 Fedora Release Engineering - 0.6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 17 2019 Jens Petersen - 0.6.2-3 +- refresh to cabal-rpm-0.13 + +* Thu Jan 31 2019 Fedora Release Engineering - 0.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Jul 22 2018 Jens Petersen - 0.6.2-1 +- update to 0.6.2 + +* Fri Jul 13 2018 Fedora Release Engineering - 0.6.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 15 2018 Jens Petersen - 0.6.1.2-6 +- remove _isa from buildrequires (#1545183) + +* Wed Feb 07 2018 Fedora Release Engineering - 0.6.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 26 2018 Jens Petersen - 0.6.1.2-4 +- rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 0.6.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.6.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Feb 22 2017 Jens Petersen - 0.6.1.2-1 +- update to 0.6.1.2 + +* Fri Feb 10 2017 Fedora Release Engineering - 0.6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Jun 26 2016 Jens Petersen - 0.6.1.1-1 +- update to 0.6.1.1 + +* Mon Jun 6 2016 Jens Petersen - 0.5.4.2-1 +- update to 0.5.4.2 for ghc-7.10 + +* Wed Feb 03 2016 Fedora Release Engineering - 0.5.4.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.5.4.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Feb 17 2015 Jens Petersen +- remove the copy library in prep + +* Mon Oct 27 2014 Jens Petersen - 0.5.4.1-30 +- disable debuginfo (cblrpm-0.8.11) + +* Sat Aug 16 2014 Fedora Release Engineering - 0.5.4.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.4.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Dec 4 2013 Jens Petersen - 0.5.4.1-27 +- bump release + +* Sun Oct 27 2013 Jens Petersen - 0.5.4.1-26 +- tidy description + +* Sun Oct 27 2013 Jens Petersen - 0.5.4.1-25 +- spec file updated with cabal-rpm-0.8.6 + +* Wed Mar 21 2012 Jens Petersen - 0.5.3.3-1 +- update to 0.5.3.3 + +* Wed Mar 21 2012 Jens Petersen - 0.5.3.1-8 +- rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.5.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jan 2 2012 Jens Petersen - 0.5.3.1-6 +- update to cabal2spec-0.25.2 +- use _isa +- include examples + +* Mon Oct 24 2011 Marcela Mašláňová - 0.5.3.1-5.3 +- rebuild with new gmp without compat lib + +* Fri Oct 21 2011 Marcela Mašláňová - 0.5.3.1-5.2 +- rebuild with new gmp without compat lib + +* Tue Oct 11 2011 Peter Schiffer - 0.5.3.1-5.1 +- rebuild with new gmp + +* Tue Jun 21 2011 Jens Petersen - 0.5.3.1-5 +- ghc_arches replaces ghc_excluded_archs + +* Mon Jun 20 2011 Jens Petersen - 0.5.3.1-4 +- BR ghc-Cabal-devel and use ghc_excluded_archs + +* Fri May 27 2011 Jens Petersen - 0.5.3.1-3 +- update to cabal2spec-0.23: add ppc64 + +* Thu Mar 10 2011 Fabio M. Di Nitto - 0.5.3.1-2 +- Enable build on sparcv9 + +* Tue Feb 15 2011 Jens Petersen - 0.5.3.1-1 +- update to 0.5.3.1 for haskell-platform-2011.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 0.5.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 15 2011 Jens Petersen - 0.5.2.0-6 +- update to cabal2spec-0.22.4 + +* Thu Nov 25 2010 Jens Petersen - 0.5.2.0-5 +- rebuild with ghc-7.0.1 + +* Sat Sep 4 2010 Jens Petersen - 0.5.2.0-4 +- add hscolour and doc obsolete (cabal2spec-0.22.2) +- part of haskell-platform-2010.2.0.0 + +* Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 +- sync cabal2spec-0.22 + +* Sat Apr 24 2010 Jens Petersen - 0.5.2.0-2 +- part of haskell-platform-2010.1.0.0 +- rebuild against ghc-6.12.2 + +* Mon Jan 11 2010 Jens Petersen - 0.5.2.0-1 +- update to 0.5.2.0 (haskell-platform-2009.3.1) +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use common summary and common_description +- use ghc_lib_package and ghc_pkg_c_deps + +* Sat Dec 26 2009 Jens Petersen - 0.5.0.0-12 +- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0: +- use common_summary and common_description +- reenable debuginfo for stripping +- use ghc_requires, ghc_doc_requires, and ghc_prof_requires + +* Tue Dec 22 2009 Jens Petersen +- fix base Group and devel Summary +- only include docdir in devel if not shared build + +* Wed Dec 16 2009 Jens Petersen - 0.5.0.0-11 +- build for ghc-6.12.1 +- added shared library support: needs ghc-rpm-macros 0.3.1 +- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache + +* Fri Jul 24 2009 Fedora Release Engineering - 0.5.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat May 16 2009 Jens Petersen - 0.5.0.0-9 +- buildrequires ghc-rpm-macros (cabal2spec-0.16) + +* Fri Apr 24 2009 Jens Petersen - 0.5.0.0-8 +- sync with cabal2spec-0.14 + +* Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 +- update to cabal2spec-0.11: +- add devel subpackage +- use ix86 macro for archs and add alpha +- use global rather than define +- make devel subpackage own docdir for now + +* Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 9 2009 Jens Petersen - 0.5.0.0-5 +- rebuild to fix unexpanded post preun macros +- add doc subpackage and BR ghc-doc +- add doc requires(post) ghc-doc + +* Mon Dec 22 2008 Jens Petersen - 0.5.0.0-4 +- use bcond for doc and prof build flags (Till Maas, #426751) + +* Mon Dec 1 2008 Jens Petersen - 0.5.0.0-3 +- sync with lib template: + - add build_prof and build_doc + - prof requires main package + - update scriptlet macro names + +* Tue Nov 25 2008 Jens Petersen - 0.5.0.0-2 +- build with ghc-6.10.1 +- no longer buildrequire haddock09 +- provide devel +- add exclusivearch for current ghc archs +- reindex haddock docs only when uninstalling in postun + +* Tue Nov 11 2008 Bryan O'Sullivan - 0.5.0.0-1 +- Update to 0.5.0.0 + +* Thu Oct 23 2008 Jens Petersen - 0.4.0.4-2 +- update for current rawhide +- add pkg_docdir and remove hsc_name +- use haddock09 + +* Tue Oct 14 2008 Bryan O'Sullivan - 0.4.0.4-1 +- Revised to follow Haskell packaging guidelines + +* Sun Feb 17 2008 Yaakov Nemoy - 0.4.0.2-1 +- added in url + +* Sun Feb 17 2008 cabal-rpm - 0.4.0.2-1 +- spec file autogenerated by cabal-rpm diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 36f7a81..bd90c5a 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.3 -Release: 2%{?dist} +Release: %autorelease Summary: Compression and decompression in the gzip and zlib formats License: BSD @@ -128,248 +128,4 @@ rm -r cbits %changelog -* Fri Aug 06 2021 Jens Petersen - 0.6.2.3-2 -- rebuild - -* Tue Aug 3 2021 Jens Petersen - 0.6.2.3-1 -- update to 0.6.2.3 - -* Thu Jul 22 2021 Fedora Release Engineering - 0.6.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.6.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 0.6.2.1-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.6.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 17 2020 Jens Petersen - 0.6.2.1-2 -- refresh to cabal-rpm-2.0.6 - -* Fri Feb 14 2020 Jens Petersen - 0.6.2.1-1 -- update to 0.6.2.1 - -* Tue Jan 28 2020 Fedora Release Engineering - 0.6.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Aug 28 2019 Jens Petersen - 0.6.2-8 -- bump the tasty upperbounds instead of removing - -* Wed Aug 14 2019 Jens Petersen - 0.6.2-7 -- disable testsuite since it caused ABI hash change - -* Wed Aug 14 2019 Jens Petersen - 0.6.2-6 -- enable testsuite - -* Fri Aug 02 2019 Jens Petersen - 0.6.2-5 -- add doc and prof subpackages (cabal-rpm-1.0.0) - -* Thu Jul 25 2019 Fedora Release Engineering - 0.6.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 17 2019 Jens Petersen - 0.6.2-3 -- refresh to cabal-rpm-0.13 - -* Thu Jan 31 2019 Fedora Release Engineering - 0.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Jul 22 2018 Jens Petersen - 0.6.2-1 -- update to 0.6.2 - -* Fri Jul 13 2018 Fedora Release Engineering - 0.6.1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 15 2018 Jens Petersen - 0.6.1.2-6 -- remove _isa from buildrequires (#1545183) - -* Wed Feb 07 2018 Fedora Release Engineering - 0.6.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 26 2018 Jens Petersen - 0.6.1.2-4 -- rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 0.6.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.6.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Feb 22 2017 Jens Petersen - 0.6.1.2-1 -- update to 0.6.1.2 - -* Fri Feb 10 2017 Fedora Release Engineering - 0.6.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Jun 26 2016 Jens Petersen - 0.6.1.1-1 -- update to 0.6.1.1 - -* Mon Jun 6 2016 Jens Petersen - 0.5.4.2-1 -- update to 0.5.4.2 for ghc-7.10 - -* Wed Feb 03 2016 Fedora Release Engineering - 0.5.4.1-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.5.4.1-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Feb 17 2015 Jens Petersen -- remove the copy library in prep - -* Mon Oct 27 2014 Jens Petersen - 0.5.4.1-30 -- disable debuginfo (cblrpm-0.8.11) - -* Sat Aug 16 2014 Fedora Release Engineering - 0.5.4.1-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.5.4.1-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Dec 4 2013 Jens Petersen - 0.5.4.1-27 -- bump release - -* Sun Oct 27 2013 Jens Petersen - 0.5.4.1-26 -- tidy description - -* Sun Oct 27 2013 Jens Petersen - 0.5.4.1-25 -- spec file updated with cabal-rpm-0.8.6 - -* Wed Mar 21 2012 Jens Petersen - 0.5.3.3-1 -- update to 0.5.3.3 - -* Wed Mar 21 2012 Jens Petersen - 0.5.3.1-8 -- rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.5.3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Jan 2 2012 Jens Petersen - 0.5.3.1-6 -- update to cabal2spec-0.25.2 -- use _isa -- include examples - -* Mon Oct 24 2011 Marcela Mašláňová - 0.5.3.1-5.3 -- rebuild with new gmp without compat lib - -* Fri Oct 21 2011 Marcela Mašláňová - 0.5.3.1-5.2 -- rebuild with new gmp without compat lib - -* Tue Oct 11 2011 Peter Schiffer - 0.5.3.1-5.1 -- rebuild with new gmp - -* Tue Jun 21 2011 Jens Petersen - 0.5.3.1-5 -- ghc_arches replaces ghc_excluded_archs - -* Mon Jun 20 2011 Jens Petersen - 0.5.3.1-4 -- BR ghc-Cabal-devel and use ghc_excluded_archs - -* Fri May 27 2011 Jens Petersen - 0.5.3.1-3 -- update to cabal2spec-0.23: add ppc64 - -* Thu Mar 10 2011 Fabio M. Di Nitto - 0.5.3.1-2 -- Enable build on sparcv9 - -* Tue Feb 15 2011 Jens Petersen - 0.5.3.1-1 -- update to 0.5.3.1 for haskell-platform-2011.1 - -* Tue Feb 08 2011 Fedora Release Engineering - 0.5.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 15 2011 Jens Petersen - 0.5.2.0-6 -- update to cabal2spec-0.22.4 - -* Thu Nov 25 2010 Jens Petersen - 0.5.2.0-5 -- rebuild with ghc-7.0.1 - -* Sat Sep 4 2010 Jens Petersen - 0.5.2.0-4 -- add hscolour and doc obsolete (cabal2spec-0.22.2) -- part of haskell-platform-2010.2.0.0 - -* Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 -- sync cabal2spec-0.22 - -* Sat Apr 24 2010 Jens Petersen - 0.5.2.0-2 -- part of haskell-platform-2010.1.0.0 -- rebuild against ghc-6.12.2 - -* Mon Jan 11 2010 Jens Petersen - 0.5.2.0-1 -- update to 0.5.2.0 (haskell-platform-2009.3.1) -- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: -- drop doc and prof bcond -- use common summary and common_description -- use ghc_lib_package and ghc_pkg_c_deps - -* Sat Dec 26 2009 Jens Petersen - 0.5.0.0-12 -- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0: -- use common_summary and common_description -- reenable debuginfo for stripping -- use ghc_requires, ghc_doc_requires, and ghc_prof_requires - -* Tue Dec 22 2009 Jens Petersen -- fix base Group and devel Summary -- only include docdir in devel if not shared build - -* Wed Dec 16 2009 Jens Petersen - 0.5.0.0-11 -- build for ghc-6.12.1 -- added shared library support: needs ghc-rpm-macros 0.3.1 -- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache - -* Fri Jul 24 2009 Fedora Release Engineering - 0.5.0.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat May 16 2009 Jens Petersen - 0.5.0.0-9 -- buildrequires ghc-rpm-macros (cabal2spec-0.16) - -* Fri Apr 24 2009 Jens Petersen - 0.5.0.0-8 -- sync with cabal2spec-0.14 - -* Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 -- update to cabal2spec-0.11: -- add devel subpackage -- use ix86 macro for archs and add alpha -- use global rather than define -- make devel subpackage own docdir for now - -* Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 9 2009 Jens Petersen - 0.5.0.0-5 -- rebuild to fix unexpanded post preun macros -- add doc subpackage and BR ghc-doc -- add doc requires(post) ghc-doc - -* Mon Dec 22 2008 Jens Petersen - 0.5.0.0-4 -- use bcond for doc and prof build flags (Till Maas, #426751) - -* Mon Dec 1 2008 Jens Petersen - 0.5.0.0-3 -- sync with lib template: - - add build_prof and build_doc - - prof requires main package - - update scriptlet macro names - -* Tue Nov 25 2008 Jens Petersen - 0.5.0.0-2 -- build with ghc-6.10.1 -- no longer buildrequire haddock09 -- provide devel -- add exclusivearch for current ghc archs -- reindex haddock docs only when uninstalling in postun - -* Tue Nov 11 2008 Bryan O'Sullivan - 0.5.0.0-1 -- Update to 0.5.0.0 - -* Thu Oct 23 2008 Jens Petersen - 0.4.0.4-2 -- update for current rawhide -- add pkg_docdir and remove hsc_name -- use haddock09 - -* Tue Oct 14 2008 Bryan O'Sullivan - 0.4.0.4-1 -- Revised to follow Haskell packaging guidelines - -* Sun Feb 17 2008 Yaakov Nemoy - 0.4.0.2-1 -- added in url - -* Sun Feb 17 2008 cabal-rpm - 0.4.0.2-1 -- spec file autogenerated by cabal-rpm +%autochangelog From fda84dfe6db12c2bc374f75a88ee10b50b90d5fa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 12 Mar 2022 13:15:25 +0800 Subject: [PATCH 105/107] patch testsuite on s390x for rawformat (#2045430) https://github.com/haskell/zlib/issues/46 seems modern z15 uses native compression instruction --- ghc-zlib.spec | 5 +++++ zlib-0.6.2.3-test-rawformat-s390x-z15.patch | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 zlib-0.6.2.3-test-rawformat-s390x-z15.patch diff --git a/ghc-zlib.spec b/ghc-zlib.spec index bd90c5a..8ea67b2 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -16,6 +16,8 @@ Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources +# https://github.com/haskell/zlib/issues/46 +Patch0: zlib-0.6.2.3-test-rawformat-s390x-z15.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -83,6 +85,9 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +%ifarch s390x +%patch0 -p1 -b.orig +%endif # End cabal-rpm setup #remove the copy library rm -r cbits diff --git a/zlib-0.6.2.3-test-rawformat-s390x-z15.patch b/zlib-0.6.2.3-test-rawformat-s390x-z15.patch new file mode 100644 index 0000000..f9da1fb --- /dev/null +++ b/zlib-0.6.2.3-test-rawformat-s390x-z15.patch @@ -0,0 +1,11 @@ +--- zlib-0.6.2.3/test/Test.hs~ 2001-09-09 09:46:40.000000000 +0800 ++++ zlib-0.6.2.3/test/Test.hs 2022-03-12 13:04:22.643542774 +0800 +@@ -190,7 +190,7 @@ + let decomp = decompressIO rawFormat defaultDecompressParams + err <- assertDecompressError hnd decomp + msg <- assertDataFormatError err +- msg @?= "invalid code lengths set" ++ msg @?= "Operation-Ending-Supplemental Code is 0x27" + + withSampleData "not-gzip" $ \hnd -> do + let decomp = decompressIO gzipOrZlibFormat defaultDecompressParams From 36bb32bf6b7c0cfa700e5a64e978fd55aa4395d5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 18:03:25 +0800 Subject: [PATCH 106/107] revise .cabal --- ghc-zlib.spec | 7 ++- zlib-0.6.2.3.cabal | 135 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 zlib-0.6.2.3.cabal diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 8ea67b2..718b3df 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.0.12 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name zlib @@ -15,11 +15,13 @@ License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # https://github.com/haskell/zlib/issues/46 Patch0: zlib-0.6.2.3-test-rawformat-s390x-z15.patch # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof @@ -85,10 +87,11 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal +# End cabal-rpm setup %ifarch s390x %patch0 -p1 -b.orig %endif -# End cabal-rpm setup #remove the copy library rm -r cbits diff --git a/zlib-0.6.2.3.cabal b/zlib-0.6.2.3.cabal new file mode 100644 index 0000000..a63035d --- /dev/null +++ b/zlib-0.6.2.3.cabal @@ -0,0 +1,135 @@ +cabal-version: >= 1.10 +name: zlib +version: 0.6.2.3 +x-revision: 1 + +copyright: (c) 2006-2016 Duncan Coutts +license: BSD3 +license-file: LICENSE +author: Duncan Coutts +maintainer: Duncan Coutts , Andrew Lelechenko , Emily Pillmore , Herbert Valerio Riedel +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 + + 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 + +tested-with: GHC == 7.0.4 + , GHC == 7.2.2 + , GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.2 + , GHC == 8.2.2 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.4 + , GHC == 8.10.3 + +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 + +flag non-blocking-ffi + default: False + manual: True + description: The (de)compression calls can sometimes take a long time, which + prevents other Haskell threads running. Enabling this flag + avoids this unfairness, but with greater overall cost. + +flag pkg-config + default: False + manual: True + description: Use @pkg-config(1)@ to locate foreign @zlib@ library. + +flag bundled-c-zlib + default: False + manual: True + description: Use the bundled zlib C sources. Requires pkg-config to be False. + For windows, this is the default. + + +library + exposed-modules: Codec.Compression.GZip, + Codec.Compression.Zlib, + Codec.Compression.Zlib.Raw, + Codec.Compression.Zlib.Internal + other-modules: Codec.Compression.Zlib.Stream, + Codec.Compression.Zlib.ByteStringCompat + + 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 + if impl(ghc >= 7.6) + other-extensions: CApiFFI + + build-depends: base >= 4 && < 4.17, + bytestring >= 0.9 && < 0.12 + if impl(ghc >= 7.0 && < 8.0.3) + build-depends: ghc-prim + + includes: zlib.h + ghc-options: -Wall -fwarn-tabs + if flag(non-blocking-ffi) + cpp-options: -DNON_BLOCKING_FFI + if flag(pkg-config) && !impl(ghcjs) && !os(ghcjs) + -- NB: pkg-config is available on windows as well when using msys2 + pkgconfig-depends: zlib + else + -- don't use pkg-config + if !os(windows) && !flag(bundled-c-zlib) && !impl(ghcjs) && !os(ghcjs) + -- 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.11 + 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.*, + tasty >= 0.8 && < 1.5, + tasty-quickcheck >= 0.8 && < 0.11, + tasty-hunit >= 0.8 && < 0.11 + ghc-options: -Wall From f4b92b403efc49051ad5932d72d303fddb19af2b Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 18:02:52 +0300 Subject: [PATCH 107/107] Remove unnecessary files and fix spec-file --- ghc-zlib.spec | 268 +++++++++++++++++++++++++++++++++++++++- sources | 1 - tests/simple/runtest.sh | 11 -- tests/tests.yml | 40 ------ 4 files changed, 267 insertions(+), 53 deletions(-) delete mode 100644 sources delete mode 100755 tests/simple/runtest.sh delete mode 100644 tests/tests.yml diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 718b3df..e82beb2 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,3 +1,12 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.2.6) +%define autorelease(e:s:pb:) %{?-p:0.}%{lua: + release_number = 6; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?dist} +## END: Set by rpmautospec + # generated by cabal-rpm-2.0.12 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ @@ -136,4 +145,261 @@ rm -r cbits %changelog -%autochangelog +* Tue Jun 07 2022 Jens Petersen 0.6.2.3-6 +- revise .cabal + +* Sat Mar 12 2022 Jens Petersen 0.6.2.3-5 +- patch testsuite on s390x for rawformat (#2045430) + +* Thu Jan 20 2022 Fedora Release Engineering 0.6.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Aug 8 2021 Jens Petersen - 0.6.2.3-3 +- use rpmautospec + +* Fri Aug 06 2021 Jens Petersen - 0.6.2.3-2 +- rebuild + +* Tue Aug 3 2021 Jens Petersen - 0.6.2.3-1 +- update to 0.6.2.3 + +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 0.6.2.1-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.6.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 17 2020 Jens Petersen - 0.6.2.1-2 +- refresh to cabal-rpm-2.0.6 + +* Fri Feb 14 2020 Jens Petersen - 0.6.2.1-1 +- update to 0.6.2.1 + +* Tue Jan 28 2020 Fedora Release Engineering - 0.6.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Aug 28 2019 Jens Petersen - 0.6.2-8 +- bump the tasty upperbounds instead of removing + +* Wed Aug 14 2019 Jens Petersen - 0.6.2-7 +- disable testsuite since it caused ABI hash change + +* Wed Aug 14 2019 Jens Petersen - 0.6.2-6 +- enable testsuite + +* Fri Aug 02 2019 Jens Petersen - 0.6.2-5 +- add doc and prof subpackages (cabal-rpm-1.0.0) + +* Thu Jul 25 2019 Fedora Release Engineering - 0.6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 17 2019 Jens Petersen - 0.6.2-3 +- refresh to cabal-rpm-0.13 + +* Thu Jan 31 2019 Fedora Release Engineering - 0.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Jul 22 2018 Jens Petersen - 0.6.2-1 +- update to 0.6.2 + +* Fri Jul 13 2018 Fedora Release Engineering - 0.6.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 15 2018 Jens Petersen - 0.6.1.2-6 +- remove _isa from buildrequires (#1545183) + +* Wed Feb 07 2018 Fedora Release Engineering - 0.6.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 26 2018 Jens Petersen - 0.6.1.2-4 +- rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 0.6.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.6.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Feb 22 2017 Jens Petersen - 0.6.1.2-1 +- update to 0.6.1.2 + +* Fri Feb 10 2017 Fedora Release Engineering - 0.6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Jun 26 2016 Jens Petersen - 0.6.1.1-1 +- update to 0.6.1.1 + +* Mon Jun 6 2016 Jens Petersen - 0.5.4.2-1 +- update to 0.5.4.2 for ghc-7.10 + +* Wed Feb 03 2016 Fedora Release Engineering - 0.5.4.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.5.4.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Feb 17 2015 Jens Petersen +- remove the copy library in prep + +* Mon Oct 27 2014 Jens Petersen - 0.5.4.1-30 +- disable debuginfo (cblrpm-0.8.11) + +* Sat Aug 16 2014 Fedora Release Engineering - 0.5.4.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.4.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Dec 4 2013 Jens Petersen - 0.5.4.1-27 +- bump release + +* Sun Oct 27 2013 Jens Petersen - 0.5.4.1-26 +- tidy description + +* Sun Oct 27 2013 Jens Petersen - 0.5.4.1-25 +- spec file updated with cabal-rpm-0.8.6 + +* Wed Mar 21 2012 Jens Petersen - 0.5.3.3-1 +- update to 0.5.3.3 + +* Wed Mar 21 2012 Jens Petersen - 0.5.3.1-8 +- rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.5.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jan 2 2012 Jens Petersen - 0.5.3.1-6 +- update to cabal2spec-0.25.2 +- use _isa +- include examples + +* Mon Oct 24 2011 Marcela Mašláňová - 0.5.3.1-5.3 +- rebuild with new gmp without compat lib + +* Fri Oct 21 2011 Marcela Mašláňová - 0.5.3.1-5.2 +- rebuild with new gmp without compat lib + +* Tue Oct 11 2011 Peter Schiffer - 0.5.3.1-5.1 +- rebuild with new gmp + +* Tue Jun 21 2011 Jens Petersen - 0.5.3.1-5 +- ghc_arches replaces ghc_excluded_archs + +* Mon Jun 20 2011 Jens Petersen - 0.5.3.1-4 +- BR ghc-Cabal-devel and use ghc_excluded_archs + +* Fri May 27 2011 Jens Petersen - 0.5.3.1-3 +- update to cabal2spec-0.23: add ppc64 + +* Thu Mar 10 2011 Fabio M. Di Nitto - 0.5.3.1-2 +- Enable build on sparcv9 + +* Tue Feb 15 2011 Jens Petersen - 0.5.3.1-1 +- update to 0.5.3.1 for haskell-platform-2011.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 0.5.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 15 2011 Jens Petersen - 0.5.2.0-6 +- update to cabal2spec-0.22.4 + +* Thu Nov 25 2010 Jens Petersen - 0.5.2.0-5 +- rebuild with ghc-7.0.1 + +* Sat Sep 4 2010 Jens Petersen - 0.5.2.0-4 +- add hscolour and doc obsolete (cabal2spec-0.22.2) +- part of haskell-platform-2010.2.0.0 + +* Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 +- sync cabal2spec-0.22 + +* Sat Apr 24 2010 Jens Petersen - 0.5.2.0-2 +- part of haskell-platform-2010.1.0.0 +- rebuild against ghc-6.12.2 + +* Mon Jan 11 2010 Jens Petersen - 0.5.2.0-1 +- update to 0.5.2.0 (haskell-platform-2009.3.1) +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use common summary and common_description +- use ghc_lib_package and ghc_pkg_c_deps + +* Sat Dec 26 2009 Jens Petersen - 0.5.0.0-12 +- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0: +- use common_summary and common_description +- reenable debuginfo for stripping +- use ghc_requires, ghc_doc_requires, and ghc_prof_requires + +* Tue Dec 22 2009 Jens Petersen +- fix base Group and devel Summary +- only include docdir in devel if not shared build + +* Wed Dec 16 2009 Jens Petersen - 0.5.0.0-11 +- build for ghc-6.12.1 +- added shared library support: needs ghc-rpm-macros 0.3.1 +- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache + +* Fri Jul 24 2009 Fedora Release Engineering - 0.5.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat May 16 2009 Jens Petersen - 0.5.0.0-9 +- buildrequires ghc-rpm-macros (cabal2spec-0.16) + +* Fri Apr 24 2009 Jens Petersen - 0.5.0.0-8 +- sync with cabal2spec-0.14 + +* Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 +- update to cabal2spec-0.11: +- add devel subpackage +- use ix86 macro for archs and add alpha +- use global rather than define +- make devel subpackage own docdir for now + +* Tue Feb 24 2009 Fedora Release Engineering - 0.5.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 9 2009 Jens Petersen - 0.5.0.0-5 +- rebuild to fix unexpanded post preun macros +- add doc subpackage and BR ghc-doc +- add doc requires(post) ghc-doc + +* Mon Dec 22 2008 Jens Petersen - 0.5.0.0-4 +- use bcond for doc and prof build flags (Till Maas, #426751) + +* Mon Dec 1 2008 Jens Petersen - 0.5.0.0-3 +- sync with lib template: + - add build_prof and build_doc + - prof requires main package + - update scriptlet macro names + +* Tue Nov 25 2008 Jens Petersen - 0.5.0.0-2 +- build with ghc-6.10.1 +- no longer buildrequire haddock09 +- provide devel +- add exclusivearch for current ghc archs +- reindex haddock docs only when uninstalling in postun + +* Tue Nov 11 2008 Bryan O'Sullivan - 0.5.0.0-1 +- Update to 0.5.0.0 + +* Thu Oct 23 2008 Jens Petersen - 0.4.0.4-2 +- update for current rawhide +- add pkg_docdir and remove hsc_name +- use haddock09 + +* Tue Oct 14 2008 Bryan O'Sullivan - 0.4.0.4-1 +- Revised to follow Haskell packaging guidelines + +* Sun Feb 17 2008 Yaakov Nemoy - 0.4.0.2-1 +- added in url + +* Sun Feb 17 2008 cabal-rpm - 0.4.0.2-1 +- spec file autogenerated by cabal-rpm + diff --git a/sources b/sources deleted file mode 100644 index b9ac62f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (zlib-0.6.2.3.tar.gz) = 535fc711af639967c032791c6a0c09680ac186c706e02a28cfabd9b2dcddc84a6ee5f6007e2ed67c1dc19dd6d561cb821d8840dba7386b63cc002418c4d5040a diff --git a/tests/simple/runtest.sh b/tests/simple/runtest.sh deleted file mode 100755 index 6ca8bfc..0000000 --- a/tests/simple/runtest.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/sh -set -ex - -SOURCEDIR=$1 - -cd "${SOURCEDIR}" || exit 1 - -cabal update -cabal install --enable-tests --only-dependencies - -cabal test diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index c10bd63..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- hosts: localhost - tags: - - classic - vars: - # standard-test-basic directory for tests are relative to {{ tenv_workdir }} - tenv_workdir: /var/test - pre_tasks: - - import_role: - name: standard-test-source - vars: - fetch_only: True - - - name: Copy files including source to test environment - synchronize: - src: "{{ playbook_dir }}/.." - dest: "{{ tenv_workdir }}" - mode: push - ssh_args: "-o UserKnownHostsFile=/dev/null" - - roles: - - role: standard-test-basic - required_packages: - - cabal-install - - ghc-tasty-hunit-devel - - ghc-tasty-quickcheck-devel - - ghc-zlib-devel - - ghc-rpm-macros - - rpm-build - tests: - - prepare-source: - dir: ./ - run: rpmbuild -bp {{ tenv_workdir }}/*.spec --nodeps --define "_sourcedir {{ tenv_workdir }}" --define "_builddir {{ tenv_workdir }}/source" - - flatten-source: - dir: ./ - run: shopt -s dotglob; mv {{ tenv_workdir }}/source/*/* {{ tenv_workdir }}/source - - smoke: - dir: simple - run: ./runtest.sh {{ tenv_workdir }}/source/ -...