From c458d513801d7805cef07ae64c9986af5b532834 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Oct 2010 20:29:51 +0000 Subject: [PATCH 01/59] 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 26f2fc224c4c7471fd13d24ed6d2bdb34b718251 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 3 Oct 2010 16:44:45 -0400 Subject: [PATCH 02/59] Initial package --- .gitignore | 1 + ghc-colour.spec | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 71 insertions(+) create mode 100644 ghc-colour.spec diff --git a/.gitignore b/.gitignore index e69de29..79c1b47 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/colour-2.3.1.tar.gz diff --git a/ghc-colour.spec b/ghc-colour.spec new file mode 100644 index 0000000..d2563fa --- /dev/null +++ b/ghc-colour.spec @@ -0,0 +1,69 @@ +%global pkg_name colour + +%global common_summary A model for human colour/color perception + +%global common_description This package provides a data type for colours and \ +transparency. Colours can be blended and composed. Various \ +colour spaces are supported. A module of colour names \ +("Data.Colour.Names") is provided. + +%bcond_without shared +%bcond_without hscolour + +# debuginfo is not useful for ghc +%global debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 2.3.1 +Release: 1%{?dist} +Summary: %{common_summary} + +Group: System Environment/Libraries +License: MIT +URL: http://hackage.haskell.org/package/%{pkg_name} +Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.8.1 +%if %{with hscolour} +BuildRequires: hscolour +%endif +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} + +%description +%{common_description} +%if %{with shared} +This package provides the shared library. +%endif + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +rm -rf %{buildroot} +%ghc_lib_install +echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files + + +%clean +rm -rf %{buildroot} + + +%{?ghc_lib_package} + + +%changelog +* Sat Sep 04 2010 Ben Boeckel - 2.3.1-1 +- Initial package + +* Sat Sep 4 2010 Fedora Haskell SIG - 2.3.1-0 +- initial packaging for Fedora automatically generated by cabal2spec-0.22.2 diff --git a/sources b/sources index e69de29..e48a9da 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +5edced36d4c27393ae1ce1389eeb25ad colour-2.3.1.tar.gz From 6a7d3753879285bf9bf49aebe9e8604801800bfa Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 7 Nov 2010 12:12:32 -0500 Subject: [PATCH 03/59] Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index d2563fa..1900fef 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -15,7 +15,7 @@ colour spaces are supported. A module of colour names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -62,6 +62,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 07 2010 Ben Boeckel - 2.3.1-2 +- Rebuild + * Sat Sep 04 2010 Ben Boeckel - 2.3.1-1 - Initial package From 8a26e62efa4932adbf268ce5ac99b35ffaeb1d46 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 28 Nov 2010 11:51:43 -0500 Subject: [PATCH 04/59] Rebuild for GHC7 --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 1900fef..5f1493f 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -15,7 +15,7 @@ colour spaces are supported. A module of colour names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -62,6 +62,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 28 2010 Ben Boeckel - 2.3.1-3 +- Rebuild for GHC7 + * Sun Nov 07 2010 Ben Boeckel - 2.3.1-2 - Rebuild From b3dbe5a39f2a952d5971c6d362571d8149d7c983 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 15 Jan 2011 12:41:01 -0500 Subject: [PATCH 05/59] - Update to cabal2spec-0.22.4 - Rebuild --- ghc-colour.spec | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 5f1493f..4e7cc7b 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -7,15 +7,12 @@ transparency. Colours can be blended and composed. Various \ colour spaces are supported. A module of colour names \ ("Data.Colour.Names") is provided. -%bcond_without shared -%bcond_without hscolour - # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -26,12 +23,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.8.1 -%if %{with hscolour} +BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour -%endif %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} -%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description %{common_description} @@ -49,19 +43,18 @@ This package provides the shared library. %install -rm -rf %{buildroot} %ghc_lib_install echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files -%clean -rm -rf %{buildroot} - - %{?ghc_lib_package} %changelog +* Sat Jan 15 2011 Ben Boeckel - 2.3.1-4 +- Update to cabal2spec-0.22.4 +- Rebuild + * Sun Nov 28 2010 Ben Boeckel - 2.3.1-3 - Rebuild for GHC7 From f1882e44c56d8961ce4a4a8eb526372882488424 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 15 Jan 2011 12:45:06 -0500 Subject: [PATCH 06/59] Remove buildroot tag --- ghc-colour.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 4e7cc7b..3893954 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -19,7 +19,6 @@ Group: System Environment/Libraries License: MIT URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof From a35b643e392701ebb19f16db219f41713429b1e6 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 15 Jan 2011 12:53:34 -0500 Subject: [PATCH 07/59] Remove unused BR line --- ghc-colour.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 3893954..acbc656 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -24,7 +24,6 @@ ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description %{common_description} From 3e83de85d4198c4db4e7f9c33c4e0b04cb83cbec Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 19:05:39 -0600 Subject: [PATCH 08/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index acbc656..b41ae85 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -12,7 +12,7 @@ colour spaces are supported. A module of colour names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -49,6 +49,9 @@ echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jan 15 2011 Ben Boeckel - 2.3.1-4 - Update to cabal2spec-0.22.4 - Rebuild From e8b4218634565b54e02567a06d5c5bdcb953f68a Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 10 Mar 2011 09:15:38 +0100 Subject: [PATCH 09/59] Enable build on sparcv9 Signed-off-by: Fabio M. Di Nitto --- ghc-colour.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index b41ae85..ca74540 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -12,7 +12,7 @@ colour spaces are supported. A module of colour names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -20,7 +20,7 @@ License: MIT URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour @@ -49,6 +49,9 @@ echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files %changelog +* Thu Mar 10 2011 Fabio M. Di Nitto - 2.3.1-6 +- Enable build on sparcv9 + * Tue Feb 08 2011 Fedora Release Engineering - 2.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 30da420cecf87c17f090de33f26f0c4b954e8a52 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 10 May 2011 22:56:52 -0400 Subject: [PATCH 10/59] Update to cabal2spec-0.22.6 --- ghc-colour.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index ca74540..d329e94 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -1,18 +1,19 @@ +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name colour -%global common_summary A model for human colour/color perception +%global common_summary A model for human color perception -%global common_description This package provides a data type for colours and \ -transparency. Colours can be blended and composed. Various \ -colour spaces are supported. A module of colour names \ +%global common_description This package provides a data type for colors and \ +transparency. Colors can be blended and composed. Various \ +color spaces are supported. A module of color names \ ("Data.Colour.Names") is provided. -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -20,16 +21,14 @@ License: MIT URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 BuildRequires: ghc, ghc-doc, ghc-prof +# macros for building haskell packages BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif %prep @@ -45,10 +44,15 @@ This package provides the shared library. echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files -%{?ghc_lib_package} +# define the devel and prof subpkgs, devel post[un] scripts, and filelists: +# ghc-%pkg_name{,devel,prof}.files +%ghc_lib_package %changelog +* Tue May 10 2011 Ben Boeckel - 2.3.1-7 +- Update to cabal2spec-0.22.6 + * Thu Mar 10 2011 Fabio M. Di Nitto - 2.3.1-6 - Enable build on sparcv9 From 600ab73e4c5f0ff4579d0369b3774cefa74d88b1 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 11 May 2011 21:23:14 -0400 Subject: [PATCH 11/59] Update to cabal2spec-0.22.7 --- ghc-colour.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index d329e94..582307a 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,7 +13,7 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -45,11 +45,14 @@ echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files # define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%pkg_name{,devel,prof}.files +# ghc-%%pkg_name{,devel,prof}.files %ghc_lib_package %changelog +* Wed May 11 2011 Ben Boeckel - 2.3.1-8 +- Update to cabal2spec-0.22.7 + * Tue May 10 2011 Ben Boeckel - 2.3.1-7 - Update to cabal2spec-0.22.6 From 9e5d9a41469708806609310da0b08e7c226dd71b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Jun 2011 19:01:57 +0900 Subject: [PATCH 12/59] use BR ghc-Cabal-devel and ghc_arches (cabal2spec-0.23.2) --- ghc-colour.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 582307a..17ba287 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,19 +13,18 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: MIT URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 -BuildRequires: ghc, ghc-doc, ghc-prof -# macros for building haskell packages -BuildRequires: ghc-rpm-macros >= 0.7.3 +ExclusiveArch: %{ghc_arches} +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros BuildRequires: hscolour +BuildRequires: ghc-base-prof %description %{common_description} @@ -50,6 +49,9 @@ echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files %changelog +* Fri Jun 24 2011 Jens Petersen - 2.3.1-9 +- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2) + * Wed May 11 2011 Ben Boeckel - 2.3.1-8 - Update to cabal2spec-0.22.7 From 2fe67357b11d89a97276a72de54307ab9579c04d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 9 Jul 2011 01:12:41 -0400 Subject: [PATCH 13/59] Update to cabal2spec-0.24 --- ghc-colour.spec | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 17ba287..c0b864d 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,23 +13,39 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: MIT +# BEGIN: cabal2spec-0.24 URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour -BuildRequires: ghc-base-prof +# END: cabal2spec-0.24 %description %{common_description} +%package -n ghc-%{pkg_name}-devel +Summary: Development files for %{common_summary} +Group: Development/Libraries +# BEGIN: cabal2spec-0.24 +%{?ghc_devel_requires} +Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} +Provides: ghc-%{pkg_name}-prof = %{version}-%{release} +# END: cabal2spec-0.24 + +%description -n ghc-%{pkg_name}-devel +%{common_description} + +This package contains the development files. + + %prep %setup -q -n %{pkg_name}-%{version} @@ -40,15 +56,29 @@ BuildRequires: ghc-base-prof %install %ghc_lib_install -echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files -# define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%%pkg_name{,devel,prof}.files -%ghc_lib_package +%post -n ghc-%{pkg_name}-devel +%ghc_pkg_recache + +%postun -n ghc-%{pkg_name}-devel +%ghc_pkg_recache + + +%if %{undefined ghc_without_shared} +%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files +%defattr(-,root,root,-) +%{_datadir}/%{pkg_name}-%{version}/ +%endif + +%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files +%defattr(-,root,root,-) %changelog +* Sat Jul 09 2011 Ben Boeckel - 2.3.1-10 +- Update to cabal2spec-0.24 + * Fri Jun 24 2011 Jens Petersen - 2.3.1-9 - BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2) From c5217d9be3accd7b5c1b4be66151fed9939016af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 11 Oct 2011 12:07:41 +0200 Subject: [PATCH 14/59] rebuild with new gmp --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index c0b864d..69a9530 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,7 +13,7 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 10%{?dist} +Release: 10%{?dist}.1 Summary: %{common_summary} Group: System Environment/Libraries @@ -76,6 +76,9 @@ This package contains the development files. %changelog +* Tue Oct 11 2011 Peter Schiffer - 2.3.1-10.1 +- rebuild with new gmp + * Sat Jul 09 2011 Ben Boeckel - 2.3.1-10 - Update to cabal2spec-0.24 From 4a2360fdca6fca5c4cc5992cdf0aee8c648436fe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 13 Oct 2011 12:44:37 +0900 Subject: [PATCH 15/59] move readme and changelog files into devel doc (#744635) --- ghc-colour.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 69a9530..8cfd43f 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,19 +13,22 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 10%{?dist}.1 +Release: 11%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: MIT -# BEGIN: cabal2spec-0.24 +# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +%if %{undefined without_hscolour} BuildRequires: hscolour -# END: cabal2spec-0.24 +%endif +# END cabal2spec +BuildRequires: ghc-base-prof %description %{common_description} @@ -34,11 +37,11 @@ BuildRequires: hscolour %package -n ghc-%{pkg_name}-devel Summary: Development files for %{common_summary} Group: Development/Libraries -# BEGIN: cabal2spec-0.24 +# BEGIN cabal2spec %{?ghc_devel_requires} Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END: cabal2spec-0.24 +# END cabal2spec %description -n ghc-%{pkg_name}-devel %{common_description} @@ -57,6 +60,8 @@ This package contains the development files. %install %ghc_lib_install +rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} + %post -n ghc-%{pkg_name}-devel %ghc_pkg_recache @@ -67,15 +72,17 @@ This package contains the development files. %if %{undefined ghc_without_shared} %files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files -%defattr(-,root,root,-) -%{_datadir}/%{pkg_name}-%{version}/ %endif %files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files -%defattr(-,root,root,-) +%doc README CHANGELOG %changelog +* Thu Oct 13 2011 Jens Petersen - 2.3.1-11 +- move readme and changelog files into devel doc (#744635) +- BR base library + * Tue Oct 11 2011 Peter Schiffer - 2.3.1-10.1 - rebuild with new gmp From 2cec5521df572db011b54e53c8bea5ccfce61d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 20 Oct 2011 22:01:25 +0200 Subject: [PATCH 16/59] rebuild with new gmp without compat lib --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 8cfd43f..e1d744a 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,7 +13,7 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 11%{?dist} +Release: 11%{?dist}.1 Summary: %{common_summary} Group: System Environment/Libraries @@ -79,6 +79,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Thu Oct 20 2011 Marcela Mašláňová - 2.3.1-11.1 +- rebuild with new gmp without compat lib + * Thu Oct 13 2011 Jens Petersen - 2.3.1-11 - move readme and changelog files into devel doc (#744635) - BR base library From e35048f501abd8bc66e72c535764ca022a3aa047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 24 Oct 2011 09:25:32 +0200 Subject: [PATCH 17/59] rebuild with new gmp without compat lib --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index e1d744a..261d964 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,7 +13,7 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.1 -Release: 11%{?dist}.1 +Release: 11%{?dist}.2 Summary: %{common_summary} Group: System Environment/Libraries @@ -79,6 +79,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Mon Oct 24 2011 Marcela Mašláňová - 2.3.1-11.2 +- rebuild with new gmp without compat lib + * Thu Oct 20 2011 Marcela Mašláňová - 2.3.1-11.1 - rebuild with new gmp without compat lib From 20aafce0f969d14f253b92efda037aa4d84e559a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Jan 2012 22:47:14 +0900 Subject: [PATCH 18/59] update to 2.3.2 and cabal2spec-0.25.2 --- .gitignore | 1 + ghc-colour.spec | 48 +++++++++++++++--------------------------------- sources | 2 +- 3 files changed, 17 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 79c1b47..e78d962 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /colour-2.3.1.tar.gz +/colour-2.3.2.tar.gz diff --git a/ghc-colour.spec b/ghc-colour.spec index 261d964..cb70564 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -1,6 +1,6 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell +# cabal2spec-0.25.2 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name colour @@ -12,8 +12,8 @@ color spaces are supported. A module of color names \ ("Data.Colour.Names") is provided. Name: ghc-%{pkg_name} -Version: 2.3.1 -Release: 11%{?dist}.2 +Version: 2.3.2 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -23,10 +23,7 @@ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -%if %{undefined without_hscolour} -BuildRequires: hscolour -%endif +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec BuildRequires: ghc-base-prof @@ -34,21 +31,6 @@ BuildRequires: ghc-base-prof %{common_description} -%package -n ghc-%{pkg_name}-devel -Summary: Development files for %{common_summary} -Group: Development/Libraries -# BEGIN cabal2spec -%{?ghc_devel_requires} -Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} -Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END cabal2spec - -%description -n ghc-%{pkg_name}-devel -%{common_description} - -This package contains the development files. - - %prep %setup -q -n %{pkg_name}-%{version} @@ -63,22 +45,22 @@ This package contains the development files. rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} -%post -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_package -%postun -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_description -%if %{undefined ghc_without_shared} -%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files -%endif +%ghc_devel_post_postun -%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files -%doc README CHANGELOG + +%ghc_files +%doc CHANGELOG README %changelog +* Wed Jan 4 2012 Jens Petersen - 2.3.2-1 +- update to 2.3.2 and cabal2spec-0.25.2 + * Mon Oct 24 2011 Marcela Mašláňová - 2.3.1-11.2 - rebuild with new gmp without compat lib diff --git a/sources b/sources index e48a9da..c117ea2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5edced36d4c27393ae1ce1389eeb25ad colour-2.3.1.tar.gz +2488e192e22c13073c4ac48cedb1e07c colour-2.3.2.tar.gz From 4b26cb0004bd00cad32f1c8c0a67a3828726178b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 20 Mar 2012 17:59:21 +0900 Subject: [PATCH 19/59] update to 2.3.3 --- .gitignore | 1 + ghc-colour.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e78d962..8a00e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /colour-2.3.1.tar.gz /colour-2.3.2.tar.gz +/colour-2.3.3.tar.gz diff --git a/ghc-colour.spec b/ghc-colour.spec index cb70564..a44408c 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -12,7 +12,7 @@ color spaces are supported. A module of color names \ ("Data.Colour.Names") is provided. Name: ghc-%{pkg_name} -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?dist} Summary: %{common_summary} @@ -53,11 +53,14 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %ghc_devel_post_postun -%ghc_files +%ghc_files LICENSE %doc CHANGELOG README %changelog +* Tue Mar 20 2012 Jens Petersen - 2.3.3-1 +- update to 2.3.3 + * Wed Jan 4 2012 Jens Petersen - 2.3.2-1 - update to 2.3.2 and cabal2spec-0.25.2 diff --git a/sources b/sources index c117ea2..084f0ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2488e192e22c13073c4ac48cedb1e07c colour-2.3.2.tar.gz +6bfdc3f932f581b58b7444381f469777 colour-2.3.3.tar.gz From 701045fdf2ed5c59e9a2f35e24e7c54066847cce Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2012 11:08:41 +0900 Subject: [PATCH 20/59] change prof BRs to devel --- ghc-colour.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index a44408c..a47bbca 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,7 +13,7 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -25,7 +25,7 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -BuildRequires: ghc-base-prof +BuildRequires: ghc-base-devel %description %{common_description} @@ -58,6 +58,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Mon Jul 16 2012 Jens Petersen - 2.3.3-2 +- change prof BRs to devel + * Tue Mar 20 2012 Jens Petersen - 2.3.3-1 - update to 2.3.3 From 5aa322c02b9fcaf70ae3de56c65a326efbc997c5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 00:29:43 -0500 Subject: [PATCH 21/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index a47bbca..6c301f7 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -13,7 +13,7 @@ color spaces are supported. A module of color names \ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -58,6 +58,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 2.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jul 16 2012 Jens Petersen - 2.3.3-2 - change prof BRs to devel From 4a3fa223102017dcef168b6a54de5f9a8cf7ec8c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 17 Nov 2012 22:01:38 +0900 Subject: [PATCH 22/59] update with cabal-rpm --- ghc-colour.spec | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 6c301f7..1b33ac5 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -1,4 +1,3 @@ -# cabal2spec-0.25.2 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell @@ -6,26 +5,23 @@ %global common_summary A model for human color perception -%global common_description This package provides a data type for colors and \ -transparency. Colors can be blended and composed. Various \ -color spaces are supported. A module of color names \ -("Data.Colour.Names") is provided. +%global common_description This package provides a data type for colors and transparency.\ +Colors can be blended and composed. Various color spaces are supported.\ +A module of color names ("Data.Colour.Names") is provided. Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} -Group: System Environment/Libraries License: MIT -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec -BuildRequires: ghc-base-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +# End cabal-rpm deps %description %{common_description} @@ -58,6 +54,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Sat Nov 17 2012 Jens Petersen - 2.3.3-4 +- update with cabal-rpm + * Thu Jul 19 2012 Fedora Release Engineering - 2.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 6675f714ff1bf78f83128476f67a41828bc89eed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 17:03:40 -0600 Subject: [PATCH 23/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 1b33ac5..b259945 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -11,7 +11,7 @@ A module of color names ("Data.Colour.Names") is provided. Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} License: MIT @@ -54,6 +54,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Nov 17 2012 Jens Petersen - 2.3.3-4 - update with cabal-rpm From 3ae8d2badd8681fa229db2c8b2ce7acace0b7023 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Jun 2013 12:48:26 +0900 Subject: [PATCH 24/59] update to new simplified Haskell Packaging Guidelines --- ghc-colour.spec | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index b259945..65b029d 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -1,18 +1,11 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name colour -%global common_summary A model for human color perception - -%global common_description This package provides a data type for colors and transparency.\ -Colors can be blended and composed. Various color spaces are supported.\ -A module of color names ("Data.Colour.Names") is provided. - Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 5%{?dist} -Summary: %{common_summary} +Release: 6%{?dist} +Summary: A model for human color perception License: MIT URL: http://hackage.haskell.org/package/%{pkg_name} @@ -20,11 +13,22 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versio BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: -# End cabal-rpm deps %description -%{common_description} +This package provides a data type for colors and transparency. +Colors can be blended and composed. Various color spaces are supported. +A module of color names ("Data.Colour.Names") is provided. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. %prep @@ -41,19 +45,26 @@ BuildRequires: ghc-rpm-macros rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} -%ghc_devel_package +%post devel +%ghc_pkg_recache -%ghc_devel_description +%postun devel +%ghc_pkg_recache -%ghc_devel_post_postun +%files -f %{name}.files +%doc LICENSE -%ghc_files LICENSE + +%files devel -f %{name}-devel.files %doc CHANGELOG README %changelog +* Fri Jun 07 2013 Jens Petersen - 2.3.3-6 +- update to new simplified Haskell Packaging Guidelines + * Wed Feb 13 2013 Fedora Release Engineering - 2.3.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 284c0dad6a3feae29c67b6958cb7b643a2f1e411 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 08:30:06 -0500 Subject: [PATCH 25/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 65b029d..2036da1 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A model for human color perception License: MIT @@ -62,6 +62,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jun 07 2013 Jens Petersen - 2.3.3-6 - update to new simplified Haskell Packaging Guidelines From 8be6fe1afbbddbb6c971eb28b6bb7bfc43595f4c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 09:38:35 -0500 Subject: [PATCH 26/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 2036da1..83b3e1b 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A model for human color perception License: MIT @@ -62,6 +62,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.3.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 2.3.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 218c472446a2faa3040afa0980e2d9c8f6596c9f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 14:51:30 +0000 Subject: [PATCH 27/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 83b3e1b..930fd3a 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A model for human color perception License: MIT @@ -62,6 +62,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 2.3.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.3.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 4b26801528ad9158311ad619afe3a1dfb76a1f09 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 3 Feb 2015 07:38:07 +0100 Subject: [PATCH 28/59] cblrpm refresh --- ghc-colour.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 930fd3a..7b19454 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -4,12 +4,12 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A model for human color perception License: MIT -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -22,10 +22,11 @@ A module of color names ("Data.Colour.Names") is provided. %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} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. @@ -62,6 +63,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Tue Feb 3 2015 Jens Petersen - 2.3.3-10 +- cblrpm refresh + * Sat Aug 16 2014 Fedora Release Engineering - 2.3.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From cca3bcbac8e97ab3d519886782f1ce76e1c9af0c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:35:42 +0000 Subject: [PATCH 29/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 7b19454..d48d182 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A model for human color perception License: MIT @@ -63,6 +63,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.3.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Feb 3 2015 Jens Petersen - 2.3.3-10 - cblrpm refresh From 09a8c9034d54a3ab997b712b87e7119be1ef5e1f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:28:14 +0000 Subject: [PATCH 30/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index d48d182..49dfd55 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A model for human color perception License: MIT @@ -63,6 +63,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.3.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 2.3.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From c88eafca8acc8cf71bc6b0c0f446c25306bbb420 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Sep 2016 18:32:22 +0900 Subject: [PATCH 31/59] use %license --- ghc-colour.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 49dfd55..d67d7c3 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -55,7 +55,7 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files From 129d426dd109fd5fc873ee688fae4ebdda6c3798 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:35:45 +0000 Subject: [PATCH 32/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index d67d7c3..3a26215 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A model for human color perception License: MIT @@ -63,6 +63,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.3.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 2.3.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 813043ef5669b45bfd351424e864a49075a95a6e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Feb 2017 17:48:10 +0900 Subject: [PATCH 33/59] refresh to cabal-rpm-0.11.1 --- ghc-colour.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 3a26215..700235e 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -1,15 +1,17 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name colour +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A model for human color perception License: MIT 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 @@ -33,7 +35,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} %build @@ -63,6 +65,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Fri Feb 24 2017 Jens Petersen - 2.3.3-14 +- refresh to cabal-rpm-0.11.1 + * Fri Feb 10 2017 Fedora Release Engineering - 2.3.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 993a7a890ae6af5efb2785edd57cc5e8fc16d7f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:37:52 +0000 Subject: [PATCH 34/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 700235e..084292f 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A model for human color perception License: MIT @@ -65,6 +65,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.3.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 24 2017 Jens Petersen - 2.3.3-14 - refresh to cabal-rpm-0.11.1 From 2799f24f204c0679b4c418e831c13a4fab0d78e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:15:53 +0000 Subject: [PATCH 35/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 084292f..1b92e3a 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 2.3.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A model for human color perception License: MIT @@ -65,6 +65,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.3.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.3.3-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 95e8f68651343454201e4d093f69038eb35d8049 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:47 +0100 Subject: [PATCH 36/59] refresh to cabal-rpm-0.12.1 --- ghc-colour.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 1b92e3a..dedea3c 100644 --- a/ghc-colour.spec +++ b/ghc-colour.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 colour @@ -25,9 +25,12 @@ A module of color names ("Data.Colour.Names") is provided. %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 @@ -48,6 +51,12 @@ This package provides the Haskell %{pkg_name} library development files. rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 6e6214809b4839014b895ef971f675a6e96d9a5e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:24:29 +0100 Subject: [PATCH 37/59] update to 2.3.4 --- .gitignore | 1 + ghc-colour.spec | 21 +++++++++++++++++++-- sources | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8a00e2c..c2b8c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /colour-2.3.1.tar.gz /colour-2.3.2.tar.gz /colour-2.3.3.tar.gz +/colour-2.3.4.tar.gz diff --git a/ghc-colour.spec b/ghc-colour.spec index dedea3c..aec8159 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -4,9 +4,11 @@ %global pkg_name colour %global pkgver %{pkg_name}-%{version} +%bcond_with tests + Name: ghc-%{pkg_name} -Version: 2.3.3 -Release: 16%{?dist} +Version: 2.3.4 +Release: 1%{?dist} Summary: A model for human color perception License: MIT @@ -15,6 +17,14 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-random-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif +# End cabal-rpm deps %description This package provides a data type for colors and transparency. @@ -51,6 +61,10 @@ This package provides the Haskell %{pkg_name} library development files. rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} +%check +%cabal_test + + %post -p /sbin/ldconfig @@ -74,6 +88,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Wed Jan 24 2018 Jens Petersen - 2.3.4-1 +- update to 2.3.4 + * Wed Aug 02 2017 Fedora Release Engineering - 2.3.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 084f0ec..776f57b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6bfdc3f932f581b58b7444381f469777 colour-2.3.3.tar.gz +SHA512 (colour-2.3.4.tar.gz) = c475ed5ced7bcf749facfacf609d2b89a04f496bd6a7301259aa14cbfe6e768d65495f09b046b80f448b27478323a52cc2414954934985259e6f115325d17f9a From deb6b79a596be20947663a81816fd635050b7268 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:02:10 +0900 Subject: [PATCH 38/59] drop ldconfig scriptlets --- ghc-colour.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index aec8159..a0b7470 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -65,12 +65,6 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 7ef8df08e0cd5a163e4b084e4331f47d0f5abe20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:26:23 +0000 Subject: [PATCH 39/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index a0b7470..e6c6e9f 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A model for human color perception License: MIT @@ -82,6 +82,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 2.3.4-1 - update to 2.3.4 From c8b848f873040777a6e963c85fd52dacc63fed98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:39:07 +0000 Subject: [PATCH 40/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index e6c6e9f..1d19f1b 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A model for human color perception License: MIT @@ -82,6 +82,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 84368149d10907e558717fbd2c3a1d089bb901b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:18:36 +0000 Subject: [PATCH 41/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 1d19f1b..06d4df9 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A model for human color perception License: MIT @@ -82,6 +82,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 2.3.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ccc4087750f6d7936b2d618b1fb8b188dab64a8b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:43:58 +0800 Subject: [PATCH 42/59] refresh to cabal-rpm-0.13 --- ghc-colour.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 06d4df9..3536267 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name colour @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 2.3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A model for human color perception License: MIT 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: %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-random-devel @@ -48,17 +50,23 @@ 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 -rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} +rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} +# End cabal-rpm install %check @@ -74,7 +82,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -82,6 +92,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG} %changelog +* Sun Feb 17 2019 Jens Petersen - 2.3.4-5 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 2.3.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 8ea44afeca2ccf5b63589ccd878303f912b1bb1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:14:54 +0000 Subject: [PATCH 43/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 3536267..05ba9c5 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A model for human color perception License: MIT @@ -92,6 +92,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 2.3.4-5 - refresh to cabal-rpm-0.13 From c17e1bd9f1e03564003eeaedf376dc29b593dad8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:22:12 +0000 Subject: [PATCH 44/59] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-colour.spec | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 05ba9c5..462e18f 100644 --- a/ghc-colour.spec +++ b/ghc-colour.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 colour @@ -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 %if %{with tests} BuildRequires: ghc-QuickCheck-devel @@ -37,11 +43,8 @@ A module of color names ("Data.Colour.Names") is provided. %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} @@ -73,14 +95,6 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -91,6 +105,16 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %doc CHANGELOG README +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 2.3.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f24cd7e19287083db0e395fa4b6e98ee6d87ec04 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 15:24:36 +0000 Subject: [PATCH 45/59] update to 2.3.5 --- .gitignore | 1 + ghc-colour.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c2b8c5d..95c0091 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /colour-2.3.2.tar.gz /colour-2.3.3.tar.gz /colour-2.3.4.tar.gz +/colour-2.3.5.tar.gz diff --git a/ghc-colour.spec b/ghc-colour.spec index 462e18f..d6fd4b5 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.3.4 -Release: 6%{?dist} +Version: 2.3.5 +Release: 1%{?dist} Summary: A model for human color perception License: MIT @@ -116,6 +116,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Thu Jul 25 2019 Jens Petersen - 2.3.5-1 +- update to 2.3.5 + * Thu Jul 25 2019 Fedora Release Engineering - 2.3.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 776f57b..e6af8bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (colour-2.3.4.tar.gz) = c475ed5ced7bcf749facfacf609d2b89a04f496bd6a7301259aa14cbfe6e768d65495f09b046b80f448b27478323a52cc2414954934985259e6f115325d17f9a +SHA512 (colour-2.3.5.tar.gz) = 2232f51b3cfdda1a64436e8395c2441e49db083982a0370d3ec38c304b0a6234666887b3abc886107a9b21c425d3253284cce0186c1a210a302a0a14808364d8 From 67f6f8f9c07873d0d206237a3c8e1158551acbd9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:28:10 +0800 Subject: [PATCH 46/59] BR prof for lib and static for executable --- ghc-colour.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index d6fd4b5..74f6875 100644 --- a/ghc-colour.spec +++ b/ghc-colour.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 colour @@ -19,13 +19,8 @@ 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-base-prof %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-random-devel @@ -43,6 +38,7 @@ A module of color names ("Data.Colour.Names") is provided. %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 577c92237606bf1600e90ee4770f32faa8b799c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:26:26 +0000 Subject: [PATCH 47/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 74f6875..6cd3fd2 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A model for human color perception License: MIT @@ -112,6 +112,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 2.3.5-1 - update to 2.3.5 From 4dc9c94fdf4303ac3acc7643a9fbca5c563cb227 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:49:27 +0800 Subject: [PATCH 48/59] refresh to cabal-rpm-2.0.2 --- ghc-colour.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 6cd3fd2..06453f7 100644 --- a/ghc-colour.spec +++ b/ghc-colour.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 colour %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 2.3.5 Release: 2%{?dist} @@ -21,12 +19,6 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-random-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-quickcheck2-devel -%endif # End cabal-rpm deps %description @@ -51,6 +43,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 +54,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. @@ -87,8 +81,14 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} # 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 @@ -103,6 +103,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 3c9413da9e691b4a64ed21a0b3dd4af4132c916e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:25:40 +0800 Subject: [PATCH 49/59] refresh to cabal-rpm-2.0.5 --- ghc-colour.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 06453f7..500394f 100644 --- a/ghc-colour.spec +++ b/ghc-colour.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 colour %global pkgver %{pkg_name}-%{version} From 5893056828b460952e0f29f6a950dea2e6c28c46 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:54:17 +0800 Subject: [PATCH 50/59] refresh to cabal-rpm-2.0.6 --- ghc-colour.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 500394f..ebd3970 100644 --- a/ghc-colour.spec +++ b/ghc-colour.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 colour %global pkgver %{pkg_name}-%{version} +# testsuite missing deps: test-framework test-framework-quickcheck2 + Name: ghc-%{pkg_name} Version: 2.3.5 Release: 2%{?dist} @@ -81,16 +83,6 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} # 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 b6385e26a76f3f19483f9e166b8e4e95a0496a01 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 17:59:06 +0800 Subject: [PATCH 51/59] bump release --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index ebd3970..af7f46c 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A model for human color perception License: MIT @@ -105,6 +105,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Fri Jul 17 2020 Jens Petersen - 2.3.5-3 +- refresh to cabal-rpm-2.0.6 + * Tue Jan 28 2020 Fedora Release Engineering - 2.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d44a648f674e9def1d2610578bf71b1c81a29215 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:56:01 +0000 Subject: [PATCH 52/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index af7f46c..30f6cf0 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A model for human color perception License: MIT @@ -105,6 +105,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 2.3.5-3 - refresh to cabal-rpm-2.0.6 From 6882c0e176b33f717e5ca4346ea46eb233213a23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:10:18 +0000 Subject: [PATCH 53/59] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 30f6cf0..e74a019 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A model for human color perception License: MIT @@ -105,6 +105,10 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.3.5-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.3.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b3b1c7277a2d843ee58976b2e90ba3e096019be9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:59:59 +0000 Subject: [PATCH 54/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index e74a019..95cbdc0 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A model for human color perception License: MIT @@ -105,6 +105,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 2.3.5-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 77025f786aa2e0b3e7b1c519f2c81ebc0e2e4ba3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:27:11 +0000 Subject: [PATCH 55/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 95cbdc0..14c61c3 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A model for human color perception License: MIT @@ -105,6 +105,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.3.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.3.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 610faf74ecef2354698b9b857d471209bd07504f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:10 +0800 Subject: [PATCH 56/59] refresh to cabal-rpm-2.0.9 --- ghc-colour.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 14c61c3..810ae90 100644 --- a/ghc-colour.spec +++ b/ghc-colour.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 colour @@ -46,6 +46,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 5655366f014b667bfa397bfbac0394f3835d4a3d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 01:44:22 +0800 Subject: [PATCH 57/59] update to 2.3.6 --- .gitignore | 1 + ghc-colour.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 95c0091..46dda0a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /colour-2.3.3.tar.gz /colour-2.3.4.tar.gz /colour-2.3.5.tar.gz +/colour-2.3.6.tar.gz diff --git a/ghc-colour.spec b/ghc-colour.spec index 810ae90..85e059a 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -7,8 +7,8 @@ # testsuite missing deps: test-framework test-framework-quickcheck2 Name: ghc-%{pkg_name} -Version: 2.3.5 -Release: 7%{?dist} +Version: 2.3.6 +Release: 1%{?dist} Summary: A model for human color perception License: MIT @@ -106,6 +106,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Thu Aug 5 2021 Jens Petersen - 2.3.6-1 +- update to 2.3.6 + * Thu Jul 22 2021 Fedora Release Engineering - 2.3.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index e6af8bf..dbfe51d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (colour-2.3.5.tar.gz) = 2232f51b3cfdda1a64436e8395c2441e49db083982a0370d3ec38c304b0a6234666887b3abc886107a9b21c425d3253284cce0186c1a210a302a0a14808364d8 +SHA512 (colour-2.3.6.tar.gz) = 82f7d92e46f7235706832be9d3a981bc09f729ef4e7f891dae85bf808f342e498aa152bc106f9c011ab0e79e5cc2d57067de596d774ad5010e9845df521ed275 From 467a39d90a604668cd1abbf5f5f7f835e88cb7fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:39:48 +0000 Subject: [PATCH 58/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-colour.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 85e059a..980b31d 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 2.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A model for human color perception License: MIT @@ -106,6 +106,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 2.3.6-1 - update to 2.3.6 From 6ab7d4f4375d957390047676e096ed2fbb873494 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:29:28 +0300 Subject: [PATCH 59/59] 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 dbfe51d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (colour-2.3.6.tar.gz) = 82f7d92e46f7235706832be9d3a981bc09f729ef4e7f891dae85bf808f342e498aa152bc106f9c011ab0e79e5cc2d57067de596d774ad5010e9845df521ed275