From 7998e439807803f3685063b8b59a8b6e2ce87f893e04cc2eea2078a63abd4388 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:19 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-file-embed revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-file-embed?expand=0&rev=46 --- file-embed-0.0.11.1.tar.gz | 3 ++ file-embed-0.0.13.0.tar.gz | 3 -- ghc-file-embed.changes | 71 +++++++++++++++++++++++++++++++++----- ghc-file-embed.spec | 6 ++-- 4 files changed, 68 insertions(+), 15 deletions(-) create mode 100644 file-embed-0.0.11.1.tar.gz delete mode 100644 file-embed-0.0.13.0.tar.gz diff --git a/file-embed-0.0.11.1.tar.gz b/file-embed-0.0.11.1.tar.gz new file mode 100644 index 0000000..be9b04b --- /dev/null +++ b/file-embed-0.0.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a113e7fe528be8204f40d3e9e00d595234e49def6caa133136e8254b659189d6 +size 6530 diff --git a/file-embed-0.0.13.0.tar.gz b/file-embed-0.0.13.0.tar.gz deleted file mode 100644 index 143384f..0000000 --- a/file-embed-0.0.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d13068abb0bd22c5d118164734a097dc591977b2c7561d912af9097803c6e1ea -size 6657 diff --git a/ghc-file-embed.changes b/ghc-file-embed.changes index fbf7851..4c35ec3 100644 --- a/ghc-file-embed.changes +++ b/ghc-file-embed.changes @@ -1,18 +1,71 @@ ------------------------------------------------------------------- -Tue Aug 18 10:44:51 UTC 2020 - Peter Simons +Fri Dec 20 03:02:06 UTC 2019 - psimons@suse.com -- Replace %setup -q with the more modern %autosetup macro. +- Update file-embed to version 0.0.11.1. + # ChangeLog for file-embed + + ## 0.0.11.1 + + * Support GHC 8.10 ------------------------------------------------------------------- -Tue Jul 7 02:00:28 UTC 2020 - psimons@suse.com +Fri Nov 8 16:13:44 UTC 2019 - Peter Simons -- Update file-embed to version 0.0.13.0. - ## 0.0.13.0 - - * Ensure that directory listings are returned in sorted order for reproducibility [yesodweb/yesod#1684](https://github.com/yesodweb/yesod/issues/1684) +- Drop obsolete group attributes. ------------------------------------------------------------------- -Tue Jun 9 09:26:17 UTC 2020 - psimons@suse.com +Sat Oct 20 11:31:30 UTC 2018 - Peter Simons -- Add file-embed at version 0.0.12.0. +- Use https URL to refer to bugs.opensuse.org. +------------------------------------------------------------------- +Tue Jul 31 14:10:04 UTC 2018 - psimons@suse.com + +- Update file-embed to version 0.0.11. + ## 0.0.11 + + * embedDirListing [#26](https://github.com/snoyberg/file-embed/pull/26) + +------------------------------------------------------------------- +Wed Jul 18 14:26:24 UTC 2018 - psimons@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +------------------------------------------------------------------- +Mon May 14 17:02:11 UTC 2018 - psimons@suse.com + +- Update file-embed to version 0.0.10.1. + * Minor doc improvements + +------------------------------------------------------------------- +Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +------------------------------------------------------------------- +Sun Jul 10 17:15:55 UTC 2016 - psimons@suse.com + +- Update to version 0.0.10 revision 0 with cabal2obs. + +------------------------------------------------------------------- +Tue Apr 26 08:25:43 UTC 2016 - mimi.vx@gmail.com + +- update to 0.0.10 +* makeRelativeToProject + +------------------------------------------------------------------- +Fri Jan 22 08:46:18 UTC 2016 - mimi.vx@gmail.com + +- update to 0.0.9.1 +* embedStringFile + +------------------------------------------------------------------- +Mon Nov 23 09:56:34 UTC 2015 - mimi.vx@gmail.com + +- correct licence to BSD-2-Clause + +------------------------------------------------------------------- +Tue Nov 17 19:28:15 UTC 2015 - mimi.vx@gmail.com + +- initial commit diff --git a/ghc-file-embed.spec b/ghc-file-embed.spec index 39c840c..2ef4fb5 100644 --- a/ghc-file-embed.spec +++ b/ghc-file-embed.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# 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 @@ -19,7 +19,7 @@ %global pkg_name file-embed %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.0.13.0 +Version: 0.0.11.1 Release: 0 Summary: Use Template Haskell to embed file contents directly License: BSD-2-Clause @@ -47,7 +47,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 7dc741218ef354b1f99b51968ea9d13c52dfee17ad0b5e2ac2842875a2201ec8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:30 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-file-embed revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-file-embed?expand=0&rev=47 --- file-embed-0.0.11.1.tar.gz | 3 -- file-embed-0.0.13.0.tar.gz | 3 ++ ghc-file-embed.changes | 71 +++++--------------------------------- ghc-file-embed.spec | 6 ++-- 4 files changed, 15 insertions(+), 68 deletions(-) delete mode 100644 file-embed-0.0.11.1.tar.gz create mode 100644 file-embed-0.0.13.0.tar.gz diff --git a/file-embed-0.0.11.1.tar.gz b/file-embed-0.0.11.1.tar.gz deleted file mode 100644 index be9b04b..0000000 --- a/file-embed-0.0.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a113e7fe528be8204f40d3e9e00d595234e49def6caa133136e8254b659189d6 -size 6530 diff --git a/file-embed-0.0.13.0.tar.gz b/file-embed-0.0.13.0.tar.gz new file mode 100644 index 0000000..143384f --- /dev/null +++ b/file-embed-0.0.13.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d13068abb0bd22c5d118164734a097dc591977b2c7561d912af9097803c6e1ea +size 6657 diff --git a/ghc-file-embed.changes b/ghc-file-embed.changes index 4c35ec3..fbf7851 100644 --- a/ghc-file-embed.changes +++ b/ghc-file-embed.changes @@ -1,71 +1,18 @@ ------------------------------------------------------------------- -Fri Dec 20 03:02:06 UTC 2019 - psimons@suse.com +Tue Aug 18 10:44:51 UTC 2020 - Peter Simons -- Update file-embed to version 0.0.11.1. - # ChangeLog for file-embed - - ## 0.0.11.1 - - * Support GHC 8.10 +- Replace %setup -q with the more modern %autosetup macro. ------------------------------------------------------------------- -Fri Nov 8 16:13:44 UTC 2019 - Peter Simons +Tue Jul 7 02:00:28 UTC 2020 - psimons@suse.com -- Drop obsolete group attributes. +- Update file-embed to version 0.0.13.0. + ## 0.0.13.0 + + * Ensure that directory listings are returned in sorted order for reproducibility [yesodweb/yesod#1684](https://github.com/yesodweb/yesod/issues/1684) ------------------------------------------------------------------- -Sat Oct 20 11:31:30 UTC 2018 - Peter Simons +Tue Jun 9 09:26:17 UTC 2020 - psimons@suse.com -- Use https URL to refer to bugs.opensuse.org. +- Add file-embed at version 0.0.12.0. -------------------------------------------------------------------- -Tue Jul 31 14:10:04 UTC 2018 - psimons@suse.com - -- Update file-embed to version 0.0.11. - ## 0.0.11 - - * embedDirListing [#26](https://github.com/snoyberg/file-embed/pull/26) - -------------------------------------------------------------------- -Wed Jul 18 14:26:24 UTC 2018 - psimons@suse.com - -- Cosmetic: replace tabs with blanks, strip trailing white space, - and update copyright headers with spec-cleaner. - -------------------------------------------------------------------- -Mon May 14 17:02:11 UTC 2018 - psimons@suse.com - -- Update file-embed to version 0.0.10.1. - * Minor doc improvements - -------------------------------------------------------------------- -Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com - -- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. - -------------------------------------------------------------------- -Sun Jul 10 17:15:55 UTC 2016 - psimons@suse.com - -- Update to version 0.0.10 revision 0 with cabal2obs. - -------------------------------------------------------------------- -Tue Apr 26 08:25:43 UTC 2016 - mimi.vx@gmail.com - -- update to 0.0.10 -* makeRelativeToProject - -------------------------------------------------------------------- -Fri Jan 22 08:46:18 UTC 2016 - mimi.vx@gmail.com - -- update to 0.0.9.1 -* embedStringFile - -------------------------------------------------------------------- -Mon Nov 23 09:56:34 UTC 2015 - mimi.vx@gmail.com - -- correct licence to BSD-2-Clause - -------------------------------------------------------------------- -Tue Nov 17 19:28:15 UTC 2015 - mimi.vx@gmail.com - -- initial commit diff --git a/ghc-file-embed.spec b/ghc-file-embed.spec index 2ef4fb5..39c840c 100644 --- a/ghc-file-embed.spec +++ b/ghc-file-embed.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# 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 @@ -19,7 +19,7 @@ %global pkg_name file-embed %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.0.11.1 +Version: 0.0.13.0 Release: 0 Summary: Use Template Haskell to embed file contents directly License: BSD-2-Clause @@ -47,7 +47,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 3dea43c770f1f300963ad5df32508f94bb281e7269cbe41d39b96c6b2c72e6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:06 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-file-embed revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-file-embed?expand=0&rev=48 --- ghc-file-embed.changes | 5 +++++ ghc-file-embed.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-file-embed.changes b/ghc-file-embed.changes index fbf7851..8e6505a 100644 --- a/ghc-file-embed.changes +++ b/ghc-file-embed.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:44:51 UTC 2020 - Peter Simons diff --git a/ghc-file-embed.spec b/ghc-file-embed.spec index 39c840c..227e003 100644 --- a/ghc-file-embed.spec +++ b/ghc-file-embed.spec @@ -31,6 +31,12 @@ BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-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 Use Template Haskell to read a file or all the files in a directory, and turn From 9b97ca93245288920502b9c3b13dc271edd05b1d7d6f89bb30876fd9f34b7c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:03 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-file-embed revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-file-embed?expand=0&rev=49 --- ghc-file-embed.changes | 2 +- ghc-file-embed.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-file-embed.changes b/ghc-file-embed.changes index 8e6505a..f3c3e64 100644 --- a/ghc-file-embed.changes +++ b/ghc-file-embed.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:44:51 UTC 2020 - Peter Simons diff --git a/ghc-file-embed.spec b/ghc-file-embed.spec index 227e003..00f98f6 100644 --- a/ghc-file-embed.spec +++ b/ghc-file-embed.spec @@ -31,12 +31,7 @@ BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-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 Use Template Haskell to read a file or all the files in a directory, and turn From 361a39626e24e0aeb32c1e84554315b7a08222f7b49103d644b3dd68a0cc606d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:33 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-file-embed revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-file-embed?expand=0&rev=50 --- ghc-file-embed.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-file-embed.changes b/ghc-file-embed.changes index f3c3e64..a6b1d8b 100644 --- a/ghc-file-embed.changes +++ b/ghc-file-embed.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