From a5561882b9ab95b547e418db09ad50036038f3e83849e1ba3901474c37868584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Tue, 26 Jan 2016 08:48:17 +0000 Subject: [PATCH 1/2] Accepting request 355956 from devel:languages:haskell:lts - update to 0.0.9.1 * embedStringFile OBS-URL: https://build.opensuse.org/request/show/355956 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-file-embed?expand=0&rev=4 --- file-embed-0.0.9.1.tar.gz | 3 +++ file-embed-0.0.9.tar.gz | 3 --- ghc-file-embed.changes | 5 +++-- ghc-file-embed.spec | 13 ++++++++++--- 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 file-embed-0.0.9.1.tar.gz delete mode 100644 file-embed-0.0.9.tar.gz diff --git a/file-embed-0.0.9.1.tar.gz b/file-embed-0.0.9.1.tar.gz new file mode 100644 index 0000000..488dfdb --- /dev/null +++ b/file-embed-0.0.9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdbde52cdf03067661944d072d95578ade8a27d709669f4ed40314fc729e460f +size 5685 diff --git a/file-embed-0.0.9.tar.gz b/file-embed-0.0.9.tar.gz deleted file mode 100644 index ec54876..0000000 --- a/file-embed-0.0.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58b3a6b0e0566b9f89286ecd456a669273b8333cd39356d4cc88ef897d93d005 -size 5624 diff --git a/ghc-file-embed.changes b/ghc-file-embed.changes index 7845e79..a5574a6 100644 --- a/ghc-file-embed.changes +++ b/ghc-file-embed.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Mon Nov 23 09:56:34 UTC 2015 - mimi.vx@gmail.com +Fri Jan 22 08:46:18 UTC 2016 - mimi.vx@gmail.com -- correct licence to BSD-2-Clause +- update to 0.0.9.1 +* embedStringFile ------------------------------------------------------------------- Tue Nov 17 19:28:15 UTC 2015 - mimi.vx@gmail.com diff --git a/ghc-file-embed.spec b/ghc-file-embed.spec index a223df2..3b966f1 100644 --- a/ghc-file-embed.spec +++ b/ghc-file-embed.spec @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %global pkg_name file-embed %bcond_without tests Name: ghc-file-embed -Version: 0.0.9 +Version: 0.0.9.1 Release: 0 Summary: Use Template Haskell to embed file contents directly -License: BSD-2-Clause Group: System/Libraries +License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,29 +62,37 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} + %build %ghc_lib_build + %install %ghc_lib_install + %check %if %{with tests} %cabal test %endif + %post devel %ghc_pkg_recache + %postun devel %ghc_pkg_recache + %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE + %files devel -f %{name}-devel.files %defattr(-,root,root,-) %doc README.md + %changelog From c10396f64a570b5ce7100b683acb404f0e841c5fe2cbbd8932bfa07412498e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 27 Jan 2016 07:59:46 +0000 Subject: [PATCH 2/2] - correct licence to BSD-2-Clause OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-file-embed?expand=0&rev=5 --- ghc-file-embed.changes | 5 +++++ ghc-file-embed.spec | 13 +++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ghc-file-embed.changes b/ghc-file-embed.changes index a5574a6..40f0455 100644 --- a/ghc-file-embed.changes +++ b/ghc-file-embed.changes @@ -4,6 +4,11 @@ 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 diff --git a/ghc-file-embed.spec b/ghc-file-embed.spec index 3b966f1..fcb2db8 100644 --- a/ghc-file-embed.spec +++ b/ghc-file-embed.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name file-embed %bcond_without tests @@ -23,9 +24,9 @@ Name: ghc-file-embed Version: 0.0.9.1 Release: 0 Summary: Use Template Haskell to embed file contents directly +License: BSD-2-Clause Group: System/Libraries -License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,37 +63,29 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check %if %{with tests} %cabal test %endif - %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE - %files devel -f %{name}-devel.files %defattr(-,root,root,-) %doc README.md - %changelog