From 91c9bc403568e5c4025b11a6200d311772778c8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Apr 2014 12:00:18 +0000 Subject: [PATCH 01/51] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 6019f7b755c47e57cef574116e9e0ae184e2a081 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Apr 2014 17:16:15 +0900 Subject: [PATCH 02/51] import (#1076739) --- .gitignore | 1 + ghc-scientific.spec | 75 +++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 77 insertions(+) create mode 100644 ghc-scientific.spec diff --git a/.gitignore b/.gitignore index e69de29..f6ed87f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/scientific-0.2.0.2.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec new file mode 100644 index 0000000..7a3c9ba --- /dev/null +++ b/ghc-scientific.spec @@ -0,0 +1,75 @@ +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name scientific + +Name: ghc-%{pkg_name} +Version: 0.2.0.2 +Release: 1%{?dist} +Summary: Arbitrary-precision floating-point numbers represented using scientific notation + +License: BSD +URL: http://hackage.haskell.org/package/%{pkg_name} +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-hashable-devel +BuildRequires: ghc-text-devel +# End cabal-rpm deps + +%description +A 'Scientific' number is an arbitrary-precision floating-point number +represented using scientific notation. + +A scientific number with 'coefficient' 'c' and 'base10Exponent' 'e' corresponds +to the 'Fractional' number: ''fromInteger' c * 10 '^^' e' + +Its primary use-case is to serve as the target of parsing floating point +numbers. Since the textual representation of floating point numbers use +scientific notation they can be efficiently parsed to a 'Scientific' number. + + +%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 +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files + + +%changelog +* Sat Mar 15 2014 Fedora Haskell SIG - 0.2.0.2 +- spec file generated by cabal-rpm-0.8.10 diff --git a/sources b/sources index e69de29..ecdd446 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b811b242be41e3f8fc630c03d168c0e7 scientific-0.2.0.2.tar.gz From 962e6262238576859d9ee6a9166c0fbf25c7f190 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Apr 2014 17:17:09 +0900 Subject: [PATCH 03/51] improve description markup --- ghc-scientific.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 7a3c9ba..9fddddc 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -23,8 +23,8 @@ BuildRequires: ghc-text-devel A 'Scientific' number is an arbitrary-precision floating-point number represented using scientific notation. -A scientific number with 'coefficient' 'c' and 'base10Exponent' 'e' corresponds -to the 'Fractional' number: ''fromInteger' c * 10 '^^' e' +A scientific number with coefficient 'c' and base10Exponent 'e' corresponds +to the 'Fractional' number: 'fromInteger c * 10 ^^ e' Its primary use-case is to serve as the target of parsing floating point numbers. Since the textual representation of floating point numbers use From bb4266fc235c84b4b700b611ffb967347daf5f56 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Thu, 22 May 2014 15:07:38 -0400 Subject: [PATCH 04/51] Bump to 0.3.2.1-1 --- .gitignore | 1 + ghc-scientific.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f6ed87f..59b4f2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /scientific-0.2.0.2.tar.gz +/scientific-0.3.2.1.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 9fddddc..eb962f4 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -3,7 +3,7 @@ %global pkg_name scientific Name: ghc-%{pkg_name} -Version: 0.2.0.2 +Version: 0.3.2.1 Release: 1%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation @@ -14,6 +14,8 @@ Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: +BuildRequires: ghc-array-devel +BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-text-devel @@ -71,5 +73,8 @@ This package provides the Haskell %{pkg_name} library development files. %changelog -* Sat Mar 15 2014 Fedora Haskell SIG - 0.2.0.2 +* Sat May 22 2014 Ricky Elrod - 0.3.2.1-1 +- Bump to 0.3.2.1 + +* Sat Mar 15 2014 Fedora Haskell SIG - 0.2.0.2-1 - spec file generated by cabal-rpm-0.8.10 diff --git a/sources b/sources index ecdd446..e3df23f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b811b242be41e3f8fc630c03d168c0e7 scientific-0.2.0.2.tar.gz +dedca94b466b79310425c4b3bbda0c7b scientific-0.3.2.1.tar.gz From 2b2ca33ed6e8d9becc35aee8b52620061f1f3efb Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Thu, 22 May 2014 15:25:34 -0400 Subject: [PATCH 05/51] It is Thursday --- ghc-scientific.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index eb962f4..12edb87 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -73,7 +73,7 @@ This package provides the Haskell %{pkg_name} library development files. %changelog -* Sat May 22 2014 Ricky Elrod - 0.3.2.1-1 +* Thu May 22 2014 Ricky Elrod - 0.3.2.1-1 - Bump to 0.3.2.1 * Sat Mar 15 2014 Fedora Haskell SIG - 0.2.0.2-1 From 0aef6fac0b50614576573560168a374b500566fa Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:12:26 -0500 Subject: [PATCH 06/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 12edb87..59561e4 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation License: BSD @@ -73,6 +73,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.3.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 22 2014 Ricky Elrod - 0.3.2.1-1 - Bump to 0.3.2.1 From fbbbe0414168a28d360da565b5773aedd25b8f50 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 15:44:58 +0000 Subject: [PATCH 07/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 59561e4..7235a29 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation License: BSD @@ -73,6 +73,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.3.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 8d2196153e9da6603687c89ac12e327ee7d178e2 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Wed, 1 Oct 2014 00:38:04 -0400 Subject: [PATCH 08/51] Try a version bump Signed-off-by: Ricky Elrod --- .gitignore | 1 + ghc-scientific.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 59b4f2d..27fefd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /scientific-0.2.0.2.tar.gz /scientific-0.3.2.1.tar.gz +/scientific-0.3.3.1.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 7235a29..4e4d991 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -3,8 +3,8 @@ %global pkg_name scientific Name: ghc-%{pkg_name} -Version: 0.3.2.1 -Release: 3%{?dist} +Version: 0.3.3.1 +Release: 1%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation License: BSD @@ -73,6 +73,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Oct 1 2014 Ricky Elrod - 1.5.1-1 +- Latest upstream version. + * Sat Aug 16 2014 Fedora Release Engineering - 0.3.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index e3df23f..ba08dae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dedca94b466b79310425c4b3bbda0c7b scientific-0.3.2.1.tar.gz +ab145a37572836d692083fdc9b086066 scientific-0.3.3.1.tar.gz From 80d83f8f5d73d33ae569cbbabca97838d3d79c41 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Wed, 1 Oct 2014 00:55:56 -0400 Subject: [PATCH 09/51] fix version in changelog Signed-off-by: Ricky Elrod --- ghc-scientific.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 4e4d991..37b075d 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -73,7 +73,7 @@ This package provides the Haskell %{pkg_name} library development files. %changelog -* Wed Oct 1 2014 Ricky Elrod - 1.5.1-1 +* Wed Oct 1 2014 Ricky Elrod - 0.3.3.1-1 - Latest upstream version. * Sat Aug 16 2014 Fedora Release Engineering - 0.3.2.1-3 From 883ff3d9ac4612d592dafb04ac4cd62d5c73782c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:57:23 +0000 Subject: [PATCH 10/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 37b075d..c1cc0f3 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation License: BSD @@ -73,6 +73,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Oct 1 2014 Ricky Elrod - 0.3.3.1-1 - Latest upstream version. From 1e86c6311660dee63a5f5ae227826548e2d6ffab Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Sep 2015 18:20:46 +0900 Subject: [PATCH 11/51] update to 0.3.3.8 --- .gitignore | 1 + ghc-scientific.spec | 46 +++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 27fefd7..b430705 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /scientific-0.2.0.2.tar.gz /scientific-0.3.2.1.tar.gz /scientific-0.3.3.1.tar.gz +/scientific-0.3.3.8.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index c1cc0f3..ed6754e 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -2,14 +2,16 @@ %global pkg_name scientific +%bcond_with tests + Name: ghc-%{pkg_name} -Version: 0.3.3.1 -Release: 2%{?dist} +Version: 0.3.3.8 +Release: 1%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation 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 @@ -19,18 +21,27 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-text-devel +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-smallcheck-devel +BuildRequires: ghc-tasty-ant-xml-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel +BuildRequires: ghc-tasty-smallcheck-devel +%endif # End cabal-rpm deps %description -A 'Scientific' number is an arbitrary-precision floating-point number -represented using scientific notation. +'Data.Scientific' provides a space efficient and arbitrary precision scientific +number type. -A scientific number with coefficient 'c' and base10Exponent 'e' corresponds -to the 'Fractional' number: 'fromInteger c * 10 ^^ e' +A 'Scientific' number is represented with coefficient 'c' and +base10Exponent 'e' and corresponds to the 'Fractional' number: +'fromInteger c * 10 ^^ e' -Its primary use-case is to serve as the target of parsing floating point -numbers. Since the textual representation of floating point numbers use -scientific notation they can be efficiently parsed to a 'Scientific' number. +The main application of 'Scientific' is to be used as the target of parsing +arbitrary precision numbers coming from an untrusted source. %package devel @@ -56,6 +67,14 @@ 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 + %post devel %ghc_pkg_recache @@ -66,13 +85,16 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Thu Sep 17 2015 Jens Petersen - 0.3.3.8-1 +- update to 0.3.3.8 + * Wed Jun 17 2015 Fedora Release Engineering - 0.3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index ba08dae..2ff5969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab145a37572836d692083fdc9b086066 scientific-0.3.3.1.tar.gz +a202d9ab282b36e1e4288e4cd8536699 scientific-0.3.3.8.tar.gz From c5959d28ad1197221a7f7602a661229751a8b3c9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:25:33 +0900 Subject: [PATCH 12/51] Reverting "update to 0.3.3.8" This reverts commit 1e86c6311660dee63a5f5ae227826548e2d6ffab. --- .gitignore | 1 - ghc-scientific.spec | 46 ++++++++++++--------------------------------- sources | 2 +- 3 files changed, 13 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index b430705..27fefd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /scientific-0.2.0.2.tar.gz /scientific-0.3.2.1.tar.gz /scientific-0.3.3.1.tar.gz -/scientific-0.3.3.8.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index ed6754e..c1cc0f3 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -2,16 +2,14 @@ %global pkg_name scientific -%bcond_with tests - Name: ghc-%{pkg_name} -Version: 0.3.3.8 -Release: 1%{?dist} +Version: 0.3.3.1 +Release: 2%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation License: BSD -Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +URL: http://hackage.haskell.org/package/%{pkg_name} +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -21,27 +19,18 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-text-devel -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-smallcheck-devel -BuildRequires: ghc-tasty-ant-xml-devel -BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-hunit-devel -BuildRequires: ghc-tasty-quickcheck-devel -BuildRequires: ghc-tasty-smallcheck-devel -%endif # End cabal-rpm deps %description -'Data.Scientific' provides a space efficient and arbitrary precision scientific -number type. +A 'Scientific' number is an arbitrary-precision floating-point number +represented using scientific notation. -A 'Scientific' number is represented with coefficient 'c' and -base10Exponent 'e' and corresponds to the 'Fractional' number: -'fromInteger c * 10 ^^ e' +A scientific number with coefficient 'c' and base10Exponent 'e' corresponds +to the 'Fractional' number: 'fromInteger c * 10 ^^ e' -The main application of 'Scientific' is to be used as the target of parsing -arbitrary precision numbers coming from an untrusted source. +Its primary use-case is to serve as the target of parsing floating point +numbers. Since the textual representation of floating point numbers use +scientific notation they can be efficiently parsed to a 'Scientific' number. %package devel @@ -67,14 +56,6 @@ 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 - %post devel %ghc_pkg_recache @@ -85,16 +66,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc LICENSE %files devel -f %{name}-devel.files %changelog -* Thu Sep 17 2015 Jens Petersen - 0.3.3.8-1 -- update to 0.3.3.8 - * Wed Jun 17 2015 Fedora Release Engineering - 0.3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 2ff5969..ba08dae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a202d9ab282b36e1e4288e4cd8536699 scientific-0.3.3.8.tar.gz +ab145a37572836d692083fdc9b086066 scientific-0.3.3.1.tar.gz From 06ad19a434f9d9e1a0f58bcd4a3d14c669f2058f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:43:12 +0000 Subject: [PATCH 13/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index c1cc0f3..fcd6c93 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation License: BSD @@ -73,6 +73,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 347551cfb8733836ef8381d11c8ad469ffa44590 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2016 11:26:40 +0900 Subject: [PATCH 14/51] update to 0.3.3.8 This reverts commit c5959d28ad1197221a7f7602a661229751a8b3c9. --- .gitignore | 1 + ghc-scientific.spec | 46 +++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 27fefd7..b430705 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /scientific-0.2.0.2.tar.gz /scientific-0.3.2.1.tar.gz /scientific-0.3.3.1.tar.gz +/scientific-0.3.3.8.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index fcd6c93..8280e45 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -2,14 +2,16 @@ %global pkg_name scientific +%bcond_with tests + Name: ghc-%{pkg_name} -Version: 0.3.3.1 -Release: 3%{?dist} +Version: 0.3.3.8 +Release: 1%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation 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 @@ -19,18 +21,27 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-text-devel +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-smallcheck-devel +BuildRequires: ghc-tasty-ant-xml-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel +BuildRequires: ghc-tasty-smallcheck-devel +%endif # End cabal-rpm deps %description -A 'Scientific' number is an arbitrary-precision floating-point number -represented using scientific notation. +'Data.Scientific' provides a space efficient and arbitrary precision scientific +number type. -A scientific number with coefficient 'c' and base10Exponent 'e' corresponds -to the 'Fractional' number: 'fromInteger c * 10 ^^ e' +A 'Scientific' number is represented with coefficient 'c' and +base10Exponent 'e' and corresponds to the 'Fractional' number: +'fromInteger c * 10 ^^ e' -Its primary use-case is to serve as the target of parsing floating point -numbers. Since the textual representation of floating point numbers use -scientific notation they can be efficiently parsed to a 'Scientific' number. +The main application of 'Scientific' is to be used as the target of parsing +arbitrary precision numbers coming from an untrusted source. %package devel @@ -56,6 +67,14 @@ 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 + %post devel %ghc_pkg_recache @@ -66,13 +85,16 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Tue Jun 7 2016 Jens Petersen - 0.3.3.8-1 +- update to 0.3.3.8 + * Wed Feb 03 2016 Fedora Release Engineering - 0.3.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index ba08dae..2ff5969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab145a37572836d692083fdc9b086066 scientific-0.3.3.1.tar.gz +a202d9ab282b36e1e4288e4cd8536699 scientific-0.3.3.8.tar.gz From 7d27622b3a2c28a343c5c79f5043cac35a2d0d6d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 26 Jun 2016 17:30:40 +0900 Subject: [PATCH 15/51] update to 0.3.4.7 --- .gitignore | 1 + ghc-scientific.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b430705..88d0826 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /scientific-0.3.2.1.tar.gz /scientific-0.3.3.1.tar.gz /scientific-0.3.3.8.tar.gz +/scientific-0.3.4.7.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 8280e45..67cb45b 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,3 +1,4 @@ +# generated by cabal-rpm-0.9.11 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific @@ -5,7 +6,7 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.3.8 +Version: 0.3.4.7 Release: 1%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation @@ -16,11 +17,13 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: -BuildRequires: ghc-array-devel +BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-text-devel +BuildRequires: ghc-vector-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-smallcheck-devel @@ -89,9 +92,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files devel -f %{name}-devel.files +%doc changelog %changelog +* Sun Jun 26 2016 Jens Petersen - 0.3.4.7-1 +- update to 0.3.4.7 + * Tue Jun 7 2016 Jens Petersen - 0.3.3.8-1 - update to 0.3.3.8 diff --git a/sources b/sources index 2ff5969..16ba94d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a202d9ab282b36e1e4288e4cd8536699 scientific-0.3.3.8.tar.gz +732705f09a9be0f745f6a313bc29a77c scientific-0.3.4.7.tar.gz From 8006ddbf7248181e8592f3360e8a737938f4698a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:49 +0900 Subject: [PATCH 16/51] no longer remove license; use cabal_test --- ghc-scientific.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 67cb45b..104c8c5 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -70,13 +70,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 89efa4adc2a7c25f75d73cf7d30e85e0c780f517 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:48:16 +0000 Subject: [PATCH 17/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 104c8c5..86ca71e 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} Version: 0.3.4.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Arbitrary-precision floating-point numbers represented using scientific notation License: BSD @@ -92,6 +92,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.3.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Jun 26 2016 Jens Petersen - 0.3.4.7-1 - update to 0.3.4.7 From 7fe6a013a6fa959f0534e0cacd5a28164400ee19 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 00:29:26 +0900 Subject: [PATCH 18/51] update to 0.3.4.10 subpackaging integer-logarithms --- .gitignore | 1 + ghc-scientific.spec | 31 +++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 88d0826..d5e99f6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /scientific-0.3.3.1.tar.gz /scientific-0.3.3.8.tar.gz /scientific-0.3.4.7.tar.gz +/scientific-0.3.4.10.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 86ca71e..640f83d 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,18 +1,22 @@ -# generated by cabal-rpm-0.9.11 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific +%global pkgver %{pkg_name}-%{version} + +%global integerlogarithms integer-logarithms-1.0.1 %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.4.7 -Release: 2%{?dist} -Summary: Arbitrary-precision floating-point numbers represented using scientific notation +Version: 0.3.4.10 +Release: 1%{?dist} +Summary: Numbers represented using scientific notation 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/%{integerlogarithms}/%{integerlogarithms}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -22,6 +26,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel +#BuildRequires: ghc-integer-logarithms-devel BuildRequires: ghc-text-devel BuildRequires: ghc-vector-devel %if %{with tests} @@ -59,15 +64,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 %{integerlogarithms} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} -a1 %build +%ghc_libs_build %{integerlogarithms} %ghc_lib_build %install +%ghc_libs_install %{integerlogarithms} %ghc_lib_install @@ -92,6 +108,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Feb 21 2017 Jens Petersen - 0.3.4.10-1 +- update to 0.3.4.10 + * Fri Feb 10 2017 Fedora Release Engineering - 0.3.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 16ba94d..ba02cd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -732705f09a9be0f745f6a313bc29a77c scientific-0.3.4.7.tar.gz +SHA512 (scientific-0.3.4.10.tar.gz) = 6d91f27e5cbf4e5e1dfd13e509b9b98ff205aa15cbe1cf28a147436e4b27d1bcecf5c174433a02b2e9f5824ed8d711a1faf39f6ed99c9c361fff590abd822338 From a7e2e8511806a401e16bc5a277ea43bd644430f2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 10:24:28 +0900 Subject: [PATCH 19/51] add integer-logarithms --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d5e99f6..89a0055 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /scientific-0.3.3.8.tar.gz /scientific-0.3.4.7.tar.gz /scientific-0.3.4.10.tar.gz +/integer-logarithms-1.0.1.tar.gz diff --git a/sources b/sources index ba02cd5..269a27b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (integer-logarithms-1.0.1.tar.gz) = 14c84774eb94b6eb5ed172254106a5c53276ed3f24672d18b955d9d413a6012db7c70cd5444cbc630a849a8b57292d4c6ab826f0266798ab174d4050fe45bcd5 SHA512 (scientific-0.3.4.10.tar.gz) = 6d91f27e5cbf4e5e1dfd13e509b9b98ff205aa15cbe1cf28a147436e4b27d1bcecf5c174433a02b2e9f5824ed8d711a1faf39f6ed99c9c361fff590abd822338 From 6f04d0eaa4924521cd092ed8bcc6b2322db9a1bf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 10:37:43 +0900 Subject: [PATCH 20/51] need ghc-rpm-macros-extra --- ghc-scientific.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 640f83d..e3c1bd3 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -19,7 +19,7 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{integerlogarithms}/%{integerlogarithms}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel From 90a7155f5ee711bddf56c8cddac32a14263f6e82 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 13:05:28 +0900 Subject: [PATCH 21/51] use %subpkgs --- ghc-scientific.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index e3c1bd3..f62965f 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -5,6 +5,7 @@ %global pkgver %{pkg_name}-%{version} %global integerlogarithms integer-logarithms-1.0.1 +%global subpkgs %{integerlogarithms} %bcond_with tests @@ -78,12 +79,12 @@ This package provides the Haskell %{pkg_name} library development files. %build -%ghc_libs_build %{integerlogarithms} +%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{integerlogarithms} +%ghc_libs_install %{subpkgs} %ghc_lib_install From 0d2842d10953a56f0c072088b35db7d92db0d1ad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 13:16:06 +0900 Subject: [PATCH 22/51] fix rpaths --- ghc-scientific.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index f62965f..13b94b6 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -86,6 +86,7 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{subpkgs} %check From 72ee4d0db29be9c5c2cff66d2381d0a96060bbe8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:55:10 +0000 Subject: [PATCH 23/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 13b94b6..0c6ce54 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 0.3.4.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.3.4.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Feb 21 2017 Jens Petersen - 0.3.4.10-1 - update to 0.3.4.10 From 8cd2f9d953bbd63302169d089ca9552fcbf4dea2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:30:58 +0000 Subject: [PATCH 24/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 0c6ce54..750fed3 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 0.3.4.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.3.4.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.3.4.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 58b57e43b04e83fa64ceb9eae0efa8be5bfe81cd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 15 Nov 2017 11:49:56 +0900 Subject: [PATCH 25/51] no longer need %ghc_fix_rpath --- ghc-scientific.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 750fed3..d529fc4 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -86,7 +86,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 85a506d5b488ce399fb7c3977d6b0385ed6a803b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Nov 2017 07:38:34 +0530 Subject: [PATCH 26/51] integer-logarithms is now packaged --- ghc-scientific.spec | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index d529fc4..412c12f 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,33 +1,29 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific %global pkgver %{pkg_name}-%{version} -%global integerlogarithms integer-logarithms-1.0.1 -%global subpkgs %{integerlogarithms} - %bcond_with tests Name: ghc-%{pkg_name} Version: 0.3.4.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Numbers represented using scientific notation 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/%{integerlogarithms}/%{integerlogarithms}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel -#BuildRequires: ghc-integer-logarithms-devel +BuildRequires: ghc-integer-logarithms-devel BuildRequires: ghc-text-devel BuildRequires: ghc-vector-devel %if %{with tests} @@ -56,35 +52,27 @@ arbitrary precision numbers coming from an untrusted source. %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 This package provides the Haskell %{pkg_name} library development files. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{integerlogarithms} -%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 @@ -109,6 +97,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Nov 21 2017 Jens Petersen - 0.3.4.10-4 +- integer-logarithms is now packaged +- update to cabal-rpm-0.12 packaging + * Wed Aug 02 2017 Fedora Release Engineering - 0.3.4.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From c5616d63f427100aa78c898cdf77d8f8769d1b96 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:11:54 +0100 Subject: [PATCH 27/51] refresh to cabal-rpm-0.12.1 --- ghc-scientific.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 412c12f..7af9c83 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific @@ -80,6 +80,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 4d5493c9b9baf1329927165aaf8ae3033adf5c0c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:49:19 +0100 Subject: [PATCH 28/51] update to 0.3.5.2 --- .gitignore | 1 + ghc-scientific.spec | 9 ++++++--- sources | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 89a0055..efd5390 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /scientific-0.3.4.7.tar.gz /scientific-0.3.4.10.tar.gz /integer-logarithms-1.0.1.tar.gz +/scientific-0.3.5.2.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 7af9c83..cb70121 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.4.10 -Release: 4%{?dist} +Version: 0.3.5.2 +Release: 1%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -24,8 +24,8 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-integer-logarithms-devel +BuildRequires: ghc-primitive-devel BuildRequires: ghc-text-devel -BuildRequires: ghc-vector-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-smallcheck-devel @@ -103,6 +103,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 24 2018 Jens Petersen - 0.3.5.2-1 +- update to 0.3.5.2 + * Tue Nov 21 2017 Jens Petersen - 0.3.4.10-4 - integer-logarithms is now packaged - update to cabal-rpm-0.12 packaging diff --git a/sources b/sources index 269a27b..a510755 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (integer-logarithms-1.0.1.tar.gz) = 14c84774eb94b6eb5ed172254106a5c53276ed3f24672d18b955d9d413a6012db7c70cd5444cbc630a849a8b57292d4c6ab826f0266798ab174d4050fe45bcd5 -SHA512 (scientific-0.3.4.10.tar.gz) = 6d91f27e5cbf4e5e1dfd13e509b9b98ff205aa15cbe1cf28a147436e4b27d1bcecf5c174433a02b2e9f5824ed8d711a1faf39f6ed99c9c361fff590abd822338 +SHA512 (scientific-0.3.5.2.tar.gz) = 2848f7bc80d3b2bfcc75083294f32574dc116f98a564f77f25e13d8bcada29cdfca4118d83d6fad6b25065fc39eba2b4c42a657128043e83e11ff48909228e1f From edf98f4daf8bb22fc73c1d17a7a9057e1fc01c31 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:20 +0900 Subject: [PATCH 29/51] drop ldconfig scriptlets --- ghc-scientific.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index cb70121..d07904b 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -80,12 +80,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 a6c0daab22d42779d87592ab8e9a383ef08aa262 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:05:25 +0000 Subject: [PATCH 30/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index d07904b..6a4bfa8 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -97,6 +97,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.3.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 0.3.5.2-1 - update to 0.3.5.2 From e1bb7f85a4cdc3d81d4f99641dd063776122542a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:05:45 +0000 Subject: [PATCH 31/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 6a4bfa8..d16326e 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -97,6 +97,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.3.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.3.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f12f1288b806dcb201a61cfcc63da9584ad50475 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 23:25:35 +0900 Subject: [PATCH 32/51] update to 0.3.6.2 --- .gitignore | 1 + ghc-scientific.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index efd5390..c9f52d3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /scientific-0.3.4.10.tar.gz /integer-logarithms-1.0.1.tar.gz /scientific-0.3.5.2.tar.gz +/scientific-0.3.6.2.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index d16326e..fe6d0cd 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.5.2 -Release: 3%{?dist} +Version: 0.3.6.2 +Release: 1%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -97,6 +97,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Jul 22 2018 Jens Petersen - 0.3.6.2-1 +- update to 0.3.6.2 + * Fri Jul 13 2018 Fedora Release Engineering - 0.3.5.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index a510755..627de69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scientific-0.3.5.2.tar.gz) = 2848f7bc80d3b2bfcc75083294f32574dc116f98a564f77f25e13d8bcada29cdfca4118d83d6fad6b25065fc39eba2b4c42a657128043e83e11ff48909228e1f +SHA512 (scientific-0.3.6.2.tar.gz) = 47a74524c8fb25d381adf868d823a6b6772f3f69b0b3cf9f9de015a03bc941857ef3fca1b4f8cbf23e998164e71a914e167221e753c6f32dc8644047d1ef57ee From 0c065745756c5b3224a6efa05bfd6379e89ca708 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:57:33 +0000 Subject: [PATCH 33/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index fe6d0cd..33e238d 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -97,6 +97,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.3.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jul 22 2018 Jens Petersen - 0.3.6.2-1 - update to 0.3.6.2 From 91a3f5e62643190158f527dbfae39464ad6fa6a4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:46:57 +0800 Subject: [PATCH 34/51] refresh to cabal-rpm-0.13 --- ghc-scientific.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 33e238d..748a004 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Numbers represented using scientific notation 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-binary-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel @@ -65,15 +67,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 @@ -89,7 +97,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 @@ -97,6 +107,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 0.3.6.2-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.3.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b323c3e0990fbcce4507f8b4011e17bcc6a378da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:56:46 +0000 Subject: [PATCH 35/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 748a004..4318a32 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -107,6 +107,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.3.6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.3.6.2-3 - refresh to cabal-rpm-0.13 From d5bfed786ab9a1ea2c179d1db9718f0cc6e3fc4b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:25:36 +0000 Subject: [PATCH 36/51] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-scientific.spec | 55 +++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 4318a32..27a885c 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.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 scientific @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Numbers represented using scientific notation 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-binary-devel BuildRequires: ghc-bytestring-devel @@ -31,8 +37,8 @@ BuildRequires: ghc-text-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-smallcheck-devel -BuildRequires: ghc-tasty-ant-xml-devel BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-ant-xml-devel BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel BuildRequires: ghc-tasty-smallcheck-devel @@ -54,11 +60,8 @@ arbitrary precision numbers coming from an untrusted source. %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} @@ -66,6 +69,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} @@ -88,14 +110,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 @@ -106,7 +120,20 @@ This package provides the Haskell %{pkg_name} library development files. %doc changelog +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog +* Fri Aug 02 2019 Jens Petersen - 0.3.6.2-5 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.3.6.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 44cac28810468833e2ee558215fbd0aed4d6cd81 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:31:33 +0800 Subject: [PATCH 37/51] BR prof for lib and static for executable --- ghc-scientific.spec | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 27a885c..7ee6d0e 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.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 scientific @@ -19,21 +19,16 @@ 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-binary-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-hashable-devel -BuildRequires: ghc-integer-logarithms-devel -BuildRequires: ghc-primitive-devel -BuildRequires: ghc-text-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-binary-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-hashable-prof +BuildRequires: ghc-integer-logarithms-prof +BuildRequires: ghc-primitive-prof +BuildRequires: ghc-text-prof %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-smallcheck-devel @@ -60,6 +55,7 @@ arbitrary precision numbers coming from an untrusted source. %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 4c0f52e4d60aa31848f61bf66f940e74c3e0f09c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:18:53 +0000 Subject: [PATCH 38/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 7ee6d0e..17b293d 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -127,6 +127,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.3.6.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Jens Petersen - 0.3.6.2-5 - add doc and prof subpackages (cabal-rpm-1.0.0) From 868e699ec7e5d0a2749ec4e5bc01cca901e40e1d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:51:51 +0800 Subject: [PATCH 39/51] refresh to cabal-rpm-2.0.2 --- ghc-scientific.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 17b293d..7c6d030 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,11 +1,9 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 0.3.6.2 Release: 6%{?dist} @@ -29,15 +27,6 @@ BuildRequires: ghc-hashable-prof BuildRequires: ghc-integer-logarithms-prof BuildRequires: ghc-primitive-prof BuildRequires: ghc-text-prof -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-smallcheck-devel -BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-ant-xml-devel -BuildRequires: ghc-tasty-hunit-devel -BuildRequires: ghc-tasty-quickcheck-devel -BuildRequires: ghc-tasty-smallcheck-devel -%endif # End cabal-rpm deps %description @@ -68,6 +57,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. @@ -78,6 +68,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. @@ -102,8 +93,14 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install -%check -%cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif %files -f %{name}.files @@ -118,6 +115,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From fa1e2b448923fe49edcbf0e922f653febf24f5b3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:28:05 +0800 Subject: [PATCH 40/51] refresh to cabal-rpm-2.0.5 --- ghc-scientific.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 7c6d030..d571ab0 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.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 scientific %global pkgver %{pkg_name}-%{version} From 08e2299ef7a047c7f2c9ddba0e8200ae2d1aa5c9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:56:42 +0800 Subject: [PATCH 41/51] refresh to cabal-rpm-2.0.6 --- ghc-scientific.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index d571ab0..798c4e7 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,9 +1,11 @@ -# 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 scientific %global pkgver %{pkg_name}-%{version} +# testsuite missing deps: tasty-ant-xml tasty-smallcheck + Name: ghc-%{pkg_name} Version: 0.3.6.2 Release: 6%{?dist} @@ -93,16 +95,6 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install -%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 634e83785fcb637698cc6f030404869bfee76894 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 18:34:48 +0800 Subject: [PATCH 42/51] bump release --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 798c4e7..b4be4f2 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Jul 17 2020 Jens Petersen - 0.3.6.2-7 +- refresh to cabal-rpm-2.0.6 + * Tue Jan 28 2020 Fedora Release Engineering - 0.3.6.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 39c4f7526c2d776a58c632c55521f41398ab6e5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:36:42 +0000 Subject: [PATCH 43/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index b4be4f2..ca62a5d 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.3.6.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.3.6.2-7 - refresh to cabal-rpm-2.0.6 From f38af98c8e9ca0a1ad765ab70c4102424dcff4ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:25:38 +0000 Subject: [PATCH 44/51] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index ca62a5d..1e27391 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -117,6 +117,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.3.6.2-9 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.3.6.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e1a2134d591115d59816d004eeac21da86f8dbb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:40:53 +0000 Subject: [PATCH 45/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 1e27391..d475546 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.3.6.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.3.6.2-9 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d462c6032f8abc40260a7ac646adc3fe08bbcdbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:11:44 +0000 Subject: [PATCH 46/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index d475546..6e62edb 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.6.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.3.6.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.3.6.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 78da085887bc5f744a610532aae85ee377f5e3ff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:13 +0800 Subject: [PATCH 47/51] refresh to cabal-rpm-2.0.9 --- ghc-scientific.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 6e62edb..93b9246 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.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 scientific @@ -60,6 +60,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. From e5594bcb7b53d6a5418b5f1dedc644a7ac0a6d02 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 11:26:03 +0800 Subject: [PATCH 48/51] update to 0.3.7.0 --- .gitignore | 1 + ghc-scientific.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c9f52d3..fe72dcd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /integer-logarithms-1.0.1.tar.gz /scientific-0.3.5.2.tar.gz /scientific-0.3.6.2.tar.gz +/scientific-0.3.7.0.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 93b9246..39fe3b8 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -4,11 +4,11 @@ %global pkg_name scientific %global pkgver %{pkg_name}-%{version} -# testsuite missing deps: tasty-ant-xml tasty-smallcheck +# testsuite missing deps: tasty-smallcheck Name: ghc-%{pkg_name} -Version: 0.3.6.2 -Release: 11%{?dist} +Version: 0.3.7.0 +Release: 1%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -28,6 +28,7 @@ BuildRequires: ghc-deepseq-prof BuildRequires: ghc-hashable-prof BuildRequires: ghc-integer-logarithms-prof BuildRequires: ghc-primitive-prof +BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-text-prof # End cabal-rpm deps @@ -118,6 +119,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 0.3.7.0-1 +- update to 0.3.7.0 + * Thu Jul 22 2021 Fedora Release Engineering - 0.3.6.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 627de69..e5587ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scientific-0.3.6.2.tar.gz) = 47a74524c8fb25d381adf868d823a6b6772f3f69b0b3cf9f9de015a03bc941857ef3fca1b4f8cbf23e998164e71a914e167221e753c6f32dc8644047d1ef57ee +SHA512 (scientific-0.3.7.0.tar.gz) = dbd13060a6d1d101138715b4106382a78d115cff247859cb6f83aca3cdb6f6caf8a2c52d7ae99be64845c5e4a7959940bbf31df6265b15079c236f193b087865 From 9718df9e46eadda0acecea8552e446dbbe3ba89a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:28:36 +0000 Subject: [PATCH 49/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-scientific.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 39fe3b8..fe771dd 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Numbers represented using scientific notation License: BSD @@ -119,6 +119,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.3.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 0.3.7.0-1 - update to 0.3.7.0 From 0c0dbc9c18a32c55d059cbd513cce4e506640f94 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 18 Jun 2022 00:21:41 +0800 Subject: [PATCH 50/51] revise .cabal --- ghc-scientific.spec | 2 + scientific-0.3.7.0.cabal | 168 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) create mode 100644 scientific-0.3.7.0.cabal diff --git a/ghc-scientific.spec b/ghc-scientific.spec index fe771dd..61877ec 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -15,6 +15,7 @@ License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -82,6 +83,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup diff --git a/scientific-0.3.7.0.cabal b/scientific-0.3.7.0.cabal new file mode 100644 index 0000000..37af49c --- /dev/null +++ b/scientific-0.3.7.0.cabal @@ -0,0 +1,168 @@ +name: scientific +version: 0.3.7.0 +x-revision: 2 +synopsis: Numbers represented using scientific notation +description: + "Data.Scientific" provides the number type 'Scientific'. Scientific numbers are + arbitrary precision and space efficient. They are represented using + . + The implementation uses a coefficient @c :: 'Integer'@ and a base-10 exponent + @e :: 'Int'@. A scientific number corresponds to the + 'Fractional' number: @'fromInteger' c * 10 '^^' e@. + . + Note that since we're using an 'Int' to represent the exponent these numbers + aren't truly arbitrary precision. I intend to change the type of the exponent + to 'Integer' in a future release. + . + The main application of 'Scientific' is to be used as the target of parsing + arbitrary precision numbers coming from an untrusted source. The advantages + over using 'Rational' for this are that: + . + * A 'Scientific' is more efficient to construct. Rational numbers need to be + constructed using '%' which has to compute the 'gcd' of the 'numerator' and + 'denominator'. + . + * 'Scientific' is safe against numbers with huge exponents. For example: + @1e1000000000 :: 'Rational'@ will fill up all space and crash your + program. Scientific works as expected: + . + >>> read "1e1000000000" :: Scientific + 1.0e1000000000 + . + * Also, the space usage of converting scientific numbers with huge exponents to + @'Integral's@ (like: 'Int') or @'RealFloat's@ (like: 'Double' or 'Float') + will always be bounded by the target type. + +homepage: https://github.com/basvandijk/scientific +bug-reports: https://github.com/basvandijk/scientific/issues +license: BSD3 +license-file: LICENSE +author: Bas van Dijk +maintainer: Bas van Dijk +category: Data +build-type: Simple +cabal-version: >=1.10 +extra-source-files: changelog +tested-with: + GHC ==7.6.3 + || ==7.8.4 + || ==7.10.3 + || ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.4 + || ==8.10.7 + || ==9.0.1 + || ==9.2.1 + +source-repository head + type: git + location: git://github.com/basvandijk/scientific.git + +flag bytestring-builder + description: + Depend on the bytestring-builder package for backwards compatibility. + + default: False + manual: False + +flag integer-simple + description: Use the integer-simple package instead of integer-gmp + default: False + +library + exposed-modules: + Data.ByteString.Builder.Scientific + Data.Scientific + Data.Text.Lazy.Builder.Scientific + + other-modules: + GHC.Integer.Compat + Utils + + other-extensions: + BangPatterns + DeriveDataTypeable + Trustworthy + + ghc-options: -Wall + build-depends: + base >=4.5 && <4.17 + , binary >=0.5.1 && <0.9 + , containers >=0.4.2.1 && <0.7 + , deepseq >=1.3.0.0 && <1.5 + , hashable >=1.2.7.0 && <1.5 + , integer-logarithms >=1.0.3.1 && <1.1 + , primitive >=0.7.1.0 && <0.8 + , template-haskell >=2.8 && <2.19 + , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1 + + if flag(bytestring-builder) + build-depends: + bytestring >=0.9 && <0.10.4 + , bytestring-builder >=0.10.4 && <0.11 + + else + build-depends: bytestring >=0.10.4 && <0.12 + + if impl(ghc >=9.0) + build-depends: base >=4.15 + + if flag(integer-simple) + build-depends: invalid-cabal-flag-settings <0 + + else + if flag(integer-simple) + build-depends: integer-simple + + else + build-depends: integer-gmp + + if impl(ghc <8) + other-extensions: TemplateHaskell + + if impl(ghc >= 9.0) + -- these flags may abort compilation with GHC-8.10 + -- https://gitlab.haskell.org/ghc/ghc/-/merge_requests/3295 + ghc-options: -Winferred-safe-imports -Wmissing-safe-haskell-mode + + hs-source-dirs: src + default-language: Haskell2010 + +test-suite test-scientific + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: test.hs + default-language: Haskell2010 + ghc-options: -Wall + build-depends: + base + , binary + , QuickCheck >=2.14.2 + , scientific + , smallcheck >=1.0 + , tasty >=1.4.0.1 + , tasty-hunit >=0.8 + , tasty-quickcheck >=0.8 + , tasty-smallcheck >=0.2 + , text + + if flag(bytestring-builder) + build-depends: + bytestring + , bytestring-builder + + else + build-depends: bytestring + +benchmark bench-scientific + type: exitcode-stdio-1.0 + hs-source-dirs: bench + main-is: bench.hs + default-language: Haskell2010 + ghc-options: -O2 + build-depends: + base + , criterion >=0.5 + , scientific From 5de51cbb827c2c27a5808afc0653cef8ca685a5c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:54:39 +0300 Subject: [PATCH 51/51] 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 e5587ee..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (scientific-0.3.7.0.tar.gz) = dbd13060a6d1d101138715b4106382a78d115cff247859cb6f83aca3cdb6f6caf8a2c52d7ae99be64845c5e4a7959940bbf31df6265b15079c236f193b087865