Hello community,

here is the log from the commit of package ghc-scotty for openSUSE:Factory 
checked in at 2016-07-21 08:16:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-scotty (Old)
 and      /work/SRC/openSUSE:Factory/.ghc-scotty.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ghc-scotty"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-scotty/ghc-scotty.changes    2016-05-29 
03:14:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-scotty.new/ghc-scotty.changes       
2016-07-21 08:16:22.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Jul 10 17:28:55 UTC 2016 - psim...@suse.com
+
+- Update to version 0.11.0 revision 2 with cabal2obs.
+- Remove obsolete remove-nats.patch , we ship ghc-nats now.
+
+-------------------------------------------------------------------

Old:
----
  remove-nats.patch

New:
----
  2.cabal

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ghc-scotty.spec ++++++
--- /var/tmp/diff_new_pack.TsY6wQ/_old  2016-07-21 08:16:23.000000000 +0200
+++ /var/tmp/diff_new_pack.TsY6wQ/_new  2016-07-21 08:16:23.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-scotty
 #
-# 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,25 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%global pkg_name scotty
 
+%global pkg_name scotty
 %bcond_with tests
-
-Name:           ghc-scotty
+Name:           ghc-%{pkg_name}
 Version:        0.11.0
 Release:        0
 Summary:        Haskell web framework inspired by Ruby's Sinatra, using WAI 
and Warp
-Group:          System/Libraries
-
 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
-# PATCH-FIX-OPENSUSE remove-nats.patch mimi...@gmail.com -- remove unneded dep 
of nats
-Patch0:         remove-nats.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
+Source1:        
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-blaze-builder-devel
@@ -44,8 +38,10 @@
 BuildRequires:  ghc-http-types-devel
 BuildRequires:  ghc-monad-control-devel
 BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-nats-devel
 BuildRequires:  ghc-network-devel
 BuildRequires:  ghc-regex-compat-devel
+BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-base-devel
 BuildRequires:  ghc-transformers-compat-devel
@@ -53,6 +49,7 @@
 BuildRequires:  ghc-wai-devel
 BuildRequires:  ghc-wai-extra-devel
 BuildRequires:  ghc-warp-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with tests}
 BuildRequires:  ghc-async-devel
 BuildRequires:  ghc-directory-devel
@@ -76,8 +73,6 @@
 mconcat ["<h1>Scotty, ", beam, " me up!</h1>"]
 '
 
-
-
 Scotty is the cheap and cheerful way to write RESTful, declarative web
 applications.
 
@@ -95,23 +90,21 @@
 
 [Warp] <http://hackage.haskell.org/package/warp>.
 
-
 %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}
-%patch0 -p1
-cabal-tweak-dep-ver aeson '< 0.11' '< 0.12'
+cp -p %{SOURCE1} %{pkg_name}.cabal
+
 
 %build
 %ghc_lib_build
@@ -123,26 +116,22 @@
 
 %check
 %if %{with tests}
-%cabal test
+%{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 examples
-
+%doc README.md changelog.md examples
 
 %changelog

++++++ 2.cabal ++++++
Name:                scotty
Version:             0.11.0
x-revision: 2
Synopsis:            Haskell web framework inspired by Ruby's Sinatra, using 
WAI and Warp
Homepage:            https://github.com/scotty-web/scotty
Bug-reports:         https://github.com/scotty-web/scotty/issues
License:             BSD3
License-file:        LICENSE
Author:              Andrew Farmer <xicheko...@gmail.com>
Maintainer:          Andrew Farmer <xicheko...@gmail.com>
Copyright:           (c) 2012-Present Andrew Farmer
Category:            Web
Stability:           experimental
Build-type:          Simple
Cabal-version:       >= 1.10
Description:
  A Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp.
  .
  @
    &#123;-&#35; LANGUAGE OverloadedStrings &#35;-&#125;
    .
    import Web.Scotty
    .
    import Data.Monoid (mconcat)
    .
    main = scotty 3000 $ do
    &#32;&#32;get &#34;/:word&#34; $ do
    &#32;&#32;&#32;&#32;beam <- param &#34;word&#34;
    &#32;&#32;&#32;&#32;html $ mconcat [&#34;&#60;h1&#62;Scotty, &#34;, beam, 
&#34; me up!&#60;/h1&#62;&#34;]
  @
  .
  .
  Scotty is the cheap and cheerful way to write RESTful, declarative web 
applications.
  .
    * A page is as simple as defining the verb, url pattern, and Text content.
  .
    * It is template-language agnostic. Anything that returns a Text value will 
do.
  .
    * Conforms to WAI Application interface.
  .
    * Uses very fast Warp webserver by default.
  .
  As for the name: Sinatra + Warp = Scotty.
  .
  [WAI] <http://hackage.haskell.org/package/wai>
  .
  [Warp] <http://hackage.haskell.org/package/warp>

Extra-source-files:
    README.md
    changelog.md
    examples/404.html
    examples/basic.hs
    examples/cookies.hs
    examples/exceptions.hs
    examples/globalstate.hs
    examples/gzip.hs
    examples/options.hs
    examples/upload.hs
    examples/urlshortener.hs
    examples/static/jquery.js
    examples/static/jquery-json.js

Library
  Exposed-modules:     Web.Scotty
                       Web.Scotty.Trans
                       Web.Scotty.Internal.Types
  other-modules:       Web.Scotty.Action
                       Web.Scotty.Route
                       Web.Scotty.Util
  default-language:    Haskell2010
  build-depends:       aeson               >= 0.6.2.1  && < 0.12,
                       base                >= 4.3.1    && < 5,
                       blaze-builder       >= 0.3.3.0  && < 0.5,
                       bytestring          >= 0.10.0.2 && < 0.11,
                       case-insensitive    >= 1.0.0.1  && < 1.3,
                       data-default-class  >= 0.0.1    && < 0.2,
                       fail,
                       http-types          >= 0.8.2    && < 0.10,
                       monad-control       >= 1.0.0.3  && < 1.1,
                       mtl                 >= 2.1.2    && < 2.3,
                       nats                >= 0.1      && < 2,
                       network             >= 2.6.0.2  && < 2.7,
                       regex-compat        >= 0.95.1   && < 0.96,
                       text                >= 0.11.3.1 && < 1.3,
                       transformers        >= 0.3.0.0  && < 0.6,
                       transformers-base   >= 0.4.1    && < 0.5,
                       transformers-compat >= 0.4      && < 0.6,
                       wai                 >= 3.0.0    && < 3.3,
                       wai-extra           >= 3.0.0    && < 3.1,
                       warp                >= 3.0.0    && < 3.3

  GHC-options: -Wall -fno-warn-orphans

test-suite spec
  main-is:             Spec.hs
  other-modules:       Web.ScottySpec
  type:                exitcode-stdio-1.0
  default-language:    Haskell2010
  hs-source-dirs:      test
  build-depends:       async,
                       base,
                       data-default-class,
                       directory,
                       hspec == 2.*,
                       hspec-wai >= 0.6.3,
                       http-types,
                       lifted-base,
                       network,
                       scotty,
                       text,
                       wai
  GHC-options:         -Wall -threaded -fno-warn-orphans

source-repository head
  type:     git
  location: git://github.com/scotty-web/scotty.git

Reply via email to