From 9eaf97ea11f391b6d20b2aef4681703d3ac1d749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Tue, 22 Sep 2009 02:11:24 +0000 Subject: [PATCH 01/80] Setup of module ghc-network --- .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..439639c --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: ghc-network +# $Id$ +NAME := ghc-network +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 9e14c835edfb6f2c2ed8b6321e7a2acb177d35c7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 22 Sep 2009 02:41:48 +0000 Subject: [PATCH 02/80] import new package for haskell-platform --- .cvsignore | 1 + ghc-network.spec | 145 +++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 148 insertions(+) create mode 100644 ghc-network.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..294f5c2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +network-2.2.1.4.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec new file mode 100644 index 0000000..4a53bf5 --- /dev/null +++ b/ghc-network.spec @@ -0,0 +1,145 @@ +%global pkg_name network + +%bcond_without doc +%bcond_without prof + +# override for ghc-6.10 since it has older network in extralibs +%global ghcdocdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} + +# ghc does not emit debug information +%global debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 2.2.1.4 +Release: 2%{?dist} +Summary: Haskell %{pkg_name} library + +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) +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha +BuildRequires: ghc, ghc-rpm-macros +%if %{with doc} +BuildRequires: ghc-doc +%endif +%if %{with prof} +BuildRequires: ghc-prof +%endif + +%description +This package provides the Haskell %{pkg_name} library for ghc. + + +%package devel +Summary: Haskell %{pkg_name} library +Group: Development/Libraries +Provides: ghc-%{pkg_name} = %{version}-%{release} +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 +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} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: ghc-prof = %{ghc_version} + +%description prof +This package contains profiling libraries for %{name} +built for ghc-%{ghc_version}. +%endif + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%cabal_configure --ghc %{?with_prof:-p} +%cabal build +%if %{with doc} +%cabal haddock +%endif +%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 devel +%ghc_register_pkg + + +%if %{with doc} +%post doc +%ghc_reindex_haddock +%endif + + +%preun devel +if [ "$1" -eq 0 ] ; then + %ghc_unregister_pkg +fi + + +%if %{with doc} +%postun doc +if [ "$1" -eq 0 ] ; then + %ghc_reindex_haddock +fi +%endif + + +%files devel -f %{name}-devel.files +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version} + + +%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 +* Tue Sep 22 2009 Jens Petersen - 2.2.1.4-2 +- version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884) + +* Wed Sep 16 2009 Jens Petersen - 2.2.1.4-1 +- initial packaging for Fedora created by cabal2spec diff --git a/import.log b/import.log new file mode 100644 index 0000000..07f543b --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ghc-network-2_2_1_4-2_fc11:HEAD:ghc-network-2.2.1.4-2.fc11.src.rpm:1253587222 diff --git a/sources b/sources index e69de29..6ea718c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +639baaeeb9ccc2f2013bbfa3b376f14b network-2.2.1.4.tar.gz From 5747ee0bde9284342b4c3b6fd61257cc66bbfd27 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 24 Sep 2009 04:07:38 +0000 Subject: [PATCH 03/80] add haskell-platform comment --- ghc-network.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-network.spec b/ghc-network.spec index 4a53bf5..f90b7b5 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -10,6 +10,7 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} +# part of haskell-platform-2009.2.0.2 Version: 2.2.1.4 Release: 2%{?dist} Summary: Haskell %{pkg_name} library From 39f7996fede59aacbdd4dfdff846cfacdf445b9b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:25 +0000 Subject: [PATCH 04/80] 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 439639c..86faccb 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: ghc-network -# $Id$ +# $Id: Makefile,v 1.1 2009/09/22 02:11:23 tibbs Exp $ NAME := ghc-network 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 56cd877ac558eb728a7a52503a7fa69e99ef4ffd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 12:55:59 +0000 Subject: [PATCH 05/80] - update to 2.2.1.5 (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_deps - build shared library - drop redundant buildroot and its install cleaning --- ghc-network.spec | 132 +++++++++++------------------------------------ 1 file changed, 31 insertions(+), 101 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index f90b7b5..1d4ddc8 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,76 +1,41 @@ %global pkg_name network -%bcond_without doc -%bcond_without prof +%global common_summary Haskell %{pkg_name} library -# override for ghc-6.10 since it has older network in extralibs -%global ghcdocdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} +%global common_description A Haskell network library. -# ghc does not emit debug information +%global ghc_pkg_deps ghc-parsec-devel + +%bcond_without shared + +# debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2009.2.0.2 -Version: 2.2.1.4 -Release: 2%{?dist} -Summary: Haskell %{pkg_name} library +# part of haskell-platform-2009.3.1 +Version: 2.2.1.5 +Release: 1%{?dist} +Summary: %{common_summary} -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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros -%if %{with doc} +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc -%endif -%if %{with prof} BuildRequires: ghc-prof -%endif +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description -This package provides the Haskell %{pkg_name} library for ghc. - - -%package devel -Summary: Haskell %{pkg_name} library -Group: Development/Libraries -Provides: ghc-%{pkg_name} = %{version}-%{release} -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 -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. +%{common_description} +%if %{with shared} +This package provides the shared library. %endif -%if %{with prof} -%package prof -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} -built for ghc-%{ghc_version}. -%endif +%ghc_lib_package %prep @@ -78,67 +43,32 @@ built for ghc-%{ghc_version}. %build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif -%ghc_gen_scripts %install -rm -rf $RPM_BUILD_ROOT %cabal_install -%ghc_install_scripts -%ghc_gen_filelists %{name} +%cabal_pkg_conf + +%ghc_gen_filelists %clean rm -rf $RPM_BUILD_ROOT -%post devel -%ghc_register_pkg - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} - - -%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 - 2.2.1.5-1 +- update to 2.2.1.5 (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_deps +- build shared library +- drop redundant buildroot and its install cleaning + * Tue Sep 22 2009 Jens Petersen - 2.2.1.4-2 - version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884) From 28db18ec3d7500f4aaf04e68c86933f80e989202 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 12:57:51 +0000 Subject: [PATCH 06/80] network-2.2.1.5 src --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 294f5c2..f6b446a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -network-2.2.1.4.tar.gz +network-2.2.1.5.tar.gz diff --git a/sources b/sources index 6ea718c..59c8177 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -639baaeeb9ccc2f2013bbfa3b376f14b network-2.2.1.4.tar.gz +a89eeb3806080ed9af47f18918822bb3 network-2.2.1.5.tar.gz From d5901814ee1684dd9c84240f5506c536d95d6d85 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 23 Mar 2010 01:29:46 +0000 Subject: [PATCH 07/80] update to 2.2.1.7 for haskell-platform-2010.1.0.0 --- .cvsignore | 1 + ghc-network.spec | 9 ++++++--- sources | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f6b446a..a2f7511 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ network-2.2.1.5.tar.gz +network-2.2.1.7.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 1d4ddc8..bc9c46c 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -12,8 +12,8 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2009.3.1 -Version: 2.2.1.5 +# part of haskell-platform-2010.1.0.0 +Version: 2.2.1.7 Release: 1%{?dist} Summary: %{common_summary} @@ -35,7 +35,7 @@ This package provides the shared library. %endif -%ghc_lib_package +%{?ghc_lib_package} %prep @@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 23 2010 Jens Petersen - 2.2.1.7-1 +- update to 2.2.1.7 for haskell-platform-2010.1.0.0 + * Mon Jan 11 2010 Jens Petersen - 2.2.1.5-1 - update to 2.2.1.5 (haskell-platform-2009.3.1) - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: diff --git a/sources b/sources index 59c8177..83af978 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a89eeb3806080ed9af47f18918822bb3 network-2.2.1.5.tar.gz +566cfeef09ff4d2e52110ec4a9a9879b network-2.2.1.7.tar.gz From eeda3357f95f47145ddfeffe7893bb2ff6964397 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Mar 2010 08:00:02 +0000 Subject: [PATCH 08/80] clean away old sources --- .cvsignore | 1 - sources | 1 - 2 files changed, 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index a2f7511..c69c87c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -network-2.2.1.5.tar.gz network-2.2.1.7.tar.gz diff --git a/sources b/sources index 83af978..634c679 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a89eeb3806080ed9af47f18918822bb3 network-2.2.1.5.tar.gz 566cfeef09ff4d2e52110ec4a9a9879b network-2.2.1.7.tar.gz From 064188f00bdccd04f9ecb9e6739f36180fb228e5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Apr 2010 07:45:55 +0000 Subject: [PATCH 09/80] - rebuild against ghc-6.12.2 - condition ghc_lib_package --- ghc-network.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index bc9c46c..88e54f0 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -14,7 +14,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.1.0.0 Version: 2.2.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -60,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 26 2010 Jens Petersen - 2.2.1.7-2 +- rebuild against ghc-6.12.2 +- condition ghc_lib_package + * Tue Mar 23 2010 Jens Petersen - 2.2.1.7-1 - update to 2.2.1.7 for haskell-platform-2010.1.0.0 From d23f3a026d9b643cb22f0739a035d61f474826d1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 25 Jun 2010 12:52:32 +0000 Subject: [PATCH 10/80] strip shared library (cabal2spec-0.21.4) --- ghc-network.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 88e54f0..3dfaf35 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -14,18 +14,18 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.1.0.0 Version: 2.2.1.7 -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 +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.6.0 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -49,10 +49,12 @@ This package provides the shared library. %install +rm -rf $RPM_BUILD_ROOT %cabal_install %cabal_pkg_conf %ghc_gen_filelists +%ghc_strip_dynlinked %clean @@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 25 2010 Jens Petersen - 2.2.1.7-3 +- strip shared library (cabal2spec-0.21.4) + * Mon Apr 26 2010 Jens Petersen - 2.2.1.7-2 - rebuild against ghc-6.12.2 - condition ghc_lib_package From 955feb066bdcef0554b5bbaf3f0bb22b4b959bb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:34:46 +0000 Subject: [PATCH 11/80] 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 86faccb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ghc-network -# $Id: Makefile,v 1.1 2009/09/22 02:11:23 tibbs Exp $ -NAME := ghc-network -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 07f543b..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -ghc-network-2_2_1_4-2_fc11:HEAD:ghc-network-2.2.1.4-2.fc11.src.rpm:1253587222 From bdfd48d7450a6230fe188ff20591bc9fceb40bca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 4 Sep 2010 21:04:50 +1000 Subject: [PATCH 12/80] update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2) --- ghc-network.spec | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 3dfaf35..38bb35e 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,14 +7,15 @@ %global ghc_pkg_deps ghc-parsec-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: 2.2.1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -25,7 +26,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.6.0 +BuildRequires: ghc-rpm-macros >= 0.8.1 +%if %{with hscolour} +BuildRequires: hscolour +%endif %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -43,25 +47,26 @@ This package provides the shared library. %build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build %install rm -rf $RPM_BUILD_ROOT -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists -%ghc_strip_dynlinked +%ghc_lib_install %clean rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 2.2.1.7-4 + + %changelog +* Sat Sep 4 2010 Jens Petersen - 2.2.1.7-4 +- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) +- part of haskell-platform-2010.2.0.0 + * Fri Jun 25 2010 Jens Petersen - 2.2.1.7-3 - strip shared library (cabal2spec-0.21.4) From a767fdf7690c882f7037be6fed78f3f7212e41bb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 4 Sep 2010 21:05:28 +1000 Subject: [PATCH 13/80] update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2) --- ghc-network.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 38bb35e..7a3e714 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -39,9 +39,6 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} From 7ae985f66cd464b0a9a0e46765d0ac79797dafa0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Nov 2010 12:08:52 +1000 Subject: [PATCH 14/80] drop the -o obsoletes and update url --- ghc-network.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 7a3e714..4c81e0c 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -15,12 +15,12 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 2.2.1.7 -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} +URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: @@ -56,10 +56,13 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT -%ghc_lib_package -o 2.2.1.7-4 +%ghc_lib_package %changelog +* Thu Nov 25 2010 Jens Petersen - 2.2.1.7-5 +- update url and drop -o obsoletes + * Sat Sep 4 2010 Jens Petersen - 2.2.1.7-4 - update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) - part of haskell-platform-2010.2.0.0 From 33de093c34b23adac47dbd56a42d6a2e8364215b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 5 Dec 2010 19:20:32 +1000 Subject: [PATCH 15/80] update to 2.3 for haskell-platform-2011.1 alpha --- ghc-network.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 4c81e0c..390d84d 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -13,9 +13,9 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2010.2.0.0 -Version: 2.2.1.7 -Release: 5%{?dist} +# part of haskell-platform-2011.1.0.0 +Version: 2.3 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 5 2010 Jens Petersen - 2.3-1 +- update to 2.3 + * Thu Nov 25 2010 Jens Petersen - 2.2.1.7-5 - update url and drop -o obsoletes From e38796aff2733363a0146b53d7d63df3501c96a7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 5 Dec 2010 19:21:19 +1000 Subject: [PATCH 16/80] add 2.3 source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c69c87c..3fb9048 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ network-2.2.1.7.tar.gz +/network-2.3.tar.gz diff --git a/sources b/sources index 634c679..8e68b2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -566cfeef09ff4d2e52110ec4a9a9879b network-2.2.1.7.tar.gz +b43d48203617247f4b711375428df23e network-2.3.tar.gz From d791ee6b319cf26184e1fe8dcb11450275276e08 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 15 Jan 2011 21:33:58 +0900 Subject: [PATCH 17/80] update to cabal2spec-0.22.4 --- ghc-network.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 390d84d..3ba4807 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -6,30 +6,24 @@ %global ghc_pkg_deps ghc-parsec-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-2011.1.0.0 Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries 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 -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_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -48,18 +42,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 - 2.3-2 +- update to cabal2spec-0.22.4 + * Sun Dec 5 2010 Jens Petersen - 2.3-1 - update to 2.3 From e1f63a802e4359e94f8507db0bd851284e220fec Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 19:24:23 -0600 Subject: [PATCH 18/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 3ba4807..7e0e068 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.1.0.0 Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -49,6 +49,9 @@ This package provides the shared library. %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jan 15 2011 Jens Petersen - 2.3-2 - update to cabal2spec-0.22.4 From 6c9459b1d02c6358bb64424da6410bf81308625f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 15 Feb 2011 18:48:53 +1000 Subject: [PATCH 19/80] update to 2.3.0.2 --- .gitignore | 1 + ghc-network.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3fb9048..53c7015 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ network-2.2.1.7.tar.gz /network-2.3.tar.gz +/network-2.3.0.2.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 7e0e068..854c9a5 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -6,13 +6,10 @@ %global ghc_pkg_deps ghc-parsec-devel -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} # part of haskell-platform-2011.1.0.0 -Version: 2.3 -Release: 3%{?dist} +Version: 2.3.0.2 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -49,6 +46,9 @@ This package provides the shared library. %changelog +* Tue Feb 15 2011 Jens Petersen - 2.3.0.2-1 +- update to 2.3.0.2 for haskell-platform-2011.1 + * Tue Feb 08 2011 Fedora Release Engineering - 2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 8e68b2e..41e234d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b43d48203617247f4b711375428df23e network-2.3.tar.gz +a739fe9b75af744cfa1c05e39d41ac1f network-2.3.0.2.tar.gz From 7eb6d2920022e8de1212207bd1133d7298f50e76 Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 10 Mar 2011 09:15:38 +0100 Subject: [PATCH 20/80] Enable build on sparcv9 Signed-off-by: Fabio M. Di Nitto --- ghc-network.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 854c9a5..44e7292 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.1.0.0 Version: 2.3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -17,7 +17,7 @@ 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 # 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 @@ -46,6 +46,9 @@ This package provides the shared library. %changelog +* Thu Mar 10 2011 Fabio M. Di Nitto - 2.3.0.2-2 +- Enable build on sparcv9 + * Tue Feb 15 2011 Jens Petersen - 2.3.0.2-1 - update to 2.3.0.2 for haskell-platform-2011.1 From 45b8a77d28c298d92a2c20d4553581688fadea19 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 May 2011 17:49:57 +0900 Subject: [PATCH 21/80] update to cabal2spec-0.23: add ppc64 --- ghc-network.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 44e7292..69fa459 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -4,12 +4,10 @@ %global common_description A Haskell network library. -%global ghc_pkg_deps ghc-parsec-devel - Name: ghc-%{pkg_name} -# part of haskell-platform-2011.1.0.0 +# part of haskell-platform-2011.2.0.0 Version: 2.3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -17,17 +15,14 @@ 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 # 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_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +BuildRequires: ghc-parsec-prof %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif %prep @@ -46,6 +41,9 @@ This package provides the shared library. %changelog +* Fri May 27 2011 Jens Petersen - 2.3.0.2-3 +- update to cabal2spec-0.23: add ppc64 + * Thu Mar 10 2011 Fabio M. Di Nitto - 2.3.0.2-2 - Enable build on sparcv9 From fbbe045ac51e6580d2ca37fc506e405220f195db Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Jun 2011 11:29:09 +0900 Subject: [PATCH 22/80] BR ghc-Cabal-devel and use ghc_excluded_archs --- ghc-network.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 69fa459..0e5d217 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -5,18 +5,18 @@ %global common_description A Haskell network library. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.0 +# part of haskell-platform-2011.2.0.1 Version: 2.3.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries 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 -# 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 BuildRequires: ghc-parsec-prof @@ -41,6 +41,9 @@ BuildRequires: ghc-parsec-prof %changelog +* Mon Jun 20 2011 Jens Petersen - 2.3.0.2-4 +- BR ghc-Cabal-devel and use ghc_excluded_archs + * Fri May 27 2011 Jens Petersen - 2.3.0.2-3 - update to cabal2spec-0.23: add ppc64 From 593c326045207afeceb5b995c0d697739053b4eb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Jun 2011 17:39:34 +0900 Subject: [PATCH 23/80] ghc_arches replaces ghc_excluded_archs (cabal2spec-0.23.2) --- ghc-network.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 0e5d217..20934db 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,15 +7,14 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.3.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries 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 -# 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 @@ -41,6 +40,9 @@ BuildRequires: ghc-parsec-prof %changelog +* Tue Jun 21 2011 Jens Petersen - 2.3.0.2-5 +- ghc_arches replaces ghc_excluded_archs + * Mon Jun 20 2011 Jens Petersen - 2.3.0.2-4 - BR ghc-Cabal-devel and use ghc_excluded_archs From e8bc6441d2b9d780f7945f74379af512128d44da 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 17:26:38 +0200 Subject: [PATCH 24/80] rebuild with new gmp --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 20934db..b92c7cc 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.3.0.2 -Release: 5%{?dist} +Release: 5%{?dist}.1 Summary: %{common_summary} Group: System Environment/Libraries @@ -40,6 +40,9 @@ BuildRequires: ghc-parsec-prof %changelog +* Tue Oct 11 2011 Peter Schiffer - 2.3.0.2-5.1 +- rebuild with new gmp + * Tue Jun 21 2011 Jens Petersen - 2.3.0.2-5 - ghc_arches replaces ghc_excluded_archs From 4686fa17ef59d23aa417d53e6cea553bd7aa7f40 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 02:32:48 +0200 Subject: [PATCH 25/80] rebuild with new gmp without compat lib --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index b92c7cc..5b5b53e 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.3.0.2 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 Summary: %{common_summary} Group: System Environment/Libraries @@ -40,6 +40,9 @@ BuildRequires: ghc-parsec-prof %changelog +* Fri Oct 21 2011 Marcela Mašláňová - 2.3.0.2-5.2 +- rebuild with new gmp without compat lib + * Tue Oct 11 2011 Peter Schiffer - 2.3.0.2-5.1 - rebuild with new gmp From 242afb754ce834d455cc081a3afb0c81f00097b6 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 11:48:13 +0200 Subject: [PATCH 26/80] rebuild with new gmp without compat lib --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 5b5b53e..4f21bff 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.3.0.2 -Release: 5%{?dist}.2 +Release: 5%{?dist}.3 Summary: %{common_summary} Group: System Environment/Libraries @@ -40,6 +40,9 @@ BuildRequires: ghc-parsec-prof %changelog +* Mon Oct 24 2011 Marcela Mašláňová - 2.3.0.2-5.3 +- rebuild with new gmp without compat lib + * Fri Oct 21 2011 Marcela Mašláňová - 2.3.0.2-5.2 - rebuild with new gmp without compat lib From cac0287bdcf3e6f490da2e695159711883f5afab Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Dec 2011 14:57:21 +0900 Subject: [PATCH 27/80] update to 2.3.0.5 for haskell-platform-2011.4.0.0 --- .gitignore | 1 + ghc-network.spec | 27 +++++++++++++++++++++------ sources | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 53c7015..99b6cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ network-2.2.1.7.tar.gz /network-2.3.tar.gz /network-2.3.0.2.tar.gz +/network-2.3.0.5.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 4f21bff..c16bc32 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -5,19 +5,20 @@ %global common_description A Haskell network library. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.1 -Version: 2.3.0.2 -Release: 5%{?dist}.3 +# part of haskell-platform-2011.4.0.0 +Version: 2.3.0.5 +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 -BuildRequires: hscolour +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec BuildRequires: ghc-parsec-prof %description @@ -36,10 +37,24 @@ BuildRequires: ghc-parsec-prof %ghc_lib_install -%ghc_lib_package +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files +%doc examples %changelog +* Wed Dec 28 2011 Jens Petersen - 2.3.0.5-1 +- update to 2.3.0.5 for haskell-platform-2011.4.0.0 +- cabal2spec-0.25.1 +- includes examples in devel doc + * Mon Oct 24 2011 Marcela Mašláňová - 2.3.0.2-5.3 - rebuild with new gmp without compat lib diff --git a/sources b/sources index 41e234d..5a8a2d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a739fe9b75af744cfa1c05e39d41ac1f network-2.3.0.2.tar.gz +716fbe9e01059582503d2920d2618ef3 network-2.3.0.5.tar.gz From 2f9f48376c9b3f689a61e06e065ac4c0bfa49aa2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 21:24:32 -0600 Subject: [PATCH 28/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index c16bc32..890fbc3 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.4.0.0 Version: 2.3.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -50,6 +50,9 @@ BuildRequires: ghc-parsec-prof %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 2.3.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Dec 28 2011 Jens Petersen - 2.3.0.5-1 - update to 2.3.0.5 for haskell-platform-2011.4.0.0 - cabal2spec-0.25.1 From 125debe81fb1e685d7e9f40d655615f3d1312273 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 20 Mar 2012 15:58:39 +0900 Subject: [PATCH 29/80] update to 2.3.0.11 --- .gitignore | 1 + ghc-network.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 99b6cfc..146fecd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ network-2.2.1.7.tar.gz /network-2.3.tar.gz /network-2.3.0.2.tar.gz /network-2.3.0.5.tar.gz +/network-2.3.0.11.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 890fbc3..feee2b1 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -5,9 +5,9 @@ %global common_description A Haskell network library. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.4.0.0 -Version: 2.3.0.5 -Release: 2%{?dist} +# part of haskell-platform +Version: 2.3.0.11 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -45,11 +45,14 @@ BuildRequires: ghc-parsec-prof %ghc_devel_post_postun -%ghc_files +%ghc_files LICENSE %doc examples %changelog +* Tue Mar 20 2012 Jens Petersen - 2.3.0.11-1 +- update to 2.3.0.11 + * Fri Jan 13 2012 Fedora Release Engineering - 2.3.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 5a8a2d7..5e6cb51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -716fbe9e01059582503d2920d2618ef3 network-2.3.0.5.tar.gz +cfe4922ac85685be9f86d4d34654f481 network-2.3.0.11.tar.gz From c4ae79e90d4b548068dac5b4b2c6e2a52dcbc76e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2012 09:39:03 +0900 Subject: [PATCH 30/80] obsoleted by haskell-platform subpackage --- .gitignore | 5 -- dead.package | 1 + ghc-network.spec | 127 ----------------------------------------------- sources | 1 - 4 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 ghc-network.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 146fecd..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -network-2.2.1.7.tar.gz -/network-2.3.tar.gz -/network-2.3.0.2.tar.gz -/network-2.3.0.5.tar.gz -/network-2.3.0.11.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-network.spec b/ghc-network.spec deleted file mode 100644 index feee2b1..0000000 --- a/ghc-network.spec +++ /dev/null @@ -1,127 +0,0 @@ -%global pkg_name network - -%global common_summary Haskell %{pkg_name} library - -%global common_description A Haskell network library. - -Name: ghc-%{pkg_name} -# part of haskell-platform -Version: 2.3.0.11 -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-parsec-prof - -%description -%{common_description} - - -%prep -%setup -q -n %{pkg_name}-%{version} - - -%build -%ghc_lib_build - - -%install -%ghc_lib_install - - -%ghc_devel_package - -%ghc_devel_description - - -%ghc_devel_post_postun - - -%ghc_files LICENSE -%doc examples - - -%changelog -* Tue Mar 20 2012 Jens Petersen - 2.3.0.11-1 -- update to 2.3.0.11 - -* Fri Jan 13 2012 Fedora Release Engineering - 2.3.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Dec 28 2011 Jens Petersen - 2.3.0.5-1 -- update to 2.3.0.5 for haskell-platform-2011.4.0.0 -- cabal2spec-0.25.1 -- includes examples in devel doc - -* Mon Oct 24 2011 Marcela Mašláňová - 2.3.0.2-5.3 -- rebuild with new gmp without compat lib - -* Fri Oct 21 2011 Marcela Mašláňová - 2.3.0.2-5.2 -- rebuild with new gmp without compat lib - -* Tue Oct 11 2011 Peter Schiffer - 2.3.0.2-5.1 -- rebuild with new gmp - -* Tue Jun 21 2011 Jens Petersen - 2.3.0.2-5 -- ghc_arches replaces ghc_excluded_archs - -* Mon Jun 20 2011 Jens Petersen - 2.3.0.2-4 -- BR ghc-Cabal-devel and use ghc_excluded_archs - -* Fri May 27 2011 Jens Petersen - 2.3.0.2-3 -- update to cabal2spec-0.23: add ppc64 - -* Thu Mar 10 2011 Fabio M. Di Nitto - 2.3.0.2-2 -- Enable build on sparcv9 - -* Tue Feb 15 2011 Jens Petersen - 2.3.0.2-1 -- update to 2.3.0.2 for haskell-platform-2011.1 - -* Tue Feb 08 2011 Fedora Release Engineering - 2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 15 2011 Jens Petersen - 2.3-2 -- update to cabal2spec-0.22.4 - -* Sun Dec 5 2010 Jens Petersen - 2.3-1 -- update to 2.3 - -* Thu Nov 25 2010 Jens Petersen - 2.2.1.7-5 -- update url and drop -o obsoletes - -* Sat Sep 4 2010 Jens Petersen - 2.2.1.7-4 -- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) -- part of haskell-platform-2010.2.0.0 - -* Fri Jun 25 2010 Jens Petersen - 2.2.1.7-3 -- strip shared library (cabal2spec-0.21.4) - -* Mon Apr 26 2010 Jens Petersen - 2.2.1.7-2 -- rebuild against ghc-6.12.2 -- condition ghc_lib_package - -* Tue Mar 23 2010 Jens Petersen - 2.2.1.7-1 -- update to 2.2.1.7 for haskell-platform-2010.1.0.0 - -* Mon Jan 11 2010 Jens Petersen - 2.2.1.5-1 -- update to 2.2.1.5 (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_deps -- build shared library -- drop redundant buildroot and its install cleaning - -* Tue Sep 22 2009 Jens Petersen - 2.2.1.4-2 -- version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884) - -* Wed Sep 16 2009 Jens Petersen - 2.2.1.4-1 -- initial packaging for Fedora created by cabal2spec diff --git a/sources b/sources deleted file mode 100644 index 5e6cb51..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -cfe4922ac85685be9f86d4d34654f481 network-2.3.0.11.tar.gz From c65b62d1684da228f88941483aefe0ce926f84fb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 31 Jan 2014 11:11:23 +0900 Subject: [PATCH 31/80] Revert "obsoleted by haskell-platform subpackage" This reverts commit c4ae79e90d4b548068dac5b4b2c6e2a52dcbc76e. --- .gitignore | 5 ++ dead.package | 1 - ghc-network.spec | 127 +++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 ghc-network.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..146fecd --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +network-2.2.1.7.tar.gz +/network-2.3.tar.gz +/network-2.3.0.2.tar.gz +/network-2.3.0.5.tar.gz +/network-2.3.0.11.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-network.spec b/ghc-network.spec new file mode 100644 index 0000000..feee2b1 --- /dev/null +++ b/ghc-network.spec @@ -0,0 +1,127 @@ +%global pkg_name network + +%global common_summary Haskell %{pkg_name} library + +%global common_description A Haskell network library. + +Name: ghc-%{pkg_name} +# part of haskell-platform +Version: 2.3.0.11 +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-parsec-prof + +%description +%{common_description} + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files LICENSE +%doc examples + + +%changelog +* Tue Mar 20 2012 Jens Petersen - 2.3.0.11-1 +- update to 2.3.0.11 + +* Fri Jan 13 2012 Fedora Release Engineering - 2.3.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Dec 28 2011 Jens Petersen - 2.3.0.5-1 +- update to 2.3.0.5 for haskell-platform-2011.4.0.0 +- cabal2spec-0.25.1 +- includes examples in devel doc + +* Mon Oct 24 2011 Marcela Mašláňová - 2.3.0.2-5.3 +- rebuild with new gmp without compat lib + +* Fri Oct 21 2011 Marcela Mašláňová - 2.3.0.2-5.2 +- rebuild with new gmp without compat lib + +* Tue Oct 11 2011 Peter Schiffer - 2.3.0.2-5.1 +- rebuild with new gmp + +* Tue Jun 21 2011 Jens Petersen - 2.3.0.2-5 +- ghc_arches replaces ghc_excluded_archs + +* Mon Jun 20 2011 Jens Petersen - 2.3.0.2-4 +- BR ghc-Cabal-devel and use ghc_excluded_archs + +* Fri May 27 2011 Jens Petersen - 2.3.0.2-3 +- update to cabal2spec-0.23: add ppc64 + +* Thu Mar 10 2011 Fabio M. Di Nitto - 2.3.0.2-2 +- Enable build on sparcv9 + +* Tue Feb 15 2011 Jens Petersen - 2.3.0.2-1 +- update to 2.3.0.2 for haskell-platform-2011.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 15 2011 Jens Petersen - 2.3-2 +- update to cabal2spec-0.22.4 + +* Sun Dec 5 2010 Jens Petersen - 2.3-1 +- update to 2.3 + +* Thu Nov 25 2010 Jens Petersen - 2.2.1.7-5 +- update url and drop -o obsoletes + +* Sat Sep 4 2010 Jens Petersen - 2.2.1.7-4 +- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) +- part of haskell-platform-2010.2.0.0 + +* Fri Jun 25 2010 Jens Petersen - 2.2.1.7-3 +- strip shared library (cabal2spec-0.21.4) + +* Mon Apr 26 2010 Jens Petersen - 2.2.1.7-2 +- rebuild against ghc-6.12.2 +- condition ghc_lib_package + +* Tue Mar 23 2010 Jens Petersen - 2.2.1.7-1 +- update to 2.2.1.7 for haskell-platform-2010.1.0.0 + +* Mon Jan 11 2010 Jens Petersen - 2.2.1.5-1 +- update to 2.2.1.5 (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_deps +- build shared library +- drop redundant buildroot and its install cleaning + +* Tue Sep 22 2009 Jens Petersen - 2.2.1.4-2 +- version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884) + +* Wed Sep 16 2009 Jens Petersen - 2.2.1.4-1 +- initial packaging for Fedora created by cabal2spec diff --git a/sources b/sources new file mode 100644 index 0000000..5e6cb51 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +cfe4922ac85685be9f86d4d34654f481 network-2.3.0.11.tar.gz From 784316a8f89092c445363b7c502a00ef09a921ad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 17 Mar 2014 12:38:04 +0900 Subject: [PATCH 32/80] import 2.4.1.2-30 (#1059942) --- .gitignore | 1 + ghc-network.spec | 54 ++++++++++++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 146fecd..45ed8c4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ network-2.2.1.7.tar.gz /network-2.3.0.2.tar.gz /network-2.3.0.5.tar.gz /network-2.3.0.11.tar.gz +/network-2.4.1.2.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index feee2b1..fb287cc 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,28 +1,39 @@ -%global pkg_name network - -%global common_summary Haskell %{pkg_name} library +# https://fedoraproject.org/wiki/Packaging:Haskell -%global common_description A Haskell network library. +%global pkg_name network Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.3.0.11 -Release: 1%{?dist} -Summary: %{common_summary} +Version: 2.4.1.2 +Release: 30%{?dist} +Summary: Network library -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-parsec-prof +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-unix-devel +# End cabal-rpm deps %description -%{common_description} +Haskell basic networking library. + + +%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} + +%description devel +This package provides the Haskell %{pkg_name} library development files. %prep @@ -37,19 +48,26 @@ BuildRequires: ghc-parsec-prof %ghc_lib_install -%ghc_devel_package +%post devel +%ghc_pkg_recache -%ghc_devel_description +%postun devel +%ghc_pkg_recache -%ghc_devel_post_postun +%files -f %{name}.files +%doc LICENSE -%ghc_files LICENSE + +%files devel -f %{name}-devel.files %doc examples %changelog +* Fri Jan 31 2014 Jens Petersen - 2.4.1.2-30 +- spec file revived using cabal-rpm-0.8.8 + * Tue Mar 20 2012 Jens Petersen - 2.3.0.11-1 - update to 2.3.0.11 diff --git a/sources b/sources index 5e6cb51..e9e785a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cfe4922ac85685be9f86d4d34654f481 network-2.3.0.11.tar.gz +032075c35dea5d23923af3928f9a5511 network-2.4.1.2.tar.gz From e5f58e5d042579fa6a147a449d02119be0c1ec7f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 17 Mar 2014 12:48:21 +0900 Subject: [PATCH 33/80] bump release over haskell-platform --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index fb287cc..965f8fe 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -5,7 +5,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.4.1.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Network library License: BSD @@ -65,6 +65,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Mar 17 2014 Jens Petersen - 2.4.1.2-31 +- bump release over haskell-platform + * Fri Jan 31 2014 Jens Petersen - 2.4.1.2-30 - spec file revived using cabal-rpm-0.8.8 From b801ff5d11b62b48397d5226e53bfaaad07cbda1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Jun 2014 16:22:23 +0900 Subject: [PATCH 34/80] update to 2.4.2.2 with cblrpm-0.8.11 --- .gitignore | 1 + ghc-network.spec | 25 +++++++++++++++++++++---- sources | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 45ed8c4..8a51edb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ network-2.2.1.7.tar.gz /network-2.3.0.5.tar.gz /network-2.3.0.11.tar.gz /network-2.4.1.2.tar.gz +/network-2.4.2.2.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 965f8fe..3f69f92 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -2,15 +2,17 @@ %global pkg_name network +%bcond_with tests + Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.4.1.2 -Release: 31%{?dist} -Summary: Network library +Version: 2.4.2.2 +Release: 1%{?dist} +Summary: Low-level networking interface 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 +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -18,6 +20,12 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-bytestring-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-unix-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description @@ -48,6 +56,12 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install +%check +%if %{with tests} +%cabal test +%endif + + %post devel %ghc_pkg_recache @@ -65,6 +79,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jun 04 2014 Jens Petersen - 2.4.2.2-1 +- update to 2.4.2.2 with cabalrpm-0.8.11 + * Mon Mar 17 2014 Jens Petersen - 2.4.1.2-31 - bump release over haskell-platform diff --git a/sources b/sources index e9e785a..e9d570f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -032075c35dea5d23923af3928f9a5511 network-2.4.1.2.tar.gz +ef57169f445f33bfe553c25a7496cec8 network-2.4.2.2.tar.gz From b7562487eb2e089ba8522afb93cc398fbcac0c22 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Jun 2014 02:15:02 +0900 Subject: [PATCH 35/80] opt out of f21 mass rebuild due to changes staged for ghc78 --- noautobuild | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 noautobuild diff --git a/noautobuild b/noautobuild new file mode 100644 index 0000000..e69de29 From baa0688de5cac2859696e7b46488a36fdba8ff82 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 6 Jun 2014 13:10:41 +0200 Subject: [PATCH 36/80] ghc-network has ancient config.guess and config.sub which doesn't support ppc64le. Update with the ones included in rpm --- ghc-network.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 3f69f92..ba3afde 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -46,7 +46,8 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} - +# Use rpm's config.* to support new archs like ppc64le +cp -f /usr/lib/rpm/config.{guess,sub} . %build %ghc_lib_build @@ -79,6 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jun 06 2014 Karsten Hopp 2.4.2.2-2 +- Use rpm's config.* to support new archs like ppc64le + * Wed Jun 04 2014 Jens Petersen - 2.4.2.2-1 - update to 2.4.2.2 with cabalrpm-0.8.11 From aa61f64c6aa405b056f95850878981e098ce9293 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 9 Jun 2014 12:49:24 +0900 Subject: [PATCH 37/80] revert temporarily to 2.4.1.2 (current Haskell Platform) - to avoid a bunch of rawhide breakage from 2.4.2.2 being pushed inadvertently just before F21 Mass Rebuild - remove noautobuild which was not quite enough --- .gitignore | 1 - ghc-network.spec | 12 +++++------- noautobuild | 0 sources | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 noautobuild diff --git a/.gitignore b/.gitignore index 8a51edb..45ed8c4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ network-2.2.1.7.tar.gz /network-2.3.0.5.tar.gz /network-2.3.0.11.tar.gz /network-2.4.1.2.tar.gz -/network-2.4.2.2.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index ba3afde..4558388 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.4.2.2 -Release: 2%{?dist} +Version: 2.4.1.2 +Release: 32%{?dist} Summary: Low-level networking interface License: BSD @@ -80,11 +80,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog -* Fri Jun 06 2014 Karsten Hopp 2.4.2.2-2 -- Use rpm's config.* to support new archs like ppc64le - -* Wed Jun 04 2014 Jens Petersen - 2.4.2.2-1 -- update to 2.4.2.2 with cabalrpm-0.8.11 +* Mon Jun 9 2014 Jens Petersen - 2.4.1.2-32 +- update to cabalrpm-0.8.11 +- Use rpm's config.* to support new archs like ppc64le (Karsten Hopp) * Mon Mar 17 2014 Jens Petersen - 2.4.1.2-31 - bump release over haskell-platform diff --git a/noautobuild b/noautobuild deleted file mode 100644 index e69de29..0000000 diff --git a/sources b/sources index e9d570f..e9e785a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef57169f445f33bfe553c25a7496cec8 network-2.4.2.2.tar.gz +032075c35dea5d23923af3928f9a5511 network-2.4.1.2.tar.gz From ea64ff05620b490a94c825b0cd4e88a166b3cb68 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 8 Aug 2014 16:24:17 +0200 Subject: [PATCH 38/80] update to 2.4.2.3 --- .gitignore | 1 + ghc-network.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 45ed8c4..a025e96 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ network-2.2.1.7.tar.gz /network-2.3.0.5.tar.gz /network-2.3.0.11.tar.gz /network-2.4.1.2.tar.gz +/network-2.4.2.3.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 4558388..dde366b 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.4.1.2 -Release: 32%{?dist} +Version: 2.4.2.3 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -80,6 +80,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Fri Aug 8 2014 Jens Petersen - 2.4.2.3-1 +- update to 2.4.2.3 + * Mon Jun 9 2014 Jens Petersen - 2.4.1.2-32 - update to cabalrpm-0.8.11 - Use rpm's config.* to support new archs like ppc64le (Karsten Hopp) diff --git a/sources b/sources index e9e785a..cf151af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -032075c35dea5d23923af3928f9a5511 network-2.4.1.2.tar.gz +54ec8a215843b1e109c2a3960befb8d2 network-2.4.2.3.tar.gz From 0a6c9e5b5afcd97f5180cf430d040e55442f9f98 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 15:30:27 +0000 Subject: [PATCH 39/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index dde366b..d1b1ebc 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -80,6 +80,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 2.4.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 8 2014 Jens Petersen - 2.4.2.3-1 - update to 2.4.2.3 From a2436bcfd8ba9b0078c311c07ecbf5491f19626a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2015 15:47:59 +0900 Subject: [PATCH 40/80] cblrpm refresh --- ghc-network.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index d1b1ebc..4f4013a 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,12 +7,12 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.4.2.3 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Low-level networking interface License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/package/%{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 @@ -29,7 +29,7 @@ BuildRequires: ghc-test-framework-quickcheck2-devel # End cabal-rpm deps %description -Haskell basic networking library. +Low-level networking interface. %package devel @@ -76,13 +76,10 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %files devel -f %{name}-devel.files -%doc examples +%doc README examples %changelog -* Sat Aug 16 2014 Fedora Release Engineering - 2.4.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - * Fri Aug 8 2014 Jens Petersen - 2.4.2.3-1 - update to 2.4.2.3 From 519ff8db6b355872f925141bc6e9a3d02dc40ee4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:52:17 +0000 Subject: [PATCH 41/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 4f4013a..7392039 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -80,6 +80,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.4.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Aug 8 2014 Jens Petersen - 2.4.2.3-1 - update to 2.4.2.3 From 32fe25f80f375390b5297867ab144dedc1fdb4cf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Sep 2015 18:39:35 +0900 Subject: [PATCH 42/80] update to 2.6.2.1 --- .gitignore | 1 + ghc-network.spec | 20 +++++++++++++------- sources | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a025e96..1f59d5c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ network-2.2.1.7.tar.gz /network-2.3.0.11.tar.gz /network-2.4.1.2.tar.gz /network-2.4.2.3.tar.gz +/network-2.6.2.1.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 7392039..99fdefd 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.4.2.3 -Release: 2%{?dist} +Version: 2.6.2.1 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -18,18 +18,19 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-parsec-devel BuildRequires: ghc-unix-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel %endif # End cabal-rpm deps %description -Low-level networking interface. +This package provides a low-level networking interface. + +In network-2.6 the 'Network.URI' module was split off into its own package, +network-uri-2.6. %package devel @@ -56,6 +57,8 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check %if %{with tests} @@ -72,14 +75,17 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files -%doc README examples +%doc README.md examples %changelog +* Thu Sep 17 2015 Jens Petersen - 2.6.2.1-1 +- update to 2.6.2.1 + * Wed Jun 17 2015 Fedora Release Engineering - 2.4.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index cf151af..461963d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54ec8a215843b1e109c2a3960befb8d2 network-2.4.2.3.tar.gz +c58ab6f46a20a755970bec73f7bd4612 network-2.6.2.1.tar.gz From bdf2787cf20710fe4678b19c14bf50a159b95226 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:13:52 +0900 Subject: [PATCH 43/80] Reverting "update to 2.6.2.1" This reverts commit 32fe25f80f375390b5297867ab144dedc1fdb4cf. --- .gitignore | 1 - ghc-network.spec | 20 +++++++------------- sources | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 1f59d5c..a025e96 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ network-2.2.1.7.tar.gz /network-2.3.0.11.tar.gz /network-2.4.1.2.tar.gz /network-2.4.2.3.tar.gz -/network-2.6.2.1.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 99fdefd..7392039 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.6.2.1 -Release: 1%{?dist} +Version: 2.4.2.3 +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -18,19 +18,18 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-parsec-devel BuildRequires: ghc-unix-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel %endif # End cabal-rpm deps %description -This package provides a low-level networking interface. - -In network-2.6 the 'Network.URI' module was split off into its own package, -network-uri-2.6. +Low-level networking interface. %package devel @@ -57,8 +56,6 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check %if %{with tests} @@ -75,17 +72,14 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc LICENSE %files devel -f %{name}-devel.files -%doc README.md examples +%doc README examples %changelog -* Thu Sep 17 2015 Jens Petersen - 2.6.2.1-1 -- update to 2.6.2.1 - * Wed Jun 17 2015 Fedora Release Engineering - 2.4.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 461963d..cf151af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c58ab6f46a20a755970bec73f7bd4612 network-2.6.2.1.tar.gz +54ec8a215843b1e109c2a3960befb8d2 network-2.4.2.3.tar.gz From e9079b3632112934f44013f71e9b989bd542c6f8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:39:07 +0000 Subject: [PATCH 44/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 7392039..4989ba8 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.4.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Low-level networking interface License: BSD @@ -80,6 +80,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.4.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 2.4.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From ec2d085bb34e1bce06b7ed8ced1eda6e316f5df0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2016 10:48:21 +0900 Subject: [PATCH 45/80] update to 2.6.2.1 This reverts commit bdf2787cf20710fe4678b19c14bf50a159b95226. --- .gitignore | 1 + ghc-network.spec | 20 +++++++++++++------- sources | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a025e96..1f59d5c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ network-2.2.1.7.tar.gz /network-2.3.0.11.tar.gz /network-2.4.1.2.tar.gz /network-2.4.2.3.tar.gz +/network-2.6.2.1.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 4989ba8..684f8ef 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.4.2.3 -Release: 3%{?dist} +Version: 2.6.2.1 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -18,18 +18,19 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-parsec-devel BuildRequires: ghc-unix-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel %endif # End cabal-rpm deps %description -Low-level networking interface. +This package provides a low-level networking interface. + +In network-2.6 the 'Network.URI' module was split off into its own package, +network-uri-2.6. %package devel @@ -56,6 +57,8 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check %if %{with tests} @@ -72,14 +75,17 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files -%doc README examples +%doc README.md examples %changelog +* Tue Jun 7 2016 Jens Petersen - 2.6.2.1-1 +- update to 2.6.2.1 + * Wed Feb 03 2016 Fedora Release Engineering - 2.4.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index cf151af..461963d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54ec8a215843b1e109c2a3960befb8d2 network-2.4.2.3.tar.gz +c58ab6f46a20a755970bec73f7bd4612 network-2.6.2.1.tar.gz From 701cba1c3c2ddbb73f938e6fcd8655188c051e88 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:46 +0900 Subject: [PATCH 46/80] no longer remove license; use cabal_test --- ghc-network.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 684f8ef..deae2ff 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -57,13 +57,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel From 8a2809ce5100ca7cf971bc7f4ef02ba6ca6f505f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:44:45 +0000 Subject: [PATCH 47/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index deae2ff..6fc539c 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.6.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -79,6 +79,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.6.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jun 7 2016 Jens Petersen - 2.6.2.1-1 - update to 2.6.2.1 From 66e2de97c50c26ff637049e63f90a7a94e246486 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 10:04:55 +0900 Subject: [PATCH 48/80] update to 2.6.3.1 --- .gitignore | 1 + ghc-network.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1f59d5c..e5b07a9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ network-2.2.1.7.tar.gz /network-2.4.1.2.tar.gz /network-2.4.2.3.tar.gz /network-2.6.2.1.tar.gz +/network-2.6.3.1.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 6fc539c..2da1655 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,18 +1,20 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.6.2.1 -Release: 2%{?dist} +Version: 2.6.3.1 +Release: 1%{?dist} Summary: Low-level networking interface 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 @@ -21,6 +23,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-unix-devel %if %{with tests} BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-doctest-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel %endif @@ -46,7 +49,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} # Use rpm's config.* to support new archs like ppc64le cp -f /usr/lib/rpm/config.{guess,sub} . @@ -75,10 +78,13 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %files devel -f %{name}-devel.files -%doc README.md examples +%doc CHANGELOG.md README.md examples %changelog +* Wed Feb 22 2017 Jens Petersen - 2.6.3.1-1 +- update to 2.6.3.1 + * Fri Feb 10 2017 Fedora Release Engineering - 2.6.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 461963d..2abb2df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c58ab6f46a20a755970bec73f7bd4612 network-2.6.2.1.tar.gz +SHA512 (network-2.6.3.1.tar.gz) = 3c23ef0a1bf5383cc2479a517875037f9de38c79c1293734cc723111ab880a5842e091ee91a612090d0a2e422d53028d17cf5b0800af0d1d6c983d564197b9a6 From 1787d4ab209b41a9e5d4b387a6727a0f79cb1718 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:50:13 +0000 Subject: [PATCH 49/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 2da1655..42d262c 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.6.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -82,6 +82,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jens Petersen - 2.6.3.1-1 - update to 2.6.3.1 From 42b3160b42e8ee920adb66cb617d6cb9bb39a3b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:26:37 +0000 Subject: [PATCH 50/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 42d262c..b7a3c7b 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.6.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Low-level networking interface License: BSD @@ -82,6 +82,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.6.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.6.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 6587d6c9067813a8036ee4333669c5e9c6618d6e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:11:39 +0100 Subject: [PATCH 51/80] refresh to cabal-rpm-0.12.1 --- ghc-network.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index b7a3c7b..1c9480e 100644 --- a/ghc-network.spec +++ b/ghc-network.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 network @@ -39,9 +39,12 @@ network-uri-2.6. %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} %description devel @@ -65,6 +68,12 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From b2a3f71bb8469df300342b6d6e07dc5fe83637b3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:43:45 +0100 Subject: [PATCH 52/80] update to 2.6.3.2 --- .gitignore | 1 + ghc-network.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e5b07a9..52d46ed 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ network-2.2.1.7.tar.gz /network-2.4.2.3.tar.gz /network-2.6.2.1.tar.gz /network-2.6.3.1.tar.gz +/network-2.6.3.2.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 1c9480e..a97d9cd 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -8,8 +8,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 2.6.3.1 -Release: 3%{?dist} +Version: 2.6.3.2 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -91,6 +91,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Wed Jan 24 2018 Jens Petersen - 2.6.3.2-1 +- update to 2.6.3.2 + * Wed Aug 02 2017 Fedora Release Engineering - 2.6.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 2abb2df..2319b41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-2.6.3.1.tar.gz) = 3c23ef0a1bf5383cc2479a517875037f9de38c79c1293734cc723111ab880a5842e091ee91a612090d0a2e422d53028d17cf5b0800af0d1d6c983d564197b9a6 +SHA512 (network-2.6.3.2.tar.gz) = 990eefc6f3635f3e6f75617bf13e8832983befd0194e48602fa2967002a4fccabfe9ce276759a403ad4d68802f59c8f50699aa78211cb8cc3dc2d6d91e0a6ea6 From 79562ee0d8f0b7e6e4a2cc5f27caef2329a3475a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:04 +0900 Subject: [PATCH 53/80] drop ldconfig scriptlets --- ghc-network.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index a97d9cd..dca33d4 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -68,12 +68,6 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From a9af83f1bd01d1ac28c56b9412b3a4aaaacc1865 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:56:17 +0000 Subject: [PATCH 54/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index dca33d4..b06d726 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.6.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -85,6 +85,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.6.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 2.6.3.2-1 - update to 2.6.3.2 From ab5c3d9b9c4bef4aa5c21888c0135d1f953d4c9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:00:01 +0000 Subject: [PATCH 55/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index b06d726..7ee6064 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 2.6.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Low-level networking interface License: BSD @@ -85,6 +85,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.6.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.6.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 920022d0a747272469436e898f022041a9c4a58b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 00:24:24 +0900 Subject: [PATCH 56/80] remove part of haskell-platform comment --- ghc-network.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 7ee6064..3e3585c 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -7,7 +7,6 @@ %bcond_with tests Name: ghc-%{pkg_name} -# part of haskell-platform Version: 2.6.3.2 Release: 3%{?dist} Summary: Low-level networking interface From a79fd36be66e75bc2a5ceae9e71258c67770cbd0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 23:18:56 +0900 Subject: [PATCH 57/80] update to 2.6.3.5 --- .gitignore | 1 + ghc-network.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 52d46ed..7c7f909 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ network-2.2.1.7.tar.gz /network-2.6.2.1.tar.gz /network-2.6.3.1.tar.gz /network-2.6.3.2.tar.gz +/network-2.6.3.5.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 3e3585c..ccb2282 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -4,11 +4,11 @@ %global pkg_name network %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} -Version: 2.6.3.2 -Release: 3%{?dist} +Version: 2.6.3.5 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -23,8 +23,7 @@ BuildRequires: ghc-unix-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-doctest-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-hspec-devel %endif # End cabal-rpm deps @@ -84,6 +83,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Sun Jul 22 2018 Jens Petersen - 2.6.3.5-1 +- update to 2.6.3.5 + * Fri Jul 13 2018 Fedora Release Engineering - 2.6.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 2319b41..58648c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-2.6.3.2.tar.gz) = 990eefc6f3635f3e6f75617bf13e8832983befd0194e48602fa2967002a4fccabfe9ce276759a403ad4d68802f59c8f50699aa78211cb8cc3dc2d6d91e0a6ea6 +SHA512 (network-2.6.3.5.tar.gz) = 7cf90ba633d1ee19e0adf6f47139757d62d62950461e111b4aa58fcf24237c0eaf949c7a00a5a948496ac3d76877183cb00ceb696f998333daa9aaca157bcc3f From d3b8b1205fd6ec28c84378786ea586aaffe5f2e3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 Jul 2018 01:35:06 +0900 Subject: [PATCH 58/80] update to 2.6.3.6 --- .gitignore | 1 + ghc-network.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c7f909..4204b78 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ network-2.2.1.7.tar.gz /network-2.6.3.1.tar.gz /network-2.6.3.2.tar.gz /network-2.6.3.5.tar.gz +/network-2.6.3.6.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index ccb2282..dc96809 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network @@ -7,7 +7,7 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 2.6.3.5 +Version: 2.6.3.6 Release: 1%{?dist} Summary: Low-level networking interface @@ -83,6 +83,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Thu Jul 26 2018 Jens Petersen - 2.6.3.6-1 +- update to 2.6.3.6 + * Sun Jul 22 2018 Jens Petersen - 2.6.3.5-1 - update to 2.6.3.5 diff --git a/sources b/sources index 58648c7..7eb26dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-2.6.3.5.tar.gz) = 7cf90ba633d1ee19e0adf6f47139757d62d62950461e111b4aa58fcf24237c0eaf949c7a00a5a948496ac3d76877183cb00ceb696f998333daa9aaca157bcc3f +SHA512 (network-2.6.3.6.tar.gz) = ff3016b0d481ed81cd60be9006abf44b55d0f360419b92bec6a07c2be8feb7dd33aa966cb9b4ceb07b7988570383d9161ee33329e5bc37efe2f87884b776e1e6 From 465076de5cc23443ac1ece15f991df8c9b153e5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:49:02 +0000 Subject: [PATCH 59/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index dc96809..1dfa2e7 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -83,6 +83,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.6.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 26 2018 Jens Petersen - 2.6.3.6-1 - update to 2.6.3.6 From 5d94bb9309ef9567f3a56707879a49bd4b635d00 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:46:28 +0800 Subject: [PATCH 60/80] refresh to cabal-rpm-0.13 --- ghc-network.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 1dfa2e7..86ede1b 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 2.6.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Low-level networking interface 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: ghc-unix-devel %if %{with tests} @@ -50,16 +52,22 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup # Use rpm's config.* to support new archs like ppc64le cp -f /usr/lib/rpm/config.{guess,sub} . %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 @@ -75,7 +83,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -83,6 +93,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Sun Feb 17 2019 Jens Petersen - 2.6.3.6-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 2.6.3.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 582a0cfb43d117e861d3654b88a93c5bf74b0701 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:47:23 +0000 Subject: [PATCH 61/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 86ede1b..997b294 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.6.3.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Low-level networking interface License: BSD @@ -93,6 +93,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.6.3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 2.6.3.6-3 - refresh to cabal-rpm-0.13 From 7d1bc687023647f942be99f868b5b80af955e5f8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:24:52 +0000 Subject: [PATCH 62/80] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-network.spec | 49 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 997b294..37f16a1 100644 --- a/ghc-network.spec +++ b/ghc-network.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 network @@ -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: ghc-unix-devel @@ -39,11 +45,8 @@ network-uri-2.6. %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} @@ -51,6 +54,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release} 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} @@ -58,6 +80,7 @@ This package provides the Haskell %{pkg_name} library development files. # Use rpm's config.* to support new archs like ppc64le cp -f /usr/lib/rpm/config.{guess,sub} . + %build # Begin cabal-rpm build: %ghc_lib_build @@ -74,14 +97,6 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -92,6 +107,16 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %doc CHANGELOG.md README.md examples +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 2.6.3.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 97cd3b424aee705d854cb71957617f9efb747edb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 16:17:01 +0000 Subject: [PATCH 63/80] update to 2.8.0.1 disable tests: https://github.com/haskell/network/issues/333 --- .gitignore | 1 + ghc-network.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4204b78..4196f39 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ network-2.2.1.7.tar.gz /network-2.6.3.2.tar.gz /network-2.6.3.5.tar.gz /network-2.6.3.6.tar.gz +/network-2.8.0.1.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 37f16a1..01cdb24 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -4,11 +4,11 @@ %global pkg_name network %global pkgver %{pkg_name}-%{version} -%bcond_without tests +%bcond_with tests Name: ghc-%{pkg_name} -Version: 2.6.3.6 -Release: 4%{?dist} +Version: 2.8.0.1 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -30,8 +30,10 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-unix-devel %if %{with tests} BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-directory-devel BuildRequires: ghc-doctest-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-discover-devel %endif # End cabal-rpm deps @@ -118,6 +120,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Thu Jul 25 2019 Jens Petersen - 2.8.0.1-1 +- update to 2.8.0.1 + * Thu Jul 25 2019 Fedora Release Engineering - 2.6.3.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7eb26dd..8b8369c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-2.6.3.6.tar.gz) = ff3016b0d481ed81cd60be9006abf44b55d0f360419b92bec6a07c2be8feb7dd33aa966cb9b4ceb07b7988570383d9161ee33329e5bc37efe2f87884b776e1e6 +SHA512 (network-2.8.0.1.tar.gz) = e133b1fadfdb0a38fff1fbeabec8ec90a8e7ec49a32a168077588289127ede25b7b4077269eac99f42df657f52e73332a58781e4d9ffd1cd1058497d8ac90f85 From e88dafce72f512710af25d7e2e4f15df2f82947b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:30:49 +0800 Subject: [PATCH 64/80] BR prof for lib and static for executable --- ghc-network.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 01cdb24..5b8acaf 100644 --- a/ghc-network.spec +++ b/ghc-network.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 network @@ -19,15 +19,10 @@ 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-unix-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-unix-prof %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-directory-devel @@ -47,6 +42,7 @@ network-uri-2.6. %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 249a9e8f0a7132a4cc17affedbe9979e96f33551 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:06:49 +0000 Subject: [PATCH 65/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 5b8acaf..2440f64 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.8.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -116,6 +116,9 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.8.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 2.8.0.1-1 - update to 2.8.0.1 From b9f82e46f52650bacb9a1db05ab0ec98f5020843 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 15:52:23 +0800 Subject: [PATCH 66/80] refresh to cabal-rpm-2.0.2 --- ghc-network.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 2440f64..e5a51c3 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,9 +1,10 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name network %global pkgver %{pkg_name}-%{version} +# needs net? %bcond_with tests Name: ghc-%{pkg_name} @@ -55,6 +56,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. @@ -65,6 +67,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. @@ -95,6 +98,16 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %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 @@ -107,6 +120,7 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 059022b6ea72fc89f74729ea0907e77319872d6c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 9 Jul 2020 22:48:38 +0800 Subject: [PATCH 67/80] no longer overwrite config.{guess,sub} --- ghc-network.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index e5a51c3..34fc8e0 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 2.8.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Low-level networking interface License: BSD @@ -78,8 +78,6 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} # End cabal-rpm setup -# Use rpm's config.* to support new archs like ppc64le -cp -f /usr/lib/rpm/config.{guess,sub} . %build @@ -130,6 +128,10 @@ cp -f /usr/lib/rpm/config.{guess,sub} . %changelog +* Thu Jul 9 2020 Jens Petersen - 2.8.0.1-3 +- refresh to cabal-rpm-2.0.2 +- no longer overwrite config.{guess,sub}, to fix rawhide build + * Tue Jan 28 2020 Fedora Release Engineering - 2.8.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 645d5dcde1e40a4a22b0e3d34530e93cebaf3a09 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:27:31 +0800 Subject: [PATCH 68/80] refresh to cabal-rpm-2.0.5 --- ghc-network.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index 34fc8e0..99160ed 100644 --- a/ghc-network.spec +++ b/ghc-network.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 network %global pkgver %{pkg_name}-%{version} @@ -89,6 +89,7 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install +chmod a-x CHANGELOG.md README.md # End cabal-rpm install From a3ac1e6cfb1c6779ddbfb1cd3de035dba320eb68 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 11:37:48 +0800 Subject: [PATCH 69/80] update to 3.1.1.1 --- .gitignore | 1 + ghc-network.spec | 42 ++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 4196f39..886a865 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ network-2.2.1.7.tar.gz /network-2.6.3.5.tar.gz /network-2.6.3.6.tar.gz /network-2.8.0.1.tar.gz +/network-3.1.1.1.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 99160ed..6c0cd97 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.5.1 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name network @@ -8,8 +8,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.8.0.1 -Release: 3%{?dist} +Version: 3.1.1.1 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -23,11 +23,10 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof -BuildRequires: ghc-unix-prof +BuildRequires: ghc-deepseq-prof %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-doctest-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-hspec-discover-devel %endif @@ -36,8 +35,23 @@ BuildRequires: ghc-hspec-discover-devel %description This package provides a low-level networking interface. -In network-2.6 the 'Network.URI' module was split off into its own package, -network-uri-2.6. +=== High-Level Packages Other packages provide higher level interfaces: + +* connection * hookup * network-simple + +=== Extended Packages 'network' seeks to provide a cross-platform core for +networking. As such some APIs live in extended libraries. Packages in the +'network' ecosystem are often prefixed with 'network-'. + +==== 'network-bsd' In 'network-3.0.0.0' the 'Network.BSD' module was split off +into its own package, 'network-bsd-3.0.0.0'. + +==== 'network-uri' In 'network-2.6' the 'Network.URI' module was split off into +its own package, 'network-uri-2.6'. If you're using the 'Network.URI' module +you can automatically get it from the right package by adding this to your +'.cabal' file: + +> library > build-depends: network-uri-flag. %package devel @@ -89,7 +103,6 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install -chmod a-x CHANGELOG.md README.md # End cabal-rpm install @@ -97,16 +110,6 @@ chmod a-x CHANGELOG.md README.md %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 @@ -129,6 +132,9 @@ chmod a-x CHANGELOG.md README.md %changelog +* Fri Jul 10 2020 Jens Petersen - 3.1.1.1-1 +- update to 3.1.1.1 + * Thu Jul 9 2020 Jens Petersen - 2.8.0.1-3 - refresh to cabal-rpm-2.0.2 - no longer overwrite config.{guess,sub}, to fix rawhide build diff --git a/sources b/sources index 8b8369c..060c698 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-2.8.0.1.tar.gz) = e133b1fadfdb0a38fff1fbeabec8ec90a8e7ec49a32a168077588289127ede25b7b4077269eac99f42df657f52e73332a58781e4d9ffd1cd1058497d8ac90f85 +SHA512 (network-3.1.1.1.tar.gz) = caafd3c0730d0f6378230e0acdf285ca50480f02a44963c1f9ae9dc3d53cd496dd3171d7ff4bf79a1e072b85698d74f82d8075b999d5ba1d17ab1429c8094ca8 From 672c2f7375c634e6ada63f9060298f3907b09bb6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:56:09 +0800 Subject: [PATCH 70/80] refresh to cabal-rpm-2.0.6 --- ghc-network.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 6c0cd97..089044f 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5.1 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name network From e3647b8a0a42b23fd7a7bc2220c2c8a34694b0f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:26:55 +0000 Subject: [PATCH 71/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 089044f..ace2198 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 3.1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level networking interface License: BSD @@ -132,6 +132,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jens Petersen - 3.1.1.1-1 - update to 3.1.1.1 From 3e25c3c751e2c5705ee13028ecef7daeb615235f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:16:15 +0000 Subject: [PATCH 72/80] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index ace2198..6038e30 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 3.1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Low-level networking interface License: BSD @@ -132,6 +132,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.1.1.1-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 3.1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2bf0726e97e7f3ec13ac4dcd6ce136831cde7018 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:31:21 +0000 Subject: [PATCH 73/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 6038e30..8cb7c48 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 3.1.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Low-level networking interface License: BSD @@ -132,6 +132,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.1.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 3.1.1.1-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5b241fd94e778fd41355e8696627b615cf5db76b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:00:53 +0000 Subject: [PATCH 74/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 8cb7c48..9982159 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 3.1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Low-level networking interface License: BSD @@ -132,6 +132,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.1.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 3.1.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 10f59844d5bc7eb99f9258395a5cc16d56a1d9da Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 24 Jun 2021 17:29:59 +0800 Subject: [PATCH 75/80] cabal-rpm-2.0.9 --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 9982159..ed2a29c 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name network @@ -71,6 +71,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. @@ -107,7 +108,9 @@ This package provides the Haskell %{pkg_name} profiling library. %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 9f1114571ca8f24265de34c6150cc869ccbab701 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 12:43:13 +0800 Subject: [PATCH 76/80] drop deprecated hsnet_inet_ntoa from HsNet.h --- ghc-network.spec | 7 +++++- network-3.1-unused-hsnet_inet_ntoa.patch | 27 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 network-3.1-unused-hsnet_inet_ntoa.patch diff --git a/ghc-network.spec b/ghc-network.spec index ed2a29c..5058b20 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 3.1.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Low-level networking interface License: BSD @@ -17,6 +17,7 @@ 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 +Patch0: network-3.1-unused-hsnet_inet_ntoa.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -93,6 +94,7 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} # End cabal-rpm setup +%patch0 -p1 -b .orig %build @@ -135,6 +137,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 3.1.1.1-6 +- drop deprecated hsnet_inet_ntoa from HsNet.h + * Thu Jul 22 2021 Fedora Release Engineering - 3.1.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/network-3.1-unused-hsnet_inet_ntoa.patch b/network-3.1-unused-hsnet_inet_ntoa.patch new file mode 100644 index 0000000..9f0a0c6 --- /dev/null +++ b/network-3.1-unused-hsnet_inet_ntoa.patch @@ -0,0 +1,27 @@ +--- network-3.1.1.1/include/HsNet.h~ 2001-09-09 09:46:40.000000000 +0800 ++++ network-3.1.1.1/include/HsNet.h 2021-06-24 17:25:39.287773682 +0800 +@@ -86,24 +86,6 @@ + recvFd(int sock); + #endif /* _WIN32 */ + +-INLINE char * +-hsnet_inet_ntoa( +-#if defined(_WIN32) +- u_long addr +-#elif defined(HAVE_IN_ADDR_T) +- in_addr_t addr +-#elif defined(HAVE_INTTYPES_H) +- u_int32_t addr +-#else +- unsigned long addr +-#endif +- ) +-{ +- struct in_addr a; +- a.s_addr = addr; +- return inet_ntoa(a); +-} +- + INLINE int + hsnet_getnameinfo(const struct sockaddr* a,socklen_t b, char* c, + # if defined(_WIN32) From 12e32e17d6706c978db5c35475e8479d549a74f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:17:19 +0000 Subject: [PATCH 77/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 5058b20..be7375b 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 3.1.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Low-level networking interface License: BSD @@ -137,6 +137,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.1.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 3.1.1.1-6 - drop deprecated hsnet_inet_ntoa from HsNet.h From 729d14790954120e6630270cf5a2eb375e52cfa3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 9 Mar 2022 00:28:12 +0800 Subject: [PATCH 78/80] bump release --- ghc-network.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index be7375b..483fa00 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 3.1.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Low-level networking interface License: BSD @@ -137,6 +137,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Mar 08 2022 Jens Petersen - 3.1.1.1-8 +- rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 3.1.1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From dc0366dab70065128091ccbaef17a0f65493cc2e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 May 2022 17:03:08 +0800 Subject: [PATCH 79/80] update to 3.1.2.7 --- .gitignore | 1 + ghc-network.spec | 13 +++++++----- network-3.1-unused-hsnet_inet_ntoa.patch | 27 ------------------------ sources | 2 +- 4 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 network-3.1-unused-hsnet_inet_ntoa.patch diff --git a/.gitignore b/.gitignore index 886a865..300b5f5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ network-2.2.1.7.tar.gz /network-2.6.3.6.tar.gz /network-2.8.0.1.tar.gz /network-3.1.1.1.tar.gz +/network-3.1.2.7.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 483fa00..c3f0a6f 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -8,8 +8,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.1.1.1 -Release: 8%{?dist} +Version: 3.1.2.7 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -17,7 +17,6 @@ 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 -Patch0: network-3.1-unused-hsnet_inet_ntoa.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -25,11 +24,13 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-directory-prof %if %{with tests} BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-directory-devel +BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-hspec-discover-devel +BuildRequires: ghc-temporary-devel %endif # End cabal-rpm deps @@ -94,7 +95,6 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} # End cabal-rpm setup -%patch0 -p1 -b .orig %build @@ -137,6 +137,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon May 02 2022 Jens Petersen - 3.1.2.7-1 +- https://hackage.haskell.org/package/network-3.1.2.7/changelog + * Tue Mar 08 2022 Jens Petersen - 3.1.1.1-8 - rebuild diff --git a/network-3.1-unused-hsnet_inet_ntoa.patch b/network-3.1-unused-hsnet_inet_ntoa.patch deleted file mode 100644 index 9f0a0c6..0000000 --- a/network-3.1-unused-hsnet_inet_ntoa.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- network-3.1.1.1/include/HsNet.h~ 2001-09-09 09:46:40.000000000 +0800 -+++ network-3.1.1.1/include/HsNet.h 2021-06-24 17:25:39.287773682 +0800 -@@ -86,24 +86,6 @@ - recvFd(int sock); - #endif /* _WIN32 */ - --INLINE char * --hsnet_inet_ntoa( --#if defined(_WIN32) -- u_long addr --#elif defined(HAVE_IN_ADDR_T) -- in_addr_t addr --#elif defined(HAVE_INTTYPES_H) -- u_int32_t addr --#else -- unsigned long addr --#endif -- ) --{ -- struct in_addr a; -- a.s_addr = addr; -- return inet_ntoa(a); --} -- - INLINE int - hsnet_getnameinfo(const struct sockaddr* a,socklen_t b, char* c, - # if defined(_WIN32) diff --git a/sources b/sources index 060c698..c491e78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-3.1.1.1.tar.gz) = caafd3c0730d0f6378230e0acdf285ca50480f02a44963c1f9ae9dc3d53cd496dd3171d7ff4bf79a1e072b85698d74f82d8075b999d5ba1d17ab1429c8094ca8 +SHA512 (network-3.1.2.7.tar.gz) = 2e4fa22656c015ca9b8fe7e0dfa824ae943010b0716e4c4cc5495d5b98a6cfecbe33180851f8eeea9d4b2f34beff13b6b1888d5b18b68822febc73c05410bc57 From 6efdc5cebdace2b459a8fb648e9cb6f27f2e37d7 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:48:27 +0300 Subject: [PATCH 80/80] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index c491e78..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (network-3.1.2.7.tar.gz) = 2e4fa22656c015ca9b8fe7e0dfa824ae943010b0716e4c4cc5495d5b98a6cfecbe33180851f8eeea9d4b2f34beff13b6b1888d5b18b68822febc73c05410bc57