From b9f5bf252ee8bbf24e9662af3c80e9c034a85cb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jan 2015 11:42:32 +0000 Subject: [PATCH 01/47] 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 5510b5b8d8e4ddd3d40a7c7b56b52b944658513e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 21 Jan 2015 22:09:31 +0900 Subject: [PATCH 02/47] import (#1180460) --- .gitignore | 1 + ghc-JuicyPixels.spec | 83 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 85 insertions(+) create mode 100644 ghc-JuicyPixels.spec diff --git a/.gitignore b/.gitignore index e69de29..4d172a3 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/JuicyPixels-3.2.1.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec new file mode 100644 index 0000000..72aba0f --- /dev/null +++ b/ghc-JuicyPixels.spec @@ -0,0 +1,83 @@ +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name JuicyPixels + +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 3.2.1 +Release: 1%{?dist} +Summary: Picture loading and serialization + +License: BSD +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 +# Begin cabal-rpm deps: +BuildRequires: ghc-binary-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-primitive-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-vector-devel +BuildRequires: ghc-zlib-devel +# End cabal-rpm deps + +%description +This library can load and store images in PNG, Bitmap, Jpeg, Radiance, Tiff and +Gif images. + + +%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 + +install -p -m 0644 docimages/* %{buildroot}%{ghclibdocdir}/%{pkg_name} + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files + + +%changelog +* Fri Jan 9 2015 Jens Petersen - 3.2.1-1 +- summary and description +- install docimages under ghclibdocdir + +* Fri Jan 9 2015 Fedora Haskell SIG - 3.2.1 +- spec file generated by cabal-rpm-0.9.2 diff --git a/sources b/sources index e69de29..341c7f9 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +29fb0932c9ded6d392c992a317746e89 JuicyPixels-3.2.1.tar.gz From f521a8da67b4027c738b34487b1ed22f1fce6a9a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 21 Jan 2015 22:11:47 +0900 Subject: [PATCH 03/47] update to 3.2.2 and convert LICENSE to unix line-ending --- .gitignore | 1 + ghc-JuicyPixels.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4d172a3..e44057c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /JuicyPixels-3.2.1.tar.gz +/JuicyPixels-3.2.2.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 72aba0f..1371138 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -2,11 +2,8 @@ %global pkg_name JuicyPixels -# no useful debuginfo for Haskell packages without C sources -%global debug_package %{nil} - Name: ghc-%{pkg_name} -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: Picture loading and serialization @@ -47,6 +44,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +sed -i 's/\r$//' LICENSE %build @@ -75,6 +73,10 @@ install -p -m 0644 docimages/* %{buildroot}%{ghclibdocdir}/%{pkg_name} %changelog +* Wed Jan 21 2015 Jens Petersen - 3.2.2-1 +- update to 3.2.2 +- fix encoding of LICENSE (#1180460) + * Fri Jan 9 2015 Jens Petersen - 3.2.1-1 - summary and description - install docimages under ghclibdocdir diff --git a/sources b/sources index 341c7f9..bdb5051 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29fb0932c9ded6d392c992a317746e89 JuicyPixels-3.2.1.tar.gz +a648dd39367f54f5579a354cd81b5231 JuicyPixels-3.2.2.tar.gz From d88aee22b29ab7c68fbf452dc85742a23d252b4e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 22 Jan 2015 11:54:45 +0900 Subject: [PATCH 04/47] use ghcpkgdocdir for doc images --- ghc-JuicyPixels.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 1371138..eca5bf9 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -54,7 +54,7 @@ sed -i 's/\r$//' LICENSE %install %ghc_lib_install -install -p -m 0644 docimages/* %{buildroot}%{ghclibdocdir}/%{pkg_name} +install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} %post devel From f3faa100dfb5fd63b2ff2f3388af8deed2d4f576 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:28:17 +0000 Subject: [PATCH 05/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index eca5bf9..648e06f 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 3.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Picture loading and serialization License: BSD @@ -73,6 +73,9 @@ install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jan 21 2015 Jens Petersen - 3.2.2-1 - update to 3.2.2 - fix encoding of LICENSE (#1180460) From 683fd21945b0064d56a3d0e3af4b92554bad5207 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 31 Aug 2015 23:36:17 +0100 Subject: [PATCH 06/47] Rebuild (aarch64 vector hashes) --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 648e06f..f5a6e44 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 3.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Picture loading and serialization License: BSD @@ -73,6 +73,9 @@ install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} %changelog +* Mon Aug 31 2015 Peter Robinson 3.2.2-3 +- Rebuild (aarch64 vector hashes) + * Wed Jun 17 2015 Fedora Release Engineering - 3.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From a628ef7f4a478c838cc4bde95989e54e237505ec Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Sep 2015 18:00:06 +0900 Subject: [PATCH 07/47] update to 3.2.6.1 --- .gitignore | 1 + ghc-JuicyPixels.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e44057c..ed58b51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /JuicyPixels-3.2.1.tar.gz /JuicyPixels-3.2.2.tar.gz +/JuicyPixels-3.2.6.1.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index f5a6e44..85ee83f 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -3,8 +3,8 @@ %global pkg_name JuicyPixels Name: ghc-%{pkg_name} -Version: 3.2.2 -Release: 3%{?dist} +Version: 3.2.6.1 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD @@ -54,7 +54,7 @@ sed -i 's/\r$//' LICENSE %install %ghc_lib_install -install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %post devel @@ -66,13 +66,17 @@ install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files +%doc README.md docimages/* %changelog +* Thu Sep 17 2015 Jens Petersen - 3.2.6.1-1 +- update to 3.2.6.1 + * Mon Aug 31 2015 Peter Robinson 3.2.2-3 - Rebuild (aarch64 vector hashes) diff --git a/sources b/sources index bdb5051..555b6d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a648dd39367f54f5579a354cd81b5231 JuicyPixels-3.2.2.tar.gz +f5ad79da0db6acc81ec885b25c899174 JuicyPixels-3.2.6.1.tar.gz From 8224f7486f4c56b11ca86f20ae46fbb4cf3aae93 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:07:00 +0900 Subject: [PATCH 08/47] Reverting "update to 3.2.6.1" This reverts commit a628ef7f4a478c838cc4bde95989e54e237505ec. --- .gitignore | 1 - ghc-JuicyPixels.spec | 12 ++++-------- sources | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ed58b51..e44057c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /JuicyPixels-3.2.1.tar.gz /JuicyPixels-3.2.2.tar.gz -/JuicyPixels-3.2.6.1.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 85ee83f..f5a6e44 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -3,8 +3,8 @@ %global pkg_name JuicyPixels Name: ghc-%{pkg_name} -Version: 3.2.6.1 -Release: 1%{?dist} +Version: 3.2.2 +Release: 3%{?dist} Summary: Picture loading and serialization License: BSD @@ -54,7 +54,7 @@ sed -i 's/\r$//' LICENSE %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE +install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} %post devel @@ -66,17 +66,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc LICENSE %files devel -f %{name}-devel.files -%doc README.md docimages/* %changelog -* Thu Sep 17 2015 Jens Petersen - 3.2.6.1-1 -- update to 3.2.6.1 - * Mon Aug 31 2015 Peter Robinson 3.2.2-3 - Rebuild (aarch64 vector hashes) diff --git a/sources b/sources index 555b6d7..bdb5051 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5ad79da0db6acc81ec885b25c899174 JuicyPixels-3.2.6.1.tar.gz +a648dd39367f54f5579a354cd81b5231 JuicyPixels-3.2.2.tar.gz From a54e11f30aa9fd1c3975c5b781fe898ae9b032ec Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:23:01 +0000 Subject: [PATCH 09/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index f5a6e44..0f4e814 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 3.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Picture loading and serialization License: BSD @@ -73,6 +73,9 @@ install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Aug 31 2015 Peter Robinson 3.2.2-3 - Rebuild (aarch64 vector hashes) From a1a6105b931d87a96e7aa2a84fba97f628a4d204 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 15 Jun 2016 19:16:45 +0900 Subject: [PATCH 10/47] update to 3.2.7.1 --- .gitignore | 2 ++ ghc-JuicyPixels.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e44057c..683298c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /JuicyPixels-3.2.1.tar.gz /JuicyPixels-3.2.2.tar.gz +/JuicyPixels-3.2.6.1.tar.gz +/JuicyPixels-3.2.7.1.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 0f4e814..4e966c2 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -3,8 +3,8 @@ %global pkg_name JuicyPixels Name: ghc-%{pkg_name} -Version: 3.2.2 -Release: 4%{?dist} +Version: 3.2.7.1 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD @@ -54,7 +54,7 @@ sed -i 's/\r$//' LICENSE %install %ghc_lib_install -install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %post devel @@ -66,13 +66,17 @@ install -p -m 0644 docimages/* %{buildroot}%{ghcpkgdocdir} %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files +%doc README.md docimages/* %changelog +* Wed Jun 15 2016 Jens Petersen - 3.2.7.1-1 +- update to 3.2.7.1 + * Wed Feb 03 2016 Fedora Release Engineering - 3.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index bdb5051..1f927a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a648dd39367f54f5579a354cd81b5231 JuicyPixels-3.2.2.tar.gz +55a842619cace70d6c0307a1dc82dde2 JuicyPixels-3.2.7.1.tar.gz From ea91a181a1bfeec182c9f8588d3fb1ccfceb13f3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:24 +0900 Subject: [PATCH 11/47] no longer remove license --- ghc-JuicyPixels.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 4e966c2..d8204e0 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -54,8 +54,6 @@ sed -i 's/\r$//' LICENSE %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %post devel %ghc_pkg_recache From 9bb10a11ed9b3f350480933ba91039794b58e2ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:31:17 +0000 Subject: [PATCH 12/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index d8204e0..bf7d499 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 3.2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Picture loading and serialization License: BSD @@ -72,6 +72,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Jun 15 2016 Jens Petersen - 3.2.7.1-1 - update to 3.2.7.1 From cf6d54dd0579d982984d9801f68fa7954f6556a7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 10:06:27 +0900 Subject: [PATCH 13/47] update to 3.2.8 --- .gitignore | 1 + ghc-JuicyPixels.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 683298c..94d3eda 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /JuicyPixels-3.2.2.tar.gz /JuicyPixels-3.2.6.1.tar.gz /JuicyPixels-3.2.7.1.tar.gz +/JuicyPixels-3.2.8.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index bf7d499..9f7787c 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -1,15 +1,17 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name JuicyPixels +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.2.7.1 -Release: 2%{?dist} +Version: 3.2.8 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -43,7 +45,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} sed -i 's/\r$//' LICENSE @@ -72,6 +74,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Wed Feb 22 2017 Jens Petersen - 3.2.8-1 +- update to 3.2.8 + * Fri Feb 10 2017 Fedora Release Engineering - 3.2.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 1f927a1..4595b3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55a842619cace70d6c0307a1dc82dde2 JuicyPixels-3.2.7.1.tar.gz +SHA512 (JuicyPixels-3.2.8.tar.gz) = e0800730660e087fc65d65872ff794600436cdc421ff8d578bb0833b885a988eb468b0b90ada0badd10439919199688a43ae51c42aa2552f9cf39184c60e60f1 From a4f4fa44010e3b8aff5582c441649f3d5d39bfe9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:31:59 +0000 Subject: [PATCH 14/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 9f7787c..5d8a24a 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Picture loading and serialization License: BSD @@ -74,6 +74,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jens Petersen - 3.2.8-1 - update to 3.2.8 From 966398366695e5164710122f6c43fe22373bfcbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:10:20 +0000 Subject: [PATCH 15/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 5d8a24a..0aa3cf8 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Picture loading and serialization License: BSD @@ -74,6 +74,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 3.2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 3.2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 444d6e9d6b8cf891a9d9d7a4ecee44527c6dda38 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:24 +0100 Subject: [PATCH 16/47] refresh to cabal-rpm-0.12.1 --- ghc-JuicyPixels.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 0aa3cf8..e4e1a21 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.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 JuicyPixels @@ -35,9 +35,12 @@ Gif images. %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 @@ sed -i 's/\r$//' LICENSE %ghc_lib_install +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From b05638d85830f3504bc587984f9c4f041bc26d6d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:17:14 +0100 Subject: [PATCH 17/47] update to 3.2.9.3 --- .gitignore | 1 + ghc-JuicyPixels.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 94d3eda..cfc3f45 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /JuicyPixels-3.2.6.1.tar.gz /JuicyPixels-3.2.7.1.tar.gz /JuicyPixels-3.2.8.tar.gz +/JuicyPixels-3.2.9.3.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index e4e1a21..fedc387 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.2.8 -Release: 3%{?dist} +Version: 3.2.9.3 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD @@ -83,6 +83,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Wed Jan 24 2018 Jens Petersen - 3.2.9.3-1 +- update to 3.2.9.3 + * Wed Aug 02 2017 Fedora Release Engineering - 3.2.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 4595b3b..e17771a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JuicyPixels-3.2.8.tar.gz) = e0800730660e087fc65d65872ff794600436cdc421ff8d578bb0833b885a988eb468b0b90ada0badd10439919199688a43ae51c42aa2552f9cf39184c60e60f1 +SHA512 (JuicyPixels-3.2.9.3.tar.gz) = d2921866b8082e3dc26908cece3cd8b318f7f201ea8a77373eaa433c87a906ded85c692768c95c58cf1496c4a95f9f1dd86a62afd6a1535245aeb8f203423a14 From a129f53e53b3949d64807fdfd8e92a0a7f19c87d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 27 Jan 2018 19:32:19 +0100 Subject: [PATCH 18/47] fix Latin1 in Progressive.hs --- JuicyPixels-3.2.9.3-Progressive-Latin1.patch | 11 +++++++++++ ghc-JuicyPixels.spec | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 JuicyPixels-3.2.9.3-Progressive-Latin1.patch diff --git a/JuicyPixels-3.2.9.3-Progressive-Latin1.patch b/JuicyPixels-3.2.9.3-Progressive-Latin1.patch new file mode 100644 index 0000000..6146501 --- /dev/null +++ b/JuicyPixels-3.2.9.3-Progressive-Latin1.patch @@ -0,0 +1,11 @@ +--- JuicyPixels-3.2.9.3/src/Codec/Picture/Jpg/Progressive.hs~ 2018-01-01 18:46:06.000000000 +0100 ++++ JuicyPixels-3.2.9.3/src/Codec/Picture/Jpg/Progressive.hs 2018-01-27 19:26:56.780022170 +0100 +@@ -40,7 +40,7 @@ + + -- if the displayed MCU block is only displayed in half (like with + -- width 500 then we loose one macroblock of the MCU at the end of +- -- the line. Previous implementation which naïvely used full mcu ++ -- the line. Previous implementation which naively used full mcu + -- was wrong. Only taking into account visible macroblocks + indexSolo = [base + x + | y <- [0 .. compH - 1] diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index fedc387..f5db50b 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -12,6 +12,7 @@ Summary: Picture loading and serialization License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Patch0: JuicyPixels-3.2.9.3-Progressive-Latin1.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -50,6 +51,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} sed -i 's/\r$//' LICENSE +%patch0 -p1 -b .orig %build From fed6894c0d72e5444310eab416860896099f60cb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:01:47 +0900 Subject: [PATCH 19/47] drop ldconfig scriptlets --- ghc-JuicyPixels.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index f5db50b..3cd0eeb 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -62,12 +62,6 @@ sed -i 's/\r$//' LICENSE %ghc_lib_install -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 2495fbe42c88aa26c0eedf8c9e3851e835e23f41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:13:17 +0000 Subject: [PATCH 20/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 3cd0eeb..521614e 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.2.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Picture loading and serialization License: BSD @@ -79,6 +79,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.2.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 3.2.9.3-1 - update to 3.2.9.3 From 0c79c403c3536e250d249307ce509b5fbfe79e37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:29:53 +0000 Subject: [PATCH 21/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 521614e..5f0acd8 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.2.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Picture loading and serialization License: BSD @@ -79,6 +79,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.2.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 3.2.9.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 691957705315c9b5246b168aa3531519dcdc2cfc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 22:44:17 +0900 Subject: [PATCH 22/47] update to 3.2.9.5 --- .gitignore | 1 + JuicyPixels-3.2.9.3-Progressive-Latin1.patch | 11 ----------- ghc-JuicyPixels.spec | 13 +++++++------ sources | 2 +- 4 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 JuicyPixels-3.2.9.3-Progressive-Latin1.patch diff --git a/.gitignore b/.gitignore index cfc3f45..c6de1b5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /JuicyPixels-3.2.7.1.tar.gz /JuicyPixels-3.2.8.tar.gz /JuicyPixels-3.2.9.3.tar.gz +/JuicyPixels-3.2.9.5.tar.gz diff --git a/JuicyPixels-3.2.9.3-Progressive-Latin1.patch b/JuicyPixels-3.2.9.3-Progressive-Latin1.patch deleted file mode 100644 index 6146501..0000000 --- a/JuicyPixels-3.2.9.3-Progressive-Latin1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- JuicyPixels-3.2.9.3/src/Codec/Picture/Jpg/Progressive.hs~ 2018-01-01 18:46:06.000000000 +0100 -+++ JuicyPixels-3.2.9.3/src/Codec/Picture/Jpg/Progressive.hs 2018-01-27 19:26:56.780022170 +0100 -@@ -40,7 +40,7 @@ - - -- if the displayed MCU block is only displayed in half (like with - -- width 500 then we loose one macroblock of the MCU at the end of -- -- the line. Previous implementation which naïvely used full mcu -+ -- the line. Previous implementation which naively used full mcu - -- was wrong. Only taking into account visible macroblocks - indexSolo = [base + x - | y <- [0 .. compH - 1] diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 5f0acd8..059de62 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -1,18 +1,17 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name JuicyPixels %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.2.9.3 -Release: 3%{?dist} +Version: 3.2.9.5 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Patch0: JuicyPixels-3.2.9.3-Progressive-Latin1.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -51,7 +50,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} sed -i 's/\r$//' LICENSE -%patch0 -p1 -b .orig %build @@ -75,10 +73,13 @@ sed -i 's/\r$//' LICENSE %files devel -f %{name}-devel.files -%doc README.md docimages/* +%doc README.md changelog %changelog +* Sun Jul 22 2018 Jens Petersen - 3.2.9.5-1 +- update to 3.2.9.5 + * Fri Jul 13 2018 Fedora Release Engineering - 3.2.9.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index e17771a..81cbd6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JuicyPixels-3.2.9.3.tar.gz) = d2921866b8082e3dc26908cece3cd8b318f7f201ea8a77373eaa433c87a906ded85c692768c95c58cf1496c4a95f9f1dd86a62afd6a1535245aeb8f203423a14 +SHA512 (JuicyPixels-3.2.9.5.tar.gz) = 7ee32404d6f99f335eb159f79e6f5fab070911bdf18d34d647721d234407615c68cc43d5f6e44b076a89989bf44428b4ccd36fc9b876da94feda6f957376f90e From 7f13258737e1a9bd50a2920776be1a4bf05b0710 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:05:23 +0000 Subject: [PATCH 23/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 059de62..99678b1 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.2.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Picture loading and serialization License: BSD @@ -77,6 +77,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.2.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jul 22 2018 Jens Petersen - 3.2.9.5-1 - update to 3.2.9.5 From 8605621f1728fb4b4e8ad783222b454dbaa26fbf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:43:12 +0800 Subject: [PATCH 24/47] refresh to cabal-rpm-0.13 --- ghc-JuicyPixels.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 99678b1..f39b138 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.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 JuicyPixels @@ -6,16 +6,18 @@ Name: ghc-%{pkg_name} Version: 3.2.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Picture loading and serialization 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 @@ -48,16 +50,22 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup sed -i 's/\r$//' LICENSE %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %post devel @@ -69,7 +77,9 @@ sed -i 's/\r$//' LICENSE %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -77,6 +87,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Sun Feb 17 2019 Jens Petersen - 3.2.9.5-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 3.2.9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d67010806960b7150b09cf327d7a9b7ddb176293 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 2 Mar 2019 22:20:59 +0800 Subject: [PATCH 25/47] fix build on s390x (unregisterized) with -O0 --- ghc-JuicyPixels.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index f39b138..d52e202 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -57,6 +57,10 @@ sed -i 's/\r$//' LICENSE %build +# https://ghc.haskell.org/trac/ghc/ticket/16379 +%ifarch s390x +cabal_configure_extra_options='--ghc-option="-O0"' +%endif # Begin cabal-rpm build: %ghc_lib_build # End cabal-rpm build From ac3a4da15ad9e5a5dd0997f0c785e9446e8928a7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 2 Mar 2019 22:47:55 +0800 Subject: [PATCH 26/47] fix quoting of -O0 --- ghc-JuicyPixels.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index d52e202..8843dbc 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -59,7 +59,7 @@ sed -i 's/\r$//' LICENSE %build # https://ghc.haskell.org/trac/ghc/ticket/16379 %ifarch s390x -cabal_configure_extra_options='--ghc-option="-O0"' +cabal_configure_extra_options="--ghc-option=-O0" %endif # Begin cabal-rpm build: %ghc_lib_build From 786135d3a55b87546d3a748321a1f37d70a66cd4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 4 Mar 2019 13:47:37 +0800 Subject: [PATCH 27/47] update upstream unregisterized ghc bug url --- ghc-JuicyPixels.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 8843dbc..d0982a4 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -57,7 +57,7 @@ sed -i 's/\r$//' LICENSE %build -# https://ghc.haskell.org/trac/ghc/ticket/16379 +# https://ghc.haskell.org/trac/ghc/ticket/15853 %ifarch s390x cabal_configure_extra_options="--ghc-option=-O0" %endif From 182efae568386ec7f9da308dd67c6b1d56428a42 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 4 Mar 2019 21:45:37 +0800 Subject: [PATCH 28/47] rebuild without -O0 for s390x --- ghc-JuicyPixels.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index d0982a4..71848c7 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.2.9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Picture loading and serialization License: BSD @@ -57,10 +57,6 @@ sed -i 's/\r$//' LICENSE %build -# https://ghc.haskell.org/trac/ghc/ticket/15853 -%ifarch s390x -cabal_configure_extra_options="--ghc-option=-O0" -%endif # Begin cabal-rpm build: %ghc_lib_build # End cabal-rpm build @@ -91,6 +87,9 @@ cabal_configure_extra_options="--ghc-option=-O0" %changelog +* Mon Mar 4 2019 Jens Petersen - 3.2.9.5-4 +- rebuild without -O0 for s390x + * Sun Feb 17 2019 Jens Petersen - 3.2.9.5-3 - refresh to cabal-rpm-0.13 From 0805d1c75e7e4a2589842022adb1cf51b2f24a3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:00:49 +0000 Subject: [PATCH 29/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 71848c7..7615aff 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.2.9.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Picture loading and serialization License: BSD @@ -87,6 +87,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 3.2.9.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Mar 4 2019 Jens Petersen - 3.2.9.5-4 - rebuild without -O0 for s390x From 27648eb12f8268bd70eccb1ab70d5b43b7f4ba1e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:21:06 +0000 Subject: [PATCH 30/47] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-JuicyPixels.spec | 48 +++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 7615aff..8391738 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.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 JuicyPixels @@ -17,6 +17,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 @@ -37,11 +43,8 @@ Gif images. %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} @@ -49,6 +52,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 @@ sed -i 's/\r$//' LICENSE # End cabal-rpm install -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -86,6 +100,16 @@ sed -i 's/\r$//' LICENSE %doc README.md changelog +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 3.2.9.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b02956d7a56ff811a7f31e9e4efeef9701e21b42 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 15:04:35 +0000 Subject: [PATCH 31/47] update to 3.3.3.1 --- .gitignore | 1 + ghc-JuicyPixels.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c6de1b5..7cdaad6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /JuicyPixels-3.2.8.tar.gz /JuicyPixels-3.2.9.3.tar.gz /JuicyPixels-3.2.9.5.tar.gz +/JuicyPixels-3.3.3.1.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 8391738..2b8b84e 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.2.9.5 -Release: 5%{?dist} +Version: 3.3.3.1 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD @@ -111,6 +111,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Thu Jul 25 2019 Jens Petersen - 3.3.3.1-1 +- update to 3.3.3.1 + * Thu Jul 25 2019 Fedora Release Engineering - 3.2.9.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 81cbd6c..5edfe31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JuicyPixels-3.2.9.5.tar.gz) = 7ee32404d6f99f335eb159f79e6f5fab070911bdf18d34d647721d234407615c68cc43d5f6e44b076a89989bf44428b4ccd36fc9b876da94feda6f957376f90e +SHA512 (JuicyPixels-3.3.3.1.tar.gz) = cfa03f543bbdead2745fec95598feca5b67cc46f9f78f2182a8e732915780fdba9f4aa3ecae8eef67d5b74be769ac7c30b8ef871680059fd4d363f10ca1fbc56 From 68ced9fca41abc80509a348010b2858740cab320 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:27:04 +0800 Subject: [PATCH 32/47] BR prof for lib and static for executable --- ghc-JuicyPixels.spec | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 2b8b84e..475566b 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.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 JuicyPixels @@ -17,22 +17,17 @@ 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-mtl-devel -BuildRequires: ghc-primitive-devel -BuildRequires: ghc-transformers-devel -BuildRequires: ghc-vector-devel -BuildRequires: ghc-zlib-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-binary-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-primitive-prof +BuildRequires: ghc-transformers-prof +BuildRequires: ghc-vector-prof +BuildRequires: ghc-zlib-prof # End cabal-rpm deps %description @@ -43,6 +38,7 @@ Gif images. %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 2ed032c8772369fb4cfad22d0cba747de82a394a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:10:15 +0000 Subject: [PATCH 33/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 475566b..5778dd3 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Picture loading and serialization License: BSD @@ -107,6 +107,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 3.3.3.1-1 - update to 3.3.3.1 From 6ebd4c7fa0e37cee45e1fa7b4ab5852fa4d76ce5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:48:39 +0800 Subject: [PATCH 34/47] refresh to cabal-rpm-2.0.2 --- ghc-JuicyPixels.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 5778dd3..8809316 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.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 JuicyPixels @@ -51,6 +51,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. @@ -61,6 +62,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 @@ sed -i 's/\r$//' LICENSE # 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 @@ -98,6 +110,7 @@ sed -i 's/\r$//' LICENSE %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From d55cb9d83e95fe97c4c0df24d6c27e15112cabf6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 9 Feb 2020 21:45:53 +0800 Subject: [PATCH 35/47] update to 3.3.4 --- .gitignore | 1 + ghc-JuicyPixels.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7cdaad6..20fb1be 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /JuicyPixels-3.2.9.3.tar.gz /JuicyPixels-3.2.9.5.tar.gz /JuicyPixels-3.3.3.1.tar.gz +/JuicyPixels-3.3.4.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 8809316..d852136 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.3.3.1 -Release: 2%{?dist} +Version: 3.3.4 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD @@ -120,6 +120,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Sun Feb 09 2020 Jens Petersen - 3.3.4-1 +- update to 3.3.4 + * Tue Jan 28 2020 Fedora Release Engineering - 3.3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 5edfe31..edb2f61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JuicyPixels-3.3.3.1.tar.gz) = cfa03f543bbdead2745fec95598feca5b67cc46f9f78f2182a8e732915780fdba9f4aa3ecae8eef67d5b74be769ac7c30b8ef871680059fd4d363f10ca1fbc56 +SHA512 (JuicyPixels-3.3.4.tar.gz) = 26ceaa7b9d97507b8a46f22203b7abc9e6d1abdd61659710b8aa822690089e11bcdcd9369557225e52eac3ddc71c31c137e5acd701f3d41b20a4c5c3310eb812 From c86308e78c1aa02f7bfc2a1614180ffa0b1d1773 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:24:56 +0800 Subject: [PATCH 36/47] refresh to cabal-rpm-2.0.5 --- ghc-JuicyPixels.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index d852136..c41a7d0 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.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 JuicyPixels %global pkgver %{pkg_name}-%{version} From 5e54870b67d430151c504c5d3f0a2c1bd8b50098 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jun 2020 00:05:35 +0800 Subject: [PATCH 37/47] update to 3.3.5 --- .gitignore | 1 + ghc-JuicyPixels.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 20fb1be..4d62476 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /JuicyPixels-3.2.9.5.tar.gz /JuicyPixels-3.3.3.1.tar.gz /JuicyPixels-3.3.4.tar.gz +/JuicyPixels-3.3.5.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index c41a7d0..d5ecc64 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -5,7 +5,7 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.3.4 +Version: 3.3.5 Release: 1%{?dist} Summary: Picture loading and serialization @@ -120,6 +120,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Sun Jun 07 2020 Jens Petersen - 3.3.5-1 +- update to 3.3.5 + * Sun Feb 09 2020 Jens Petersen - 3.3.4-1 - update to 3.3.4 diff --git a/sources b/sources index edb2f61..e37f0cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JuicyPixels-3.3.4.tar.gz) = 26ceaa7b9d97507b8a46f22203b7abc9e6d1abdd61659710b8aa822690089e11bcdcd9369557225e52eac3ddc71c31c137e5acd701f3d41b20a4c5c3310eb812 +SHA512 (JuicyPixels-3.3.5.tar.gz) = 40ce63d01fb4dea77caeb055cf2f9f16b32252c7c5ea501b93c9020e426da9ea019b6e618da373fa41bae93789b76561f2b091bfe9340ee9c75f4d8fe29f90ed From ddfc585a795558ce9b14f80b7abc2d935ac311c1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:53:33 +0800 Subject: [PATCH 38/47] refresh to cabal-rpm-2.0.6 --- ghc-JuicyPixels.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index d5ecc64..a229669 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.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 JuicyPixels @@ -88,16 +88,6 @@ sed -i 's/\r$//' LICENSE # 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 524acf0d726be25b8b4876b9fbce3e80793e6dca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:42:57 +0000 Subject: [PATCH 39/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index a229669..59d0f67 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Picture loading and serialization License: BSD @@ -110,6 +110,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 07 2020 Jens Petersen - 3.3.5-1 - update to 3.3.5 From ce2437d92dfc83a8c41c8cb6c07652e1cf09877f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:12:21 +0000 Subject: [PATCH 40/47] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 59d0f67..b0e997d 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Picture loading and serialization License: BSD @@ -110,6 +110,10 @@ sed -i 's/\r$//' LICENSE %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.3.5-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 3.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From aa5f61250010c432a4ef461386729d59086e10d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:46:51 +0000 Subject: [PATCH 41/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index b0e997d..2974c74 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Picture loading and serialization License: BSD @@ -110,6 +110,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 3.3.5-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7293b543e5496073a8bf49331e2831bf82a3ea31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:13:14 +0000 Subject: [PATCH 42/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 2974c74..a61f625 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Picture loading and serialization License: BSD @@ -110,6 +110,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 3.3.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7132091519d9a8ea49cb8cb25dba24b774967747 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:09 +0800 Subject: [PATCH 43/47] refresh to cabal-rpm-2.0.9 --- ghc-JuicyPixels.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index a61f625..28a39c9 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.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 JuicyPixels @@ -52,6 +52,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 9eabb04a25d04fe1d351cca27fc498193a84fb0a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Aug 2021 10:16:51 +0800 Subject: [PATCH 44/47] bump release --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 28a39c9..bda1147 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.3.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Picture loading and serialization License: BSD @@ -111,6 +111,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Fri Aug 06 2021 Jens Petersen - 3.3.5-6 +- rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 3.3.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 87442e1513161baa2d0359ff625319e169a36041 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:25:21 +0000 Subject: [PATCH 45/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-JuicyPixels.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index bda1147..cdedfc5 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 3.3.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Picture loading and serialization License: BSD @@ -111,6 +111,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.3.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 06 2021 Jens Petersen - 3.3.5-6 - rebuild From d1aa087faff83ec997555bd6e77e3f06979b03ea Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 10:11:11 +0800 Subject: [PATCH 46/47] update to 3.3.7 --- .gitignore | 1 + ghc-JuicyPixels.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4d62476..9cae346 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /JuicyPixels-3.3.3.1.tar.gz /JuicyPixels-3.3.4.tar.gz /JuicyPixels-3.3.5.tar.gz +/JuicyPixels-3.3.7.tar.gz diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index cdedfc5..c2a5cfa 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.3.5 -Release: 7%{?dist} +Version: 3.3.7 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD @@ -111,6 +111,9 @@ sed -i 's/\r$//' LICENSE %changelog +* Tue Jun 07 2022 Jens Petersen - 3.3.7-1 +- https://hackage.haskell.org/package/JuicyPixels-3.3.7/changelog + * Thu Jan 20 2022 Fedora Release Engineering - 3.3.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index e37f0cf..98a5e4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JuicyPixels-3.3.5.tar.gz) = 40ce63d01fb4dea77caeb055cf2f9f16b32252c7c5ea501b93c9020e426da9ea019b6e618da373fa41bae93789b76561f2b091bfe9340ee9c75f4d8fe29f90ed +SHA512 (JuicyPixels-3.3.7.tar.gz) = adb3ccae12524ddb6f2736d65d14d997e1d672960b2fcc02739742fe18d748497324c9aeecb0b0b5e7662b218c5db55b2e8f5639e6438e0b8a45960c9c0e7da1 From aae51703cad11ca30e62b3c9b5bb888974524893 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:15:46 +0300 Subject: [PATCH 47/47] 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 98a5e4c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (JuicyPixels-3.3.7.tar.gz) = adb3ccae12524ddb6f2736d65d14d997e1d672960b2fcc02739742fe18d748497324c9aeecb0b0b5e7662b218c5db55b2e8f5639e6438e0b8a45960c9c0e7da1