From 7519dfc90b79ee3aafe869f5b1824b415847567d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 26 Aug 2009 22:19:23 +0000 Subject: [PATCH 01/75] Setup of module ghc-HUnit --- .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..b55d83a --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: ghc-HUnit +# $Id$ +NAME := ghc-HUnit +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 42eb3913c4a11f11104b0e779edcf2f183d35f4a Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Thu, 27 Aug 2009 19:36:22 +0000 Subject: [PATCH 02/75] ghc-HUnit 1.2.0.3 --- .cvsignore | 1 + ghc-HUnit.spec | 141 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 143 insertions(+) create mode 100644 ghc-HUnit.spec diff --git a/.cvsignore b/.cvsignore index e69de29..60221ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +HUnit-1.2.0.3.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec new file mode 100644 index 0000000..a3cc08c --- /dev/null +++ b/ghc-HUnit.spec @@ -0,0 +1,141 @@ +%global pkg_name HUnit + +%bcond_without doc +%bcond_without prof + +# ghc does not emit debug information +%global debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 1.2.0.3 +Release: 1%{?dist} +Summary: Haskell %{pkg_name} library + +Group: Development/Libraries +License: BSD +URL: http://hunit.sourceforge.net/ +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 +BuildRequires: 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. HUnit +is a unit testing framework for Haskell, inspired by the JUnit tool +for Java. + +%package devel +Summary: Haskell %{pkg_name} library +Group: Development/Libraries +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 +* Wed Aug 12 2009 Bryan O'Sullivan - 1.2.0.3-1 +- initial packaging for Fedora created by cabal2spec diff --git a/sources b/sources index e69de29..5d6b959 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +948b5b20ff22fa81c6390b08d6af5104 HUnit-1.2.0.3.tar.gz From e9e1a510a37d9f68db85a1ce6e822e64f8530836 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 16 Sep 2009 09:28:50 +0000 Subject: [PATCH 03/75] specify the haskell-platform version and note part of ghc extralibs --- ghc-HUnit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index a3cc08c..21e07b9 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -7,6 +7,7 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} +# part of haskell-platform-2009.2.0.2 and ghc-6.10.x extralibs! Version: 1.2.0.3 Release: 1%{?dist} Summary: Haskell %{pkg_name} library From 9e084e3abc5dfcbc3036c4f3da45e06b5276afb0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:25 +0000 Subject: [PATCH 04/75] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b55d83a..3261201 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ghc-HUnit 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 36f7fb7fe9f8d340dd6d37212f98804121bb712f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 22 Dec 2009 16:37:11 +0000 Subject: [PATCH 05/75] - update packaging for ghc-6.12.1 - added shared library support: needs ghc-rpm-macros 0.3.1 --- ghc-HUnit.spec | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 21e07b9..92b2b1f 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -2,6 +2,7 @@ %bcond_without doc %bcond_without prof +%bcond_without shared # ghc does not emit debug information %global debug_package %{nil} @@ -9,18 +10,16 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2009.2.0.2 and ghc-6.10.x extralibs! Version: 1.2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Haskell %{pkg_name} library -Group: Development/Libraries +Group: System Environment/Libraries License: BSD URL: http://hunit.sourceforge.net/ 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 -BuildRequires: ghc-rpm-macros +BuildRequires: ghc, ghc-rpm-macros >= 0.3.1 %if %{with doc} BuildRequires: ghc-doc %endif @@ -34,11 +33,14 @@ is a unit testing framework for Haskell, inspired by the JUnit tool for Java. %package devel -Summary: Haskell %{pkg_name} library +Summary: Haskell %{pkg_name} library development files Group: Development/Libraries Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} -Requires(preun): ghc = %{ghc_version} +Requires(postun): ghc = %{ghc_version} +%if %{with shared} +Requires: %{name} = %{version}-%{release} +%endif %description devel This package contains the development files for %{name} @@ -82,13 +84,12 @@ built for ghc-%{ghc_version}. %if %{with doc} %cabal haddock %endif -%ghc_gen_scripts %install -rm -rf $RPM_BUILD_ROOT %cabal_install -%ghc_install_scripts +%cabal_pkg_conf + %ghc_gen_filelists %{name} @@ -97,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT %post devel -%ghc_register_pkg +ghc-pkg recache %if %{with doc} @@ -106,10 +107,8 @@ rm -rf $RPM_BUILD_ROOT %endif -%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi +%postun devel +ghc-pkg recache %if %{with doc} @@ -120,9 +119,18 @@ fi %endif +%if %{with shared} +%files -f %{name}.files +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version} +%endif + + %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%if %{without shared} %{_docdir}/%{name}-%{version} +%endif %if %{with doc} @@ -138,5 +146,9 @@ fi %changelog +* Wed Dec 23 2009 Jens Petersen - 1.2.0.3-2 +- update packaging for ghc-6.12.1 +- added shared library support: needs ghc-rpm-macros 0.3.1 + * Wed Aug 12 2009 Bryan O'Sullivan - 1.2.0.3-1 - initial packaging for Fedora created by cabal2spec From 849c64238b1172ac2d362d0db7336b1df2c46c0e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 03:37:13 +0000 Subject: [PATCH 06/75] - update 1.2.2.1 (current haskell-platform-2009.3.1) - remove test programs and move doc files to docdir - 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 - drop redundant buildroot and its install cleaning --- .cvsignore | 2 +- ghc-HUnit.spec | 138 ++++++++++++------------------------------------- sources | 2 +- 3 files changed, 36 insertions(+), 106 deletions(-) diff --git a/.cvsignore b/.cvsignore index 60221ff..47e5d39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -HUnit-1.2.0.3.tar.gz +HUnit-1.2.2.1.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 92b2b1f..324a370 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -1,17 +1,20 @@ %global pkg_name HUnit -%bcond_without doc -%bcond_without prof +%global common_summary Haskell %{pkg_name} library + +%global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool\ +for Java. + %bcond_without shared -# ghc does not emit debug information +# debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2009.2.0.2 and ghc-6.10.x extralibs! -Version: 1.2.0.3 -Release: 2%{?dist} -Summary: Haskell %{pkg_name} library +# part of haskell-platform-2009.3.1 and ghc-6.10.x extralibs! +Version: 1.2.2.1 +Release: 1%{?dist} +Summary: %{common_summary} Group: System Environment/Libraries License: BSD @@ -19,59 +22,19 @@ URL: http://hunit.sourceforge.net/ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.3.1 -%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. HUnit -is a unit testing framework for Haskell, inspired by the JUnit tool -for Java. - -%package devel -Summary: Haskell %{pkg_name} library development files -Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(postun): ghc = %{ghc_version} +%{common_description} %if %{with shared} -Requires: %{name} = %{version}-%{release} +This package provides the shared library. %endif -%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 +%ghc_lib_package %prep @@ -79,73 +42,40 @@ built for ghc-%{ghc_version}. %build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif %install %cabal_install %cabal_pkg_conf -%ghc_gen_filelists %{name} - - -%clean -rm -rf $RPM_BUILD_ROOT +%ghc_gen_filelists +rm $RPM_BUILD_ROOT%{_bindir}/*-tests +mv $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%post devel -ghc-pkg recache +%check +dist/build/basic-tests/basic-tests +dist/build/extended-tests/extended-tests +dist/build/terminal-tests/terminal-tests -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%postun devel -ghc-pkg recache - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%if %{with shared} -%files -f %{name}.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%if %{without shared} -%{_docdir}/%{name}-%{version} -%endif - - -%if %{with doc} -%files doc -f %{name}-doc.files -%defattr(-,root,root,-) -%endif - - -%if %{with prof} -%files prof -f %{name}-prof.files -%defattr(-,root,root,-) -%endif +%clean +rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 11 2010 Jens Petersen - 1.2.2.1-1 +- update 1.2.2.1 (current haskell-platform-2009.3.1) +- remove test programs and move doc files to docdir +- 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 +- drop redundant buildroot and its install cleaning + * Wed Dec 23 2009 Jens Petersen - 1.2.0.3-2 - update packaging for ghc-6.12.1 - added shared library support: needs ghc-rpm-macros 0.3.1 diff --git a/sources b/sources index 5d6b959..950cd56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -948b5b20ff22fa81c6390b08d6af5104 HUnit-1.2.0.3.tar.gz +2634e94c27486f8e8feeb778f78c663f HUnit-1.2.2.1.tar.gz From b4ac6dd571e6dda782491cb34be5ecf2e9c602b8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Apr 2010 02:52:46 +0000 Subject: [PATCH 07/75] - part of haskell-platform-2010.1.0.0 - rebuild against ghc-6.12.2 - condition ghc_lib_package --- ghc-HUnit.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 324a370..b8c4633 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -11,9 +11,9 @@ for Java. %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2009.3.1 and ghc-6.10.x extralibs! +# part of haskell-platform-2010.1.0.0 Version: 1.2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -34,7 +34,7 @@ This package provides the shared library. %endif -%ghc_lib_package +%{?ghc_lib_package} %prep @@ -67,6 +67,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 27 2010 Jens Petersen - 1.2.2.1-2 +- part of haskell-platform-2010.1.0.0 +- rebuild against ghc-6.12.2 +- condition ghc_lib_package + * Mon Jan 11 2010 Jens Petersen - 1.2.2.1-1 - update 1.2.2.1 (current haskell-platform-2009.3.1) - remove test programs and move doc files to docdir From 21cb68d7ad78f8b13ca9ab161e5513f99584b59f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Apr 2010 04:23:34 +0000 Subject: [PATCH 08/75] drop the unused reference to ghc_pkg_deps --- ghc-HUnit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index b8c4633..6133ce6 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -25,7 +25,6 @@ ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc BuildRequires: ghc-prof -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description %{common_description} From 85c88d9595869974187b0e944f969d5f49cefa41 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 27 Jun 2010 07:27:41 +0000 Subject: [PATCH 09/75] sync cabal2spec-0.22.1 --- ghc-HUnit.spec | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 6133ce6..1b1c549 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -13,18 +13,18 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2010.1.0.0 Version: 1.2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hunit.sourceforge.net/ 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.7.0 %description %{common_description} @@ -41,31 +41,29 @@ This package provides the shared library. %build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build -%install -%cabal_install -%cabal_pkg_conf +%check +%cabal test -%ghc_gen_filelists + +%install +rm -rf $RPM_BUILD_ROOT +%ghc_lib_install rm $RPM_BUILD_ROOT%{_bindir}/*-tests mv $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%check -dist/build/basic-tests/basic-tests -dist/build/extended-tests/extended-tests -dist/build/terminal-tests/terminal-tests - %clean rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 27 2010 Jens Petersen - 1.2.2.1-3 +- sync cabal2spec-0.22.1 + * Tue Apr 27 2010 Jens Petersen - 1.2.2.1-2 - part of haskell-platform-2010.1.0.0 - rebuild against ghc-6.12.2 @@ -74,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Jan 11 2010 Jens Petersen - 1.2.2.1-1 - update 1.2.2.1 (current haskell-platform-2009.3.1) - remove test programs and move doc files to docdir +- add check section for test programs - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: - drop doc and prof bcond - use common summary and common_description From 4fdf2d24035ec9b444e75876b5772f560863b3fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:34:05 +0000 Subject: [PATCH 10/75] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 3261201..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ghc-HUnit -# $Id$ -NAME := ghc-HUnit -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) From d2a1af11904248df9b13f9b1c05cfbe1a8e07939 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 31 Jul 2010 23:27:16 +1000 Subject: [PATCH 11/75] - ghc-rpm-macros-0.8.1 for doc obsoletes - part of haskell-platform-2010.2.0.0 - add hscolour - datadir filelist cleanup --- ghc-HUnit.spec | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 1b1c549..fc0d1f5 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -6,14 +6,15 @@ for Java. %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: 1.2.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -24,7 +25,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.0 +BuildRequires: ghc-rpm-macros >= 0.8.1 +%if %{with hscolour} +BuildRequires: hscolour +%endif %description %{common_description} @@ -33,9 +37,6 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} @@ -52,15 +53,28 @@ This package provides the shared library. rm -rf $RPM_BUILD_ROOT %ghc_lib_install +# remove unwanted files rm $RPM_BUILD_ROOT%{_bindir}/*-tests -mv $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version} + +echo %doc LICENSE >> %{name}.files +echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %clean rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 1.2.2.1-4 + + %changelog +* Sat Jul 31 2010 Jens Petersen - 1.2.2.1-4 +- ghc-rpm-macros-0.8.1 for doc obsoletes +- part of haskell-platform-2010.2.0.0 +- add hscolour +- datadir filelist cleanup + * Sun Jun 27 2010 Jens Petersen - 1.2.2.1-3 - sync cabal2spec-0.22.1 From b9c5c1f3880dcfc0f0024794f66a503bf9ec392e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Nov 2010 18:58:16 +1000 Subject: [PATCH 12/75] drop -o obsoletes and don't double list LICENSE --- ghc-HUnit.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index fc0d1f5..d65b087 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -14,7 +14,7 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 1.2.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -57,7 +57,6 @@ rm -rf $RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_bindir}/*-tests rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version} -echo %doc LICENSE >> %{name}.files echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files @@ -65,10 +64,14 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files rm -rf $RPM_BUILD_ROOT -%ghc_lib_package -o 1.2.2.1-4 +%ghc_lib_package %changelog +* Thu Nov 25 2010 Jens Petersen - 1.2.2.1-5 +- drop -o obsolete +- don't list license file twice + * Sat Jul 31 2010 Jens Petersen - 1.2.2.1-4 - ghc-rpm-macros-0.8.1 for doc obsoletes - part of haskell-platform-2010.2.0.0 From b73eee5d0bbf18e49a69184e0c1d805accae4bb1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 5 Dec 2010 14:53:25 +1000 Subject: [PATCH 13/75] update to 1.2.2.3 for haskell-platform-2011.1 alpha --- .gitignore | 1 + ghc-HUnit.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 47e5d39..e3e1002 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ HUnit-1.2.2.1.tar.gz +/HUnit-1.2.2.3.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index d65b087..6ba444a 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -12,9 +12,9 @@ for Java. %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2010.2.0.0 -Version: 1.2.2.1 -Release: 5%{?dist} +# part of haskell-platform-2011.1.0.0 +Version: 1.2.2.3 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 5 2010 Jens Petersen - 1.2.2.3-1 +- update to 1.2.2.3 + * Thu Nov 25 2010 Jens Petersen - 1.2.2.1-5 - drop -o obsolete - don't list license file twice diff --git a/sources b/sources index 950cd56..8c903e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2634e94c27486f8e8feeb778f78c663f HUnit-1.2.2.1.tar.gz +f179add502f88153e5c9fdc69056b657 HUnit-1.2.2.3.tar.gz From 1a07d868f511b8d7f389b58ef63598d4abb81084 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 17 Jan 2011 18:12:44 +1000 Subject: [PATCH 14/75] update to cabal2spec-0.22.4 --- ghc-HUnit.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 6ba444a..fc27ac7 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -5,30 +5,24 @@ %global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool\ for Java. -%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: 1.2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hunit.sourceforge.net/ 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 %description %{common_description} @@ -50,7 +44,6 @@ This package provides the shared library. %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install # remove unwanted files @@ -60,14 +53,13 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version} echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files -%clean -rm -rf $RPM_BUILD_ROOT - - %ghc_lib_package %changelog +* Mon Jan 17 2011 Jens Petersen - 1.2.2.3-2 +- update to cabal2spec-0.22.4 + * Sun Dec 5 2010 Jens Petersen - 1.2.2.3-1 - update to 1.2.2.3 From 4dd62b374777337e51bbe21cf88d4f586ef91c19 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 18:54:34 -0600 Subject: [PATCH 15/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index fc27ac7..5b7d31d 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -11,7 +11,7 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2011.1.0.0 Version: 1.2.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -57,6 +57,9 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.2.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 17 2011 Jens Petersen - 1.2.2.3-2 - update to cabal2spec-0.22.4 From d357d2f80a43f25bf6c6ffc9f569b62af42656fb Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 10 Mar 2011 09:15:38 +0100 Subject: [PATCH 16/75] Enable build on sparcv9 Signed-off-by: Fabio M. Di Nitto --- ghc-HUnit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 5b7d31d..6dfef13 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -11,7 +11,7 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2011.1.0.0 Version: 1.2.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -19,7 +19,7 @@ License: BSD URL: http://hunit.sourceforge.net/ 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 @@ -57,6 +57,9 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %changelog +* Thu Mar 10 2011 Fabio M. Di Nitto - 1.2.2.3-4 +- Enable build on sparcv9 + * Tue Feb 08 2011 Fedora Release Engineering - 1.2.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From fcd4e12bfe90c78f8019661e9366a0d326293afe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 May 2011 17:40:30 +0900 Subject: [PATCH 17/75] update to cabal2spec-0.23: add ppc64 --- ghc-HUnit.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 6dfef13..ce55d85 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -5,13 +5,10 @@ %global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool\ for Java. -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} -# part of haskell-platform-2011.1.0.0 +# part of haskell-platform-2011.2.0.0 Version: 1.2.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -19,16 +16,13 @@ License: BSD URL: http://hunit.sourceforge.net/ 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 %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif %prep @@ -47,8 +41,8 @@ This package provides the shared library. %ghc_lib_install # remove unwanted files -rm $RPM_BUILD_ROOT%{_bindir}/*-tests -rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version} +rm %{buildroot}%{_bindir}/*-tests +rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files @@ -57,6 +51,9 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %changelog +* Fri May 27 2011 Jens Petersen - 1.2.2.3-5 +- update to cabal2spec-0.23: add ppc64 + * Thu Mar 10 2011 Fabio M. Di Nitto - 1.2.2.3-4 - Enable build on sparcv9 From 2bfa1360173be23ac6c0a56210b261f20482174a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Jun 2011 11:00:01 +0900 Subject: [PATCH 18/75] update to cabal2spec-0.22.4 --- ghc-HUnit.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index ce55d85..87b0445 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -6,18 +6,18 @@ for Java. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.0 +# part of haskell-platform-2011.2.0.1 Version: 1.2.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hunit.sourceforge.net/ 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 @@ -51,6 +51,9 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %changelog +* Mon Jun 20 2011 Jens Petersen - 1.2.2.3-6 +- BR ghc-Cabal-devel and use ghc_excluded_archs + * Fri May 27 2011 Jens Petersen - 1.2.2.3-5 - update to cabal2spec-0.23: add ppc64 From e2c5e873676a4642fed464ae9a3ae0456438a8aa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Jun 2011 16:55:40 +0900 Subject: [PATCH 19/75] ghc_arches replaces ghc_excluded_archs (cabal2spec-0.23.2) --- ghc-HUnit.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 87b0445..77e1603 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,15 +8,14 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 1.2.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hunit.sourceforge.net/ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# ghc_excluded_archs is defined in redhat-rpm-config -ExcludeArch: %{ghc_excluded_archs} +ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour @@ -51,6 +50,9 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %changelog +* Tue Jun 21 2011 Jens Petersen - 1.2.2.3-7 +- ghc_arches replaces ghc_excluded_archs + * Mon Jun 20 2011 Jens Petersen - 1.2.2.3-6 - BR ghc-Cabal-devel and use ghc_excluded_archs From af8cb05aaa57d4cbcbe50944e6ea8156515857b0 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 16:17:29 +0200 Subject: [PATCH 20/75] rebuild with new gmp --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 77e1603..dfeec06 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 1.2.2.3 -Release: 7%{?dist} +Release: 7%{?dist}.1 Summary: %{common_summary} Group: System Environment/Libraries @@ -50,6 +50,9 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %changelog +* Tue Oct 11 2011 Peter Schiffer - 1.2.2.3-7.1 +- rebuild with new gmp + * Tue Jun 21 2011 Jens Petersen - 1.2.2.3-7 - ghc_arches replaces ghc_excluded_archs From f98b7a51f0f8015eb6a520b6adaa130e7c638d47 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 01:26:38 +0200 Subject: [PATCH 21/75] rebuild with new gmp without compat lib --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index dfeec06..04a2a02 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 1.2.2.3 -Release: 7%{?dist}.1 +Release: 7%{?dist}.2 Summary: %{common_summary} Group: System Environment/Libraries @@ -50,6 +50,9 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %changelog +* Fri Oct 21 2011 Marcela Mašláňová - 1.2.2.3-7.2 +- rebuild with new gmp without compat lib + * Tue Oct 11 2011 Peter Schiffer - 1.2.2.3-7.1 - rebuild with new gmp From 1cbfbe6bc0d99ce80566f1f592a2e5c89ff17e19 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 12:34:56 +0200 Subject: [PATCH 22/75] rebuild with new gmp without compat lib --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 04a2a02..47d764b 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 1.2.2.3 -Release: 7%{?dist}.2 +Release: 7%{?dist}.3 Summary: %{common_summary} Group: System Environment/Libraries @@ -50,6 +50,9 @@ echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files %changelog +* Mon Oct 24 2011 Marcela Mašláňová - 1.2.2.3-7.3 +- rebuild with new gmp without compat lib + * Fri Oct 21 2011 Marcela Mašláňová - 1.2.2.3-7.2 - rebuild with new gmp without compat lib From d197a6b72d7f9e37505e0058bd19174a4ded6810 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Dec 2011 17:00:00 +0900 Subject: [PATCH 23/75] update to 1.2.4.2 for haskell-platform-2011.4.0.0 - update to cabal2spec-0.25 --- .gitignore | 1 + ghc-HUnit.spec | 41 +++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e3e1002..986b923 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.2.2.3.tar.gz +/HUnit-1.2.4.2.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 47d764b..7fde8f6 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -6,24 +6,42 @@ for Java. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.1 -Version: 1.2.2.3 -Release: 7%{?dist}.3 +# part of haskell-platform-2011.4.0.0 +Version: 1.2.4.2 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD -URL: http://hunit.sourceforge.net/ +# 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-base-prof %description %{common_description} +%package -n ghc-%{pkg_name}-devel +Summary: Development files for %{common_summary} +Group: Development/Libraries +# BEGIN cabal2spec +%{?ghc_devel_requires} +Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} +Provides: ghc-%{pkg_name}-prof = %{version}-%{release} +# END cabal2spec +# Haskell devel dependencies are autogenerated by ghc-deps.sh + +%description -n ghc-%{pkg_name}-devel +%{common_description} + +This package contains the development files. + + %prep %setup -q -n %{pkg_name}-%{version} @@ -43,13 +61,20 @@ BuildRequires: hscolour rm %{buildroot}%{_bindir}/*-tests rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} -echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files + +%postun -n ghc-%{pkg_name}-devel +%ghc_pkg_recache -%ghc_lib_package +%ghc_files LICENSE +%doc README doc/Guide.html examples/Example.hs %changelog +* Tue Dec 27 2011 Jens Petersen - 1.2.4.2-1 +- update to 1.2.4.2 for haskell-platform-2011.4.0.0 +- update to cabal2spec-0.25 + * Mon Oct 24 2011 Marcela Mašláňová - 1.2.2.3-7.3 - rebuild with new gmp without compat lib diff --git a/sources b/sources index 8c903e7..f750761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f179add502f88153e5c9fdc69056b657 HUnit-1.2.2.3.tar.gz +b834809dc5c4ac4d1e519d8d6c456600 HUnit-1.2.4.2.tar.gz From 4a386477924ea059e6e356a092b6c37d2676b0cb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 31 Dec 2011 01:05:54 +0900 Subject: [PATCH 24/75] reinstate deleted post script; update to cabal2spec-0.25.1 --- ghc-HUnit.spec | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 7fde8f6..4c8b14a 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2011.4.0.0 Version: 1.2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -26,22 +26,6 @@ BuildRequires: ghc-base-prof %{common_description} -%package -n ghc-%{pkg_name}-devel -Summary: Development files for %{common_summary} -Group: Development/Libraries -# BEGIN cabal2spec -%{?ghc_devel_requires} -Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} -Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END cabal2spec -# Haskell devel dependencies are autogenerated by ghc-deps.sh - -%description -n ghc-%{pkg_name}-devel -%{common_description} - -This package contains the development files. - - %prep %setup -q -n %{pkg_name}-%{version} @@ -62,8 +46,12 @@ rm %{buildroot}%{_bindir}/*-tests rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} -%postun -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun %ghc_files LICENSE @@ -71,6 +59,10 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} %changelog +* Fri Dec 30 2011 Jens Petersen - 1.2.4.2-2 +- fix accidently deleted post script +- cabal2spec-0.25.1 + * Tue Dec 27 2011 Jens Petersen - 1.2.4.2-1 - update to 1.2.4.2 for haskell-platform-2011.4.0.0 - update to cabal2spec-0.25 From 6bf00230c255b0b78a33e654dcc4aad2d296fc9c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 21:19:42 -0600 Subject: [PATCH 25/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 4c8b14a..333825a 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ for Java. Name: ghc-%{pkg_name} # part of haskell-platform-2011.4.0.0 Version: 1.2.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -59,6 +59,9 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.2.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Dec 30 2011 Jens Petersen - 1.2.4.2-2 - fix accidently deleted post script - cabal2spec-0.25.1 From 3efa5d80dff498c8bfac6820074d2227d0086cae Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 21 Mar 2012 23:57:40 +0900 Subject: [PATCH 26/75] rebuild --- ghc-HUnit.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 333825a..a8cbb15 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -6,9 +6,9 @@ for Java. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.4.0.0 +# part of haskell-platform Version: 1.2.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -20,7 +20,6 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -BuildRequires: ghc-base-prof %description %{common_description} From f5c637237a0155fd3eca0733c9a635acdb17e426 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2012 09:33:55 +0900 Subject: [PATCH 27/75] obsoleted by haskell-platform subpackage --- .gitignore | 3 -- dead.package | 1 + ghc-HUnit.spec | 135 ------------------------------------------------- sources | 1 - 4 files changed, 1 insertion(+), 139 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 ghc-HUnit.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 986b923..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -HUnit-1.2.2.1.tar.gz -/HUnit-1.2.2.3.tar.gz -/HUnit-1.2.4.2.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-HUnit.spec b/ghc-HUnit.spec deleted file mode 100644 index a8cbb15..0000000 --- a/ghc-HUnit.spec +++ /dev/null @@ -1,135 +0,0 @@ -%global pkg_name HUnit - -%global common_summary Haskell %{pkg_name} library - -%global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool\ -for Java. - -Name: ghc-%{pkg_name} -# part of haskell-platform -Version: 1.2.4.2 -Release: 4%{?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 - -%description -%{common_description} - - -%prep -%setup -q -n %{pkg_name}-%{version} - - -%build -%ghc_lib_build - - -%check -%cabal test - - -%install -%ghc_lib_install - -# remove unwanted files -rm %{buildroot}%{_bindir}/*-tests -rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} - - -%ghc_devel_package - -%ghc_devel_description - - -%ghc_devel_post_postun - - -%ghc_files LICENSE -%doc README doc/Guide.html examples/Example.hs - - -%changelog -* Fri Jan 13 2012 Fedora Release Engineering - 1.2.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Dec 30 2011 Jens Petersen - 1.2.4.2-2 -- fix accidently deleted post script -- cabal2spec-0.25.1 - -* Tue Dec 27 2011 Jens Petersen - 1.2.4.2-1 -- update to 1.2.4.2 for haskell-platform-2011.4.0.0 -- update to cabal2spec-0.25 - -* Mon Oct 24 2011 Marcela Mašláňová - 1.2.2.3-7.3 -- rebuild with new gmp without compat lib - -* Fri Oct 21 2011 Marcela Mašláňová - 1.2.2.3-7.2 -- rebuild with new gmp without compat lib - -* Tue Oct 11 2011 Peter Schiffer - 1.2.2.3-7.1 -- rebuild with new gmp - -* Tue Jun 21 2011 Jens Petersen - 1.2.2.3-7 -- ghc_arches replaces ghc_excluded_archs - -* Mon Jun 20 2011 Jens Petersen - 1.2.2.3-6 -- BR ghc-Cabal-devel and use ghc_excluded_archs - -* Fri May 27 2011 Jens Petersen - 1.2.2.3-5 -- update to cabal2spec-0.23: add ppc64 - -* Thu Mar 10 2011 Fabio M. Di Nitto - 1.2.2.3-4 -- Enable build on sparcv9 - -* Tue Feb 08 2011 Fedora Release Engineering - 1.2.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 17 2011 Jens Petersen - 1.2.2.3-2 -- update to cabal2spec-0.22.4 - -* Sun Dec 5 2010 Jens Petersen - 1.2.2.3-1 -- update to 1.2.2.3 - -* Thu Nov 25 2010 Jens Petersen - 1.2.2.1-5 -- drop -o obsolete -- don't list license file twice - -* Sat Jul 31 2010 Jens Petersen - 1.2.2.1-4 -- ghc-rpm-macros-0.8.1 for doc obsoletes -- part of haskell-platform-2010.2.0.0 -- add hscolour -- datadir filelist cleanup - -* Sun Jun 27 2010 Jens Petersen - 1.2.2.1-3 -- sync cabal2spec-0.22.1 - -* Tue Apr 27 2010 Jens Petersen - 1.2.2.1-2 -- part of haskell-platform-2010.1.0.0 -- rebuild against ghc-6.12.2 -- condition ghc_lib_package - -* Mon Jan 11 2010 Jens Petersen - 1.2.2.1-1 -- update 1.2.2.1 (current haskell-platform-2009.3.1) -- remove test programs and move doc files to docdir -- add check section for test programs -- 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 -- drop redundant buildroot and its install cleaning - -* Wed Dec 23 2009 Jens Petersen - 1.2.0.3-2 -- update packaging for ghc-6.12.1 -- added shared library support: needs ghc-rpm-macros 0.3.1 - -* Wed Aug 12 2009 Bryan O'Sullivan - 1.2.0.3-1 -- initial packaging for Fedora created by cabal2spec diff --git a/sources b/sources deleted file mode 100644 index f750761..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b834809dc5c4ac4d1e519d8d6c456600 HUnit-1.2.4.2.tar.gz From ee8ea098cf4f9777be66865e0dc9f23a5ef8c91a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 24 Feb 2014 14:37:06 +0900 Subject: [PATCH 28/75] Revert "obsoleted by haskell-platform subpackage" This reverts commit f5c637237a0155fd3eca0733c9a635acdb17e426. --- .gitignore | 3 ++ dead.package | 1 - ghc-HUnit.spec | 135 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 ghc-HUnit.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..986b923 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +HUnit-1.2.2.1.tar.gz +/HUnit-1.2.2.3.tar.gz +/HUnit-1.2.4.2.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-HUnit.spec b/ghc-HUnit.spec new file mode 100644 index 0000000..a8cbb15 --- /dev/null +++ b/ghc-HUnit.spec @@ -0,0 +1,135 @@ +%global pkg_name HUnit + +%global common_summary Haskell %{pkg_name} library + +%global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool\ +for Java. + +Name: ghc-%{pkg_name} +# part of haskell-platform +Version: 1.2.4.2 +Release: 4%{?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 + +%description +%{common_description} + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%check +%cabal test + + +%install +%ghc_lib_install + +# remove unwanted files +rm %{buildroot}%{_bindir}/*-tests +rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} + + +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files LICENSE +%doc README doc/Guide.html examples/Example.hs + + +%changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.2.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 30 2011 Jens Petersen - 1.2.4.2-2 +- fix accidently deleted post script +- cabal2spec-0.25.1 + +* Tue Dec 27 2011 Jens Petersen - 1.2.4.2-1 +- update to 1.2.4.2 for haskell-platform-2011.4.0.0 +- update to cabal2spec-0.25 + +* Mon Oct 24 2011 Marcela Mašláňová - 1.2.2.3-7.3 +- rebuild with new gmp without compat lib + +* Fri Oct 21 2011 Marcela Mašláňová - 1.2.2.3-7.2 +- rebuild with new gmp without compat lib + +* Tue Oct 11 2011 Peter Schiffer - 1.2.2.3-7.1 +- rebuild with new gmp + +* Tue Jun 21 2011 Jens Petersen - 1.2.2.3-7 +- ghc_arches replaces ghc_excluded_archs + +* Mon Jun 20 2011 Jens Petersen - 1.2.2.3-6 +- BR ghc-Cabal-devel and use ghc_excluded_archs + +* Fri May 27 2011 Jens Petersen - 1.2.2.3-5 +- update to cabal2spec-0.23: add ppc64 + +* Thu Mar 10 2011 Fabio M. Di Nitto - 1.2.2.3-4 +- Enable build on sparcv9 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.2.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 17 2011 Jens Petersen - 1.2.2.3-2 +- update to cabal2spec-0.22.4 + +* Sun Dec 5 2010 Jens Petersen - 1.2.2.3-1 +- update to 1.2.2.3 + +* Thu Nov 25 2010 Jens Petersen - 1.2.2.1-5 +- drop -o obsolete +- don't list license file twice + +* Sat Jul 31 2010 Jens Petersen - 1.2.2.1-4 +- ghc-rpm-macros-0.8.1 for doc obsoletes +- part of haskell-platform-2010.2.0.0 +- add hscolour +- datadir filelist cleanup + +* Sun Jun 27 2010 Jens Petersen - 1.2.2.1-3 +- sync cabal2spec-0.22.1 + +* Tue Apr 27 2010 Jens Petersen - 1.2.2.1-2 +- part of haskell-platform-2010.1.0.0 +- rebuild against ghc-6.12.2 +- condition ghc_lib_package + +* Mon Jan 11 2010 Jens Petersen - 1.2.2.1-1 +- update 1.2.2.1 (current haskell-platform-2009.3.1) +- remove test programs and move doc files to docdir +- add check section for test programs +- 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 +- drop redundant buildroot and its install cleaning + +* Wed Dec 23 2009 Jens Petersen - 1.2.0.3-2 +- update packaging for ghc-6.12.1 +- added shared library support: needs ghc-rpm-macros 0.3.1 + +* Wed Aug 12 2009 Bryan O'Sullivan - 1.2.0.3-1 +- initial packaging for Fedora created by cabal2spec diff --git a/sources b/sources new file mode 100644 index 0000000..f750761 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +b834809dc5c4ac4d1e519d8d6c456600 HUnit-1.2.4.2.tar.gz From 823d05db51986fdec718360a878a0e7f31f8d42d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 13 Mar 2014 16:52:11 +0900 Subject: [PATCH 29/75] import 1.2.5.2-31 (pkg review #1069081) to move out of haskell-platform --- .gitignore | 1 + ghc-HUnit.spec | 57 +++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 986b923..3f907de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.2.2.3.tar.gz /HUnit-1.2.4.2.tar.gz +/HUnit-1.2.5.2.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index a8cbb15..e2bd5eb 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -1,28 +1,37 @@ -%global pkg_name HUnit - -%global common_summary Haskell %{pkg_name} library +# https://fedoraproject.org/wiki/Packaging:Haskell -%global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool\ -for Java. +%global pkg_name HUnit Name: ghc-%{pkg_name} # part of haskell-platform -Version: 1.2.4.2 -Release: 4%{?dist} -Summary: %{common_summary} +Version: 1.2.5.2 +Release: 31%{?dist} +Summary: Unit testing framework for Haskell -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} +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-deepseq-devel +# End cabal-rpm deps %description -%{common_description} +HUnit is a unit testing framework for Haskell, inspired by JUnit for Java. + + +%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 @@ -41,23 +50,29 @@ BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} %ghc_lib_install # remove unwanted files -rm %{buildroot}%{_bindir}/*-tests -rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} +rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,doc/Guide.html,examples/Example.hs,prologue.txt} -%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 README doc/Guide.html examples/Example.hs %changelog +* Mon Feb 24 2014 Jens Petersen - 1.2.5.2-31 +- split out of haskell-platform + * Fri Jan 13 2012 Fedora Release Engineering - 1.2.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index f750761..a62104a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b834809dc5c4ac4d1e519d8d6c456600 HUnit-1.2.4.2.tar.gz +1ba79aaeb57361a8593e864694539025 HUnit-1.2.5.2.tar.gz From e1e98f251cfe55fc42ff59c04616237ea91b9c1e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 16 May 2014 22:13:54 +0900 Subject: [PATCH 30/75] enable testsuites --- ghc-HUnit.spec | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index e2bd5eb..a95bb27 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -2,10 +2,12 @@ %global pkg_name HUnit +%bcond_without tests + Name: ghc-%{pkg_name} # part of haskell-platform Version: 1.2.5.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Unit testing framework for Haskell License: BSD @@ -42,10 +44,6 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_build -%check -%cabal test - - %install %ghc_lib_install @@ -53,6 +51,18 @@ This package provides the Haskell %{pkg_name} library development files. rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,doc/Guide.html,examples/Example.hs,prologue.txt} +%check +%if %{with tests} +mv HUnit.cabal HUnit.cabal.orig +mv HUnit.cabal.tests HUnit.cabal +cabal_configure_extra_options=--enable-tests +%ghc_bin_build +%cabal test +mv HUnit.cabal HUnit.cabal.tests +mv HUnit.cabal.orig HUnit.cabal +%endif + + %post devel %ghc_pkg_recache @@ -70,6 +80,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,doc/Guide.html,example %changelog +* Fri May 16 2014 Jens Petersen - 1.2.5.2-32 +- enable tests + * Mon Feb 24 2014 Jens Petersen - 1.2.5.2-31 - split out of haskell-platform From 8dac32c60ebcf5b8d19070ca5a90d2a5fa2e428a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 16 May 2014 23:15:00 +0900 Subject: [PATCH 31/75] add (redundant) generated BR for tests --- ghc-HUnit.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index a95bb27..ca057c5 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -4,6 +4,9 @@ %bcond_without tests +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} # part of haskell-platform Version: 1.2.5.2 @@ -18,6 +21,9 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-deepseq-devel +%if %{with tests} +BuildRequires: ghc-filepath-devel +%endif # End cabal-rpm deps %description From 667018cc1da00a85d52a6a3c407d6fca85d658ca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 16 May 2014 23:59:59 +0900 Subject: [PATCH 32/75] disable tests for now hunit-test-optimize0 assertion failing --- ghc-HUnit.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index ca057c5..1d8c75b 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -2,7 +2,8 @@ %global pkg_name HUnit -%bcond_without tests +# hunit-test-optimize0 assert failing +%bcond_with tests # no useful debuginfo for Haskell packages without C sources %global debug_package %{nil} @@ -61,7 +62,6 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,doc/Guide.html,example %if %{with tests} mv HUnit.cabal HUnit.cabal.orig mv HUnit.cabal.tests HUnit.cabal -cabal_configure_extra_options=--enable-tests %ghc_bin_build %cabal test mv HUnit.cabal HUnit.cabal.tests @@ -86,8 +86,8 @@ mv HUnit.cabal.orig HUnit.cabal %changelog -* Fri May 16 2014 Jens Petersen - 1.2.5.2-32 -- enable tests +* Wed Jun 4 2014 Jens Petersen - 1.2.5.2-32 +- disable tests for now * Mon Feb 24 2014 Jens Petersen - 1.2.5.2-31 - split out of haskell-platform From 4b7ecd397290814886b802cbcba1fc378cacddd1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Jun 2014 23:37:56 +0900 Subject: [PATCH 33/75] enable tests - need to cabal configure by hand to avoid override optimization --- ghc-HUnit.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 1d8c75b..5c90bb8 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -2,8 +2,7 @@ %global pkg_name HUnit -# hunit-test-optimize0 assert failing -%bcond_with tests +%bcond_without tests # no useful debuginfo for Haskell packages without C sources %global debug_package %{nil} @@ -62,7 +61,8 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,doc/Guide.html,example %if %{with tests} mv HUnit.cabal HUnit.cabal.orig mv HUnit.cabal.tests HUnit.cabal -%ghc_bin_build +%cabal configure --enable-tests +%cabal build %cabal test mv HUnit.cabal HUnit.cabal.tests mv HUnit.cabal.orig HUnit.cabal @@ -87,7 +87,7 @@ mv HUnit.cabal.orig HUnit.cabal %changelog * Wed Jun 4 2014 Jens Petersen - 1.2.5.2-32 -- disable tests for now +- enable tests * Mon Feb 24 2014 Jens Petersen - 1.2.5.2-31 - split out of haskell-platform From fecbdc204ac1155ed2eb03e92eeaca27a745ad3d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Jun 2014 02:14:22 +0900 Subject: [PATCH 34/75] 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 1430162bf9ee622545df02a2f683be70df9deb97 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 8 Jul 2014 15:36:21 +0900 Subject: [PATCH 35/75] remove noautobuild --- noautobuild | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 noautobuild diff --git a/noautobuild b/noautobuild deleted file mode 100644 index e69de29..0000000 From b735ba1e65fbe865a6eca35db15b947fe56dd944 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 14:30:13 +0000 Subject: [PATCH 36/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 5c90bb8..8f89d3f 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 1.2.5.2 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Unit testing framework for Haskell License: BSD @@ -86,6 +86,9 @@ mv HUnit.cabal.orig HUnit.cabal %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.2.5.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jun 4 2014 Jens Petersen - 1.2.5.2-32 - enable tests From 2ee44ee87101a6378e7c0f6645851bf566bb5f84 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Jan 2015 10:23:32 +0900 Subject: [PATCH 37/75] cblrpm refresh --- ghc-HUnit.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 8f89d3f..ed1e9e6 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -4,18 +4,15 @@ %bcond_without tests -# no useful debuginfo for Haskell packages without C sources -%global debug_package %{nil} - Name: ghc-%{pkg_name} # part of haskell-platform Version: 1.2.5.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Unit testing framework for Haskell 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 @@ -86,6 +83,9 @@ mv HUnit.cabal.orig HUnit.cabal %changelog +* Tue Jan 27 2015 Jens Petersen - 1.2.5.2-34 +- cblrpm refresh + * Sat Aug 16 2014 Fedora Release Engineering - 1.2.5.2-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 9013efa40fa19ee5e359d7c0270f944469024be2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:27:48 +0000 Subject: [PATCH 38/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index ed1e9e6..868cf4a 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 1.2.5.2 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Unit testing framework for Haskell License: BSD @@ -83,6 +83,9 @@ mv HUnit.cabal.orig HUnit.cabal %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.2.5.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Jan 27 2015 Jens Petersen - 1.2.5.2-34 - cblrpm refresh From a734a1133016e95762afd49e3889a1e76b184ade Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:22:42 +0000 Subject: [PATCH 39/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 868cf4a..3114e38 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 1.2.5.2 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Unit testing framework for Haskell License: BSD @@ -83,6 +83,9 @@ mv HUnit.cabal.orig HUnit.cabal %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.2.5.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.2.5.2-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 8ea2c7d6120349898f1e738b84afd2e452394454 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 14 Jun 2016 17:44:24 +0900 Subject: [PATCH 40/75] update to 1.3.0.0 --- .gitignore | 1 + ghc-HUnit.spec | 21 ++++++++++----------- sources | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 3f907de..5c40232 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.2.2.3.tar.gz /HUnit-1.2.4.2.tar.gz /HUnit-1.2.5.2.tar.gz +/HUnit-1.3.0.0.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 3114e38..67baa62 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 1.2.5.2 -Release: 36%{?dist} +Version: 1.3.0.0 +Release: 1%{?dist} Summary: Unit testing framework for Haskell License: BSD @@ -51,18 +51,14 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install # remove unwanted files -rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,doc/Guide.html,examples/Example.hs,prologue.txt} +rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README.md,doc/Guide.html,examples/Example.hs,prologue.txt} + +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %check %if %{with tests} -mv HUnit.cabal HUnit.cabal.orig -mv HUnit.cabal.tests HUnit.cabal -%cabal configure --enable-tests -%cabal build %cabal test -mv HUnit.cabal HUnit.cabal.tests -mv HUnit.cabal.orig HUnit.cabal %endif @@ -75,14 +71,17 @@ mv HUnit.cabal.orig HUnit.cabal %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files -%doc README doc/Guide.html examples/Example.hs +%doc README.md doc/Guide.html examples/Example.hs %changelog +* Tue Jun 14 2016 Jens Petersen - 1.3.0.0-1 +- update to 1.3.0.0 + * Wed Feb 03 2016 Fedora Release Engineering - 1.2.5.2-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index a62104a..a969b19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ba79aaeb57361a8593e864694539025 HUnit-1.2.5.2.tar.gz +9780a1e60cb66d4d49d576b657caa7ef HUnit-1.3.0.0.tar.gz From c70483d0e2763426e30cb251186dc647b130ea3f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 23 Jun 2016 19:03:29 +0900 Subject: [PATCH 41/75] update to 1.3.1.1 --- .gitignore | 1 + ghc-HUnit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5c40232..c27a829 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.2.4.2.tar.gz /HUnit-1.2.5.2.tar.gz /HUnit-1.3.0.0.tar.gz +/HUnit-1.3.1.1.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 67baa62..f5486af 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 1.3.0.0 +Version: 1.3.1.1 Release: 1%{?dist} Summary: Unit testing framework for Haskell @@ -75,10 +75,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files devel -f %{name}-devel.files -%doc README.md doc/Guide.html examples/Example.hs +%doc CHANGELOG.md README.md doc/Guide.html examples/Example.hs %changelog +* Thu Jun 23 2016 Jens Petersen - 1.3.1.1-1 +- update to 1.3.1.1 + * Tue Jun 14 2016 Jens Petersen - 1.3.0.0-1 - update to 1.3.0.0 diff --git a/sources b/sources index a969b19..56f0822 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9780a1e60cb66d4d49d576b657caa7ef HUnit-1.3.0.0.tar.gz +1a73c6723345efecae8f3bfcbc45e5aa HUnit-1.3.1.1.tar.gz From d44a62104aa0eafd75e803930c8db0fd1e4ea753 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 23 Jun 2016 19:11:47 +0900 Subject: [PATCH 42/75] doc file changes --- ghc-HUnit.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index f5486af..fa5b1e0 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -50,9 +50,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -# remove unwanted files -rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README.md,doc/Guide.html,examples/Example.hs,prologue.txt} - rm %{buildroot}%{ghc_pkgdocdir}/LICENSE @@ -75,7 +72,7 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files devel -f %{name}-devel.files -%doc CHANGELOG.md README.md doc/Guide.html examples/Example.hs +%doc CHANGELOG.md README.md examples/Example.hs %changelog From 87931cf074aa8693c52ac676a47db83d844e6494 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:24 +0900 Subject: [PATCH 43/75] no longer remove license; use cabal_test --- ghc-HUnit.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index fa5b1e0..e56e6f1 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -50,13 +50,9 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel From a09088d402f747b5e5712484d637a99214e6b9f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:31:00 +0000 Subject: [PATCH 44/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index e56e6f1..4ac5498 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 1.3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Unit testing framework for Haskell License: BSD @@ -72,6 +72,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jun 23 2016 Jens Petersen - 1.3.1.1-1 - update to 1.3.1.1 From 3fb20e06fad88db669f8d571c47c3d38bd0bfb72 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Feb 2017 20:43:12 +0900 Subject: [PATCH 45/75] update to 1.5.0.0 subpackaging call-stack --- .gitignore | 1 + ghc-HUnit.spec | 37 ++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c27a829..74f3759 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.2.5.2.tar.gz /HUnit-1.3.0.0.tar.gz /HUnit-1.3.1.1.tar.gz +/HUnit-1.5.0.0.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 4ac5498..5e8ecda 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -1,22 +1,27 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name HUnit +%global pkgver %{pkg_name}-%{version} -%bcond_without tests +%global callstack call-stack-0.1.0 + +%bcond_with tests Name: ghc-%{pkg_name} -# part of haskell-platform -Version: 1.3.1.1 -Release: 2%{?dist} -Summary: Unit testing framework for Haskell +Version: 1.5.0.0 +Release: 1%{?dist} +Summary: A unit testing framework for Haskell 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 +Source1: https://hackage.haskell.org/package/%{callstack}/%{callstack}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: +#BuildRequires: ghc-call-stack-devel BuildRequires: ghc-deepseq-devel %if %{with tests} BuildRequires: ghc-filepath-devel @@ -39,15 +44,26 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{callstack} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} -a1 %build +%ghc_libs_build %{callstack} %ghc_lib_build %install +%ghc_libs_install %{callstack} %ghc_lib_install @@ -68,10 +84,13 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files -%doc CHANGELOG.md README.md examples/Example.hs +%doc CHANGELOG.md README.md examples %changelog +* Tue Feb 21 2017 Jens Petersen - 1.3.1.1-1 +- update to 1.5.0.0 + * Fri Feb 10 2017 Fedora Release Engineering - 1.3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 56f0822..548af63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a73c6723345efecae8f3bfcbc45e5aa HUnit-1.3.1.1.tar.gz +SHA512 (HUnit-1.5.0.0.tar.gz) = 8be12e82db20ec34069424a47a5fac79d312fe4ad410d0136713431ffed80e020feee78f872b3043ffd41c2033cf643d91a0d8423d186ded152cab51b7888f4e From a960df423eb491c12452ad24685213250f0e7824 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 09:36:11 +0900 Subject: [PATCH 46/75] add call-stack tarball --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 74f3759..9cc4c76 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.3.0.0.tar.gz /HUnit-1.3.1.1.tar.gz /HUnit-1.5.0.0.tar.gz +/call-stack-0.1.0.tar.gz diff --git a/sources b/sources index 548af63..48a9107 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (call-stack-0.1.0.tar.gz) = 4b8fa206041976948411c7e7babd481b01297c289be72f56dcd56b090bec3b0d3c0a6ef4ce17bb5bd879f08b8059f36ebea664c3c263283457a519e5ce20a0f6 SHA512 (HUnit-1.5.0.0.tar.gz) = 8be12e82db20ec34069424a47a5fac79d312fe4ad410d0136713431ffed80e020feee78f872b3043ffd41c2033cf643d91a0d8423d186ded152cab51b7888f4e From 11cab34e0247968501ea07f54f85eca31828f2df Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 12:52:59 +0900 Subject: [PATCH 47/75] use %subpkgs --- ghc-HUnit.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 5e8ecda..da27391 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -5,6 +5,7 @@ %global pkgver %{pkg_name}-%{version} %global callstack call-stack-0.1.0 +%global subpkgs %{callstack} %bcond_with tests @@ -47,7 +48,7 @@ This package provides the Haskell %{pkg_name} library development files. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{callstack} +%ghc_lib_subpackage %{subpkgs} %endif %global version %{main_version} @@ -58,13 +59,14 @@ This package provides the Haskell %{pkg_name} library development files. %build -%ghc_libs_build %{callstack} +%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{callstack} +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{subpkgs} %check From 001cba411f5cbca54364d934f44f18b6ba90c394 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:31:39 +0000 Subject: [PATCH 48/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index da27391..e750cef 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 1.5.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -90,6 +90,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.5.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Feb 21 2017 Jens Petersen - 1.3.1.1-1 - update to 1.5.0.0 From edf146b424899a4a1b6f6d6a033957145b620807 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:09:57 +0000 Subject: [PATCH 49/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index e750cef..9f648af 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 1.5.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -90,6 +90,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.5.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.5.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From f35e663501c73c1ab6c493c071944968c0d54eaa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 15 Nov 2017 12:05:58 +0900 Subject: [PATCH 50/75] drop %ghc_fix_rpath --- ghc-HUnit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 9f648af..6409904 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -66,7 +66,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{subpkgs} %check From 9c8fe56f65f056c6a210065c27a27f79bf37dcd6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 18 Jan 2018 12:50:08 +0900 Subject: [PATCH 51/75] call-stack is now packaged in Fedora --- ghc-HUnit.spec | 26 +++++++------------------- sources | 1 - 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 6409904..3da98a1 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -4,25 +4,21 @@ %global pkg_name HUnit %global pkgver %{pkg_name}-%{version} -%global callstack call-stack-0.1.0 -%global subpkgs %{callstack} - %bcond_with tests Name: ghc-%{pkg_name} Version: 1.5.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A unit testing framework for Haskell License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{callstack}/%{callstack}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: -#BuildRequires: ghc-call-stack-devel +BuildRequires: ghc-call-stack-devel BuildRequires: ghc-deepseq-devel %if %{with tests} BuildRequires: ghc-filepath-devel @@ -45,26 +41,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{subpkgs} -%endif - -%global version %{main_version} - - %prep -%setup -q -n %{pkgver} -a1 +%setup -q -n %{pkgver} %build -%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{subpkgs} %ghc_lib_install @@ -89,6 +74,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 18 2018 Jens Petersen - 1.5.0.0-4 +- call-stack is now packaged in Fedora + * Wed Aug 02 2017 Fedora Release Engineering - 1.5.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 48a9107..548af63 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (call-stack-0.1.0.tar.gz) = 4b8fa206041976948411c7e7babd481b01297c289be72f56dcd56b090bec3b0d3c0a6ef4ce17bb5bd879f08b8059f36ebea664c3c263283457a519e5ce20a0f6 SHA512 (HUnit-1.5.0.0.tar.gz) = 8be12e82db20ec34069424a47a5fac79d312fe4ad410d0136713431ffed80e020feee78f872b3043ffd41c2033cf643d91a0d8423d186ded152cab51b7888f4e From cb6115e334febb5f5af5d6552d6b0fc7efda879d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:24 +0100 Subject: [PATCH 52/75] refresh to cabal-rpm-0.12.1 --- ghc-HUnit.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 3da98a1..94c8721 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.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 HUnit @@ -32,9 +32,12 @@ HUnit is a unit testing framework for Haskell, inspired by JUnit for Java. %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 @@ -57,6 +60,12 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 113e45ff9c6ae3ea6ab02617d44abac36dbb5df3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:16:54 +0100 Subject: [PATCH 53/75] update to 1.6.0.0 --- .gitignore | 1 + ghc-HUnit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9cc4c76..9d2c7d1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.3.1.1.tar.gz /HUnit-1.5.0.0.tar.gz /call-stack-0.1.0.tar.gz +/HUnit-1.6.0.0.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 94c8721..9620da1 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.5.0.0 -Release: 4%{?dist} +Version: 1.6.0.0 +Release: 1%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -83,6 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 24 2018 Jens Petersen - 1.6.0.0-1 +- update to 1.6.0.0 + * Thu Jan 18 2018 Jens Petersen - 1.5.0.0-4 - call-stack is now packaged in Fedora diff --git a/sources b/sources index 548af63..916a6d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (HUnit-1.5.0.0.tar.gz) = 8be12e82db20ec34069424a47a5fac79d312fe4ad410d0136713431ffed80e020feee78f872b3043ffd41c2033cf643d91a0d8423d186ded152cab51b7888f4e +SHA512 (HUnit-1.6.0.0.tar.gz) = 06503884bb85733be05b82da1fcc47e5b81122c3a3959ef047acbea2df1338b4f4589479b46daa6a0d554c7cb06b8cf1712462a3496db22cec5621e878467120 From 49ed9e6759b94e5720b31f22ca97959caf3ed800 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:01:46 +0900 Subject: [PATCH 54/75] drop ldconfig scriptlets --- ghc-HUnit.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 9620da1..685b6fc 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -60,12 +60,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 083d3acc43b9a1b999ebfdf65d944eee6ceb2119 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:12:49 +0000 Subject: [PATCH 55/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 685b6fc..c24bb84 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -77,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 1.6.0.0-1 - update to 1.6.0.0 From 788636c3c78723c2e004ee15fda13658d360eec4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:29:33 +0000 Subject: [PATCH 56/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index c24bb84..62e3340 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -77,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.6.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.6.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 60167b32ef188864e6ea5fa6ddff5daec2921c07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:04:55 +0000 Subject: [PATCH 57/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 62e3340..0961390 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -77,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.6.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.6.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 84ad0367e118848e127de67d344dc69ba9a839c4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:43:10 +0800 Subject: [PATCH 58/75] refresh to cabal-rpm-0.13 --- ghc-HUnit.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 0961390..11e3e7e 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name HUnit @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A unit testing framework for Haskell 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-call-stack-devel BuildRequires: ghc-deepseq-devel %if %{with tests} @@ -45,15 +47,21 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup %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 @@ -69,7 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -77,6 +87,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 1.6.0.0-5 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 1.6.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 8ccec4bd7a4c3ee8836abd0fafb5d6f86e10cc49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:00:17 +0000 Subject: [PATCH 59/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 11e3e7e..3669369 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -87,6 +87,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.6.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 1.6.0.0-5 - refresh to cabal-rpm-0.13 From dff5db8b53ab5e42d5bc07261eb37cefbda6f98a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:21:04 +0000 Subject: [PATCH 60/75] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-HUnit.spec | 53 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 3669369..8b921ea 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.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 HUnit @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -19,6 +19,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-call-stack-devel BuildRequires: ghc-deepseq-devel @@ -34,11 +40,8 @@ HUnit is a unit testing framework for Haskell, inspired by JUnit for Java. %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} @@ -46,6 +49,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} @@ -68,14 +90,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -86,7 +100,20 @@ This package provides the Haskell %{pkg_name} library development files. %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 Aug 01 2019 Jens Petersen - 1.6.0.0-7 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 1.6.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 213fff1877e34785c560c62d8d366e4d26da6d27 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:27:02 +0800 Subject: [PATCH 61/75] BR prof for lib and static for executable --- ghc-HUnit.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 8b921ea..5778e8a 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.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 HUnit @@ -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-call-stack-devel -BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-call-stack-prof +BuildRequires: ghc-deepseq-prof %if %{with tests} BuildRequires: ghc-filepath-devel %endif @@ -40,6 +35,7 @@ HUnit is a unit testing framework for Haskell, inspired by JUnit for Java. %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 7f27ced94ce50a26e0c00938beea964f888883b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:09:42 +0000 Subject: [PATCH 62/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 5778e8a..04c9d2a 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -107,6 +107,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.6.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 01 2019 Jens Petersen - 1.6.0.0-7 - add doc and prof subpackages (cabal-rpm-1.0.0) From f9b894c14bebd648e8479c8033d70fb7f948eb51 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:48:37 +0800 Subject: [PATCH 63/75] refresh to cabal-rpm-2.0.2 --- ghc-HUnit.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 04c9d2a..82c7821 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name HUnit @@ -48,6 +48,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. @@ -58,6 +59,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. @@ -86,6 +88,16 @@ This package provides the Haskell %{pkg_name} profiling library. %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 @@ -98,6 +110,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From e925e2a78377f4bffe0f200a3abf080eb4d3596d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:24:55 +0800 Subject: [PATCH 64/75] refresh to cabal-rpm-2.0.5 --- ghc-HUnit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 82c7821..601d826 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.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 HUnit %global pkgver %{pkg_name}-%{version} From 9b77c5f402de0f19f661d45b77acd1201e9a625a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:53:32 +0800 Subject: [PATCH 65/75] refresh to cabal-rpm-2.0.6 --- ghc-HUnit.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 601d826..39c8bf4 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name HUnit @@ -88,16 +88,6 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From 91d5770448b549485edcd6527d4af464873fac84 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 17:46:49 +0800 Subject: [PATCH 66/75] bump release --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 39c8bf4..54702e4 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Jul 17 2020 Jens Petersen - 1.6.0.0-9 +- refresh to cabal-rpm-2.0.6 + * Tue Jan 28 2020 Fedora Release Engineering - 1.6.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From abbf198f38f01b889f8ede40d403507d10b34786 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:42:16 +0000 Subject: [PATCH 67/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 54702e4..5a86345 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.6.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 1.6.0.0-9 - refresh to cabal-rpm-2.0.6 From d12f64426c4ae0bf0d307caa53bcd100d2e9af20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:12:02 +0000 Subject: [PATCH 68/75] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 5a86345..46bbc70 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -110,6 +110,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.6.0.0-11 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.6.0.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 26ed7a77668a828beca1a1f7ecad8414d5f595ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:46:03 +0000 Subject: [PATCH 69/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 46bbc70..5da61ec 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.6.0.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 1.6.0.0-11 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9799b2a509efa76f03499635f767649a7a7689f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:12:13 +0000 Subject: [PATCH 70/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 5da61ec..2144c54 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.0.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.6.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.6.0.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a457de62916f4e6ff1587ef1f9459cfb1ca18458 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 28 Jan 2021 14:59:52 +0800 Subject: [PATCH 71/75] update to 1.6.1.0 --- .gitignore | 1 + HUnit-1.6.1.0.cabal | 68 +++++++++++++++++++++++++++++++++++++++++++++ ghc-HUnit.spec | 9 ++++-- sources | 2 +- 4 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 HUnit-1.6.1.0.cabal diff --git a/.gitignore b/.gitignore index 9d2c7d1..4d3daa5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.5.0.0.tar.gz /call-stack-0.1.0.tar.gz /HUnit-1.6.0.0.tar.gz +/HUnit-1.6.1.0.tar.gz diff --git a/HUnit-1.6.1.0.cabal b/HUnit-1.6.1.0.cabal new file mode 100644 index 0000000..8541089 --- /dev/null +++ b/HUnit-1.6.1.0.cabal @@ -0,0 +1,68 @@ +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack + +name: HUnit +version: 1.6.1.0 +x-revision: 1 +license: BSD3 +license-file: LICENSE +author: Dean Herington +maintainer: Simon Hengel +stability: stable +homepage: https://github.com/hspec/HUnit#readme +bug-reports: https://github.com/hspec/HUnit/issues +category: Testing +synopsis: A unit testing framework for Haskell +description: HUnit is a unit testing framework for Haskell, inspired by the + JUnit tool for Java, see: . +build-type: Simple +extra-source-files: + CHANGELOG.md + README.md + +source-repository head + type: git + location: https://github.com/hspec/HUnit + +library + hs-source-dirs: + src + other-extensions: ConstraintKinds + build-depends: + base ==4.*, + call-stack, + deepseq + exposed-modules: + Test.HUnit.Base + Test.HUnit.Lang + Test.HUnit.Terminal + Test.HUnit.Text + Test.HUnit + other-modules: + Paths_HUnit + default-language: Haskell2010 + ghc-options: -Wall + +test-suite tests + type: exitcode-stdio-1.0 + main-is: HUnitTests.hs + hs-source-dirs: + tests + examples + build-depends: + HUnit, + base ==4.*, + call-stack, + deepseq, + filepath + other-modules: + HUnitTestBase + HUnitTestExtended + TerminalTest + Example + Paths_HUnit + default-language: Haskell2010 + ghc-options: -Wall diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 2144c54..496c004 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -7,14 +7,15 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.6.0.0 -Release: 13%{?dist} +Version: 1.6.1.0 +Release: 1%{?dist} Summary: A unit testing framework for Haskell License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -69,6 +70,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -110,6 +112,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 1.6.1.0-1 +- update to 1.6.1.0 + * Thu Jul 22 2021 Fedora Release Engineering - 1.6.0.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 916a6d3..9143f38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (HUnit-1.6.0.0.tar.gz) = 06503884bb85733be05b82da1fcc47e5b81122c3a3959ef047acbea2df1338b4f4589479b46daa6a0d554c7cb06b8cf1712462a3496db22cec5621e878467120 +SHA512 (HUnit-1.6.1.0.tar.gz) = 8fbf9726729c187eb751d2033692f957be15111d4bb6b72acaa296cfc1b316d246e3ff122868a7d015846a8fe135e822dcb56df7582882413cecdb906abdbdfa From fbbaf49c8c08f6a056069c7dc6524ac4eb581f0f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:09 +0800 Subject: [PATCH 72/75] refresh to cabal-rpm-2.0.9 --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 496c004..09dd854 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.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 HUnit @@ -50,6 +50,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. @@ -87,7 +88,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 1fd7e8c2c711a010553231d914a1df72a7583ca6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 01:36:48 +0800 Subject: [PATCH 73/75] update to 1.6.2.0 --- .gitignore | 1 + HUnit-1.6.1.0.cabal | 68 --------------------------------------------- ghc-HUnit.spec | 7 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 72 deletions(-) delete mode 100644 HUnit-1.6.1.0.cabal diff --git a/.gitignore b/.gitignore index 4d3daa5..b8928bd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ HUnit-1.2.2.1.tar.gz /call-stack-0.1.0.tar.gz /HUnit-1.6.0.0.tar.gz /HUnit-1.6.1.0.tar.gz +/HUnit-1.6.2.0.tar.gz diff --git a/HUnit-1.6.1.0.cabal b/HUnit-1.6.1.0.cabal deleted file mode 100644 index 8541089..0000000 --- a/HUnit-1.6.1.0.cabal +++ /dev/null @@ -1,68 +0,0 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.33.0. --- --- see: https://github.com/sol/hpack - -name: HUnit -version: 1.6.1.0 -x-revision: 1 -license: BSD3 -license-file: LICENSE -author: Dean Herington -maintainer: Simon Hengel -stability: stable -homepage: https://github.com/hspec/HUnit#readme -bug-reports: https://github.com/hspec/HUnit/issues -category: Testing -synopsis: A unit testing framework for Haskell -description: HUnit is a unit testing framework for Haskell, inspired by the - JUnit tool for Java, see: . -build-type: Simple -extra-source-files: - CHANGELOG.md - README.md - -source-repository head - type: git - location: https://github.com/hspec/HUnit - -library - hs-source-dirs: - src - other-extensions: ConstraintKinds - build-depends: - base ==4.*, - call-stack, - deepseq - exposed-modules: - Test.HUnit.Base - Test.HUnit.Lang - Test.HUnit.Terminal - Test.HUnit.Text - Test.HUnit - other-modules: - Paths_HUnit - default-language: Haskell2010 - ghc-options: -Wall - -test-suite tests - type: exitcode-stdio-1.0 - main-is: HUnitTests.hs - hs-source-dirs: - tests - examples - build-depends: - HUnit, - base ==4.*, - call-stack, - deepseq, - filepath - other-modules: - HUnitTestBase - HUnitTestExtended - TerminalTest - Example - Paths_HUnit - default-language: Haskell2010 - ghc-options: -Wall diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 09dd854..4a66d2f 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -7,7 +7,7 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.6.1.0 +Version: 1.6.2.0 Release: 1%{?dist} Summary: A unit testing framework for Haskell @@ -15,7 +15,6 @@ License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -71,7 +70,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -115,6 +113,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Aug 5 2021 Jens Petersen - 1.6.2.0-1 +- update to 1.6.2.0 + * Thu Aug 5 2021 Jens Petersen - 1.6.1.0-1 - update to 1.6.1.0 diff --git a/sources b/sources index 9143f38..5140869 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (HUnit-1.6.1.0.tar.gz) = 8fbf9726729c187eb751d2033692f957be15111d4bb6b72acaa296cfc1b316d246e3ff122868a7d015846a8fe135e822dcb56df7582882413cecdb906abdbdfa +SHA512 (HUnit-1.6.2.0.tar.gz) = b27c33545fcb4ca78dd9543eb0ab2f09e5edd989d116fe2136d876eb94745e6d384967ea4b3c6dbf0f03511091a82ecd0b299c8ab00769c57d6dddcddc27e8e5 From 39132931f228aa8fdef154de3c526f7d2bacbc34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:24:18 +0000 Subject: [PATCH 74/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-HUnit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 4a66d2f..e6e28ed 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.6.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A unit testing framework for Haskell License: BSD @@ -113,6 +113,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.6.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 1.6.2.0-1 - update to 1.6.2.0 From 04c5cb04f6766e8346cdca1e2308602183cf726a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:14:47 +0300 Subject: [PATCH 75/75] 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 5140869..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (HUnit-1.6.2.0.tar.gz) = b27c33545fcb4ca78dd9543eb0ab2f09e5edd989d116fe2136d876eb94745e6d384967ea4b3c6dbf0f03511091a82ecd0b299c8ab00769c57d6dddcddc27e8e5