From 78d088a37c33816ffd7f9a4ebd5e9a21e72942a13497ac9e249ee383c44979fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:02:53 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-JuicyPixels revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-JuicyPixels?expand=0&rev=86 --- JuicyPixels-3.3.4.tar.gz | 3 +++ JuicyPixels-3.3.5.tar.gz | 3 --- ghc-JuicyPixels.changes | 24 ------------------------ ghc-JuicyPixels.spec | 6 +++--- 4 files changed, 6 insertions(+), 30 deletions(-) create mode 100644 JuicyPixels-3.3.4.tar.gz delete mode 100644 JuicyPixels-3.3.5.tar.gz diff --git a/JuicyPixels-3.3.4.tar.gz b/JuicyPixels-3.3.4.tar.gz new file mode 100644 index 0000000..26a89e0 --- /dev/null +++ b/JuicyPixels-3.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde000c8802efff8e872d38f7da916ea86d130ba621266dc90d3332cbecd4c61 +size 131407 diff --git a/JuicyPixels-3.3.5.tar.gz b/JuicyPixels-3.3.5.tar.gz deleted file mode 100644 index 41cc837..0000000 --- a/JuicyPixels-3.3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eca5144499ec7148943e687be1d14354024a51447dd2b0470e6c64539c97447a -size 131914 diff --git a/ghc-JuicyPixels.changes b/ghc-JuicyPixels.changes index 17dd737..38075b5 100644 --- a/ghc-JuicyPixels.changes +++ b/ghc-JuicyPixels.changes @@ -1,27 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:43:49 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:13:37 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Wed May 6 06:52:10 UTC 2020 - psimons@suse.com - -- Update JuicyPixels to version 3.3.5. - v3.3.5 January 2020 - ------------------- - - Maintenance release to push various pull requests onto - hackage - - * Exporting Pixel32 (will) - * Palettization of transparent frames in Gif (flutterlice) - * Documentation fixes (lehins) - ------------------------------------------------------------------- Fri Nov 8 16:14:06 UTC 2019 - Peter Simons diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index cd084f0..320f9b4 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-JuicyPixels # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global pkg_name JuicyPixels Name: ghc-%{pkg_name} -Version: 3.3.5 +Version: 3.3.4 Release: 0 Summary: Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance) License: BSD-3-Clause @@ -51,7 +51,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build From 6def4e64f0b7ad9da594fe35f2da7ba47121490bb5fa97e87cb164af217818f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:09:53 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-JuicyPixels revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-JuicyPixels?expand=0&rev=88 --- JuicyPixels-3.3.4.tar.gz | 3 --- JuicyPixels-3.3.5.tar.gz | 3 +++ ghc-JuicyPixels.changes | 24 ++++++++++++++++++++++++ ghc-JuicyPixels.spec | 6 +++--- 4 files changed, 30 insertions(+), 6 deletions(-) delete mode 100644 JuicyPixels-3.3.4.tar.gz create mode 100644 JuicyPixels-3.3.5.tar.gz diff --git a/JuicyPixels-3.3.4.tar.gz b/JuicyPixels-3.3.4.tar.gz deleted file mode 100644 index 26a89e0..0000000 --- a/JuicyPixels-3.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dde000c8802efff8e872d38f7da916ea86d130ba621266dc90d3332cbecd4c61 -size 131407 diff --git a/JuicyPixels-3.3.5.tar.gz b/JuicyPixels-3.3.5.tar.gz new file mode 100644 index 0000000..41cc837 --- /dev/null +++ b/JuicyPixels-3.3.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eca5144499ec7148943e687be1d14354024a51447dd2b0470e6c64539c97447a +size 131914 diff --git a/ghc-JuicyPixels.changes b/ghc-JuicyPixels.changes index 38075b5..17dd737 100644 --- a/ghc-JuicyPixels.changes +++ b/ghc-JuicyPixels.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Aug 18 10:43:49 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:13:37 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Wed May 6 06:52:10 UTC 2020 - psimons@suse.com + +- Update JuicyPixels to version 3.3.5. + v3.3.5 January 2020 + ------------------- + + Maintenance release to push various pull requests onto + hackage + + * Exporting Pixel32 (will) + * Palettization of transparent frames in Gif (flutterlice) + * Documentation fixes (lehins) + ------------------------------------------------------------------- Fri Nov 8 16:14:06 UTC 2019 - Peter Simons diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 320f9b4..cd084f0 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-JuicyPixels # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global pkg_name JuicyPixels Name: ghc-%{pkg_name} -Version: 3.3.4 +Version: 3.3.5 Release: 0 Summary: Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance) License: BSD-3-Clause @@ -51,7 +51,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build From c5c3fc5d6eaf402cc4eb6bcaa5998fa446c7c03a57c15b83326ad7fcfe75c9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:30 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-JuicyPixels revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-JuicyPixels?expand=0&rev=89 --- ghc-JuicyPixels.changes | 5 +++++ ghc-JuicyPixels.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-JuicyPixels.changes b/ghc-JuicyPixels.changes index 17dd737..acdb011 100644 --- a/ghc-JuicyPixels.changes +++ b/ghc-JuicyPixels.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Aug 18 10:43:49 UTC 2020 - Peter Simons diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index cd084f0..fd900ea 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -35,6 +35,12 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel BuildRequires: ghc-vector-devel BuildRequires: ghc-zlib-devel +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %description This library can load and store images in PNG,Bitmap, Jpeg, Radiance, Tiff and From c83a5ebd91d6367e8fd7f4d16bc6b0c0f94ac87283387154e24dbd8d363c4b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:28 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-JuicyPixels revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-JuicyPixels?expand=0&rev=90 --- ghc-JuicyPixels.changes | 2 +- ghc-JuicyPixels.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-JuicyPixels.changes b/ghc-JuicyPixels.changes index acdb011..2363479 100644 --- a/ghc-JuicyPixels.changes +++ b/ghc-JuicyPixels.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Tue Aug 18 10:43:49 UTC 2020 - Peter Simons diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index fd900ea..5bec9f5 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -35,12 +35,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel BuildRequires: ghc-vector-devel BuildRequires: ghc-zlib-devel -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %description This library can load and store images in PNG,Bitmap, Jpeg, Radiance, Tiff and From 5e23a68139fafd51cb398ad8682f74ac240572820269459cab506bc9f5917eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:27:51 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-JuicyPixels revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-JuicyPixels?expand=0&rev=91 --- ghc-JuicyPixels.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-JuicyPixels.changes b/ghc-JuicyPixels.changes index 2363479..b9005a8 100644 --- a/ghc-JuicyPixels.changes +++ b/ghc-JuicyPixels.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build