From 97d4c48761c0c429e1022684ae82f6f665bc302b91877cc85520c13d23296842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Tue, 19 Jul 2016 12:52:29 +0000 Subject: [PATCH 1/2] Accepting request 410368 from devel:languages:haskell:lts:6 See https://lists.opensuse.org/opensuse-haskell/2016-07/msg00000.html for details. OBS-URL: https://build.opensuse.org/request/show/410368 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-path-pieces?expand=0&rev=4 --- 1.cabal | 40 ++++++++++++++++++++++++++++++++++++++++ ghc-path-pieces.changes | 5 +++++ ghc-path-pieces.spec | 26 +++++++++++++------------- 3 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 1.cabal diff --git a/1.cabal b/1.cabal new file mode 100644 index 0000000..bc1a05c --- /dev/null +++ b/1.cabal @@ -0,0 +1,40 @@ +name: path-pieces +version: 0.2.1 +x-revision: 1 +license: BSD3 +license-file: LICENSE +author: Michael Snoyman +maintainer: Michael Snoyman +synopsis: Components of paths. +description: Hackage documentation generation is not reliable. For up to date documentation, please see: . +category: Web, Yesod +stability: unstable +cabal-version: >= 1.8 +build-type: Simple +extra-source-files: + test/main.hs + ChangeLog.md + README.md + +library + build-depends: base >= 4.6 && < 5 + , text >= 0.5 + , time + exposed-modules: Web.PathPieces + ghc-options: -Wall + +test-suite test + type: exitcode-stdio-1.0 + main-is: main.hs + hs-source-dirs: test + ghc-options: -Wall + build-depends: HUnit + , hspec >= 1.3 + , base >= 4 && < 5 + , QuickCheck + , path-pieces + , text + +source-repository head + type: git + location: https://github.com/yesodweb/path-pieces diff --git a/ghc-path-pieces.changes b/ghc-path-pieces.changes index cd2b1a2..28f3de9 100644 --- a/ghc-path-pieces.changes +++ b/ghc-path-pieces.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:30:57 UTC 2016 - psimons@suse.com + +- Update to version 0.2.1 revision 1 with cabal2obs. + ------------------------------------------------------------------- Wed Nov 4 08:21:30 UTC 2015 - mimi.vx@gmail.com diff --git a/ghc-path-pieces.spec b/ghc-path-pieces.spec index eb441dc..35d4b57 100644 --- a/ghc-path-pieces.spec +++ b/ghc-path-pieces.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-path-pieces # -# 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 @@ -17,25 +17,22 @@ %global pkg_name path-pieces - %bcond_with tests - -Name: ghc-path-pieces +Name: ghc-%{pkg_name} Version: 0.2.1 Release: 0 Summary: Components of paths -License: BSD-2-Clause +License: BSD-3-Clause Group: System/Libraries - 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 - +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -47,33 +44,36 @@ BuildRequires: ghc-hspec-devel Hackage documentation generation is not reliable. For up to date documentation, please see: . - %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other +Requires: %{name} = %{version}-%{release} 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 %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal + %build %ghc_lib_build + %install %ghc_lib_install + %check %if %{with tests} -%cabal test +%{cabal} test %endif + %post devel %ghc_pkg_recache @@ -86,6 +86,6 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md +%doc ChangeLog.md README.md %changelog From 45e9a7e6bee2f92646be669edbafe275a3ff4b1b3850e23acfb68bdd1e79461f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Jul 2016 17:37:26 +0000 Subject: [PATCH 2/2] Accepting request 412402 from devel:languages:haskell:lts:6 See https://lists.opensuse.org/opensuse-haskell/2016-07/msg00000.html for details. OBS-URL: https://build.opensuse.org/request/show/412402 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-path-pieces?expand=0&rev=5 --- 1.cabal | 40 ---------------------------------------- ghc-path-pieces.changes | 5 ----- ghc-path-pieces.spec | 2 +- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 1.cabal diff --git a/1.cabal b/1.cabal deleted file mode 100644 index bc1a05c..0000000 --- a/1.cabal +++ /dev/null @@ -1,40 +0,0 @@ -name: path-pieces -version: 0.2.1 -x-revision: 1 -license: BSD3 -license-file: LICENSE -author: Michael Snoyman -maintainer: Michael Snoyman -synopsis: Components of paths. -description: Hackage documentation generation is not reliable. For up to date documentation, please see: . -category: Web, Yesod -stability: unstable -cabal-version: >= 1.8 -build-type: Simple -extra-source-files: - test/main.hs - ChangeLog.md - README.md - -library - build-depends: base >= 4.6 && < 5 - , text >= 0.5 - , time - exposed-modules: Web.PathPieces - ghc-options: -Wall - -test-suite test - type: exitcode-stdio-1.0 - main-is: main.hs - hs-source-dirs: test - ghc-options: -Wall - build-depends: HUnit - , hspec >= 1.3 - , base >= 4 && < 5 - , QuickCheck - , path-pieces - , text - -source-repository head - type: git - location: https://github.com/yesodweb/path-pieces diff --git a/ghc-path-pieces.changes b/ghc-path-pieces.changes index 28f3de9..cd2b1a2 100644 --- a/ghc-path-pieces.changes +++ b/ghc-path-pieces.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Jul 10 17:30:57 UTC 2016 - psimons@suse.com - -- Update to version 0.2.1 revision 1 with cabal2obs. - ------------------------------------------------------------------- Wed Nov 4 08:21:30 UTC 2015 - mimi.vx@gmail.com diff --git a/ghc-path-pieces.spec b/ghc-path-pieces.spec index 35d4b57..57e8782 100644 --- a/ghc-path-pieces.spec +++ b/ghc-path-pieces.spec @@ -22,7 +22,7 @@ Name: ghc-%{pkg_name} Version: 0.2.1 Release: 0 Summary: Components of paths -License: BSD-3-Clause +License: BSD-2-Clause Group: System/Libraries Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz