Hello community,
here is the log from the commit of package ghc-css-text for openSUSE:Factory
checked in at 2016-10-19 13:03:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-css-text (Old)
and /work/SRC/openSUSE:Factory/.ghc-css-text.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-css-text"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-css-text/ghc-css-text.changes
2016-07-21 08:14:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-css-text.new/ghc-css-text.changes
2016-10-19 13:03:44.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 15 06:35:42 UTC 2016 - psim...@suse.com
+
+- Update to version 0.1.2.2 revision 0 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
css-text-0.1.2.1.tar.gz
New:
----
css-text-0.1.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-css-text.spec ++++++
--- /var/tmp/diff_new_pack.B6eMh5/_old 2016-10-19 13:03:46.000000000 +0200
+++ /var/tmp/diff_new_pack.B6eMh5/_new 2016-10-19 13:03:46.000000000 +0200
@@ -19,15 +19,14 @@
%global pkg_name css-text
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.1.2.1
+Version: 0.1.2.2
Release: 0
Summary: CSS parser and renderer
-License: BSD-2-Clause
-Group: System/Libraries
+License: MIT
+Group: Development/Languages/Other
Url: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-text-devel
@@ -36,7 +35,6 @@
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-hspec-devel
%endif
-# End cabal-rpm deps
%description
CSS parser and renderer.
@@ -55,20 +53,14 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
@@ -82,5 +74,6 @@
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
+%doc ChangeLog.md README.md
%changelog
++++++ css-text-0.1.2.1.tar.gz -> css-text-0.1.2.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/css-text-0.1.2.1/ChangeLog.md
new/css-text-0.1.2.2/ChangeLog.md
--- old/css-text-0.1.2.1/ChangeLog.md 1970-01-01 01:00:00.000000000 +0100
+++ new/css-text-0.1.2.2/ChangeLog.md 2016-07-07 17:34:33.000000000 +0200
@@ -0,0 +1,3 @@
+## 0.1.2.2
+
+* Clarified MIT license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/css-text-0.1.2.1/LICENSE new/css-text-0.1.2.2/LICENSE
--- old/css-text-0.1.2.1/LICENSE 2014-03-16 17:54:41.000000000 +0100
+++ new/css-text-0.1.2.2/LICENSE 2016-07-07 17:34:33.000000000 +0200
@@ -1,25 +1,20 @@
-The following license covers this documentation, and the source code, except
-where otherwise indicated.
+Copyright (c) 2010 Michael Snoyman, http://www.yesodweb.com/
-Copyright 2010, Michael Snoyman. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/css-text-0.1.2.1/README.md
new/css-text-0.1.2.2/README.md
--- old/css-text-0.1.2.1/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/css-text-0.1.2.2/README.md 2016-07-07 17:34:33.000000000 +0200
@@ -0,0 +1 @@
+a haskell css parser
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/css-text-0.1.2.1/css-text.cabal
new/css-text-0.1.2.2/css-text.cabal
--- old/css-text-0.1.2.1/css-text.cabal 2014-03-16 17:54:41.000000000 +0100
+++ new/css-text-0.1.2.2/css-text.cabal 2016-07-07 17:34:33.000000000 +0200
@@ -1,6 +1,6 @@
name: css-text
-version: 0.1.2.1
-license: BSD3
+version: 0.1.2.2
+license: MIT
license-file: LICENSE
author: Michael Snoyman <mich...@snoyman.com>
maintainer: Michael Snoyman <mich...@snoyman.com>, Greg Weber
<g...@gregweber.info>
@@ -10,7 +10,7 @@
cabal-version: >= 1.8
build-type: Simple
homepage: http://www.yesodweb.com/
-extra-source-files: runtests.hs
+extra-source-files: runtests.hs README.md ChangeLog.md
library
build-depends: base >= 4 && < 5
@@ -31,4 +31,4 @@
source-repository head
type: git
- location: git://github.com/yesodweb/css-text.git
+ location: https://github.com/yesodweb/css-text.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/css-text-0.1.2.1/runtests.hs
new/css-text-0.1.2.2/runtests.hs
--- old/css-text-0.1.2.1/runtests.hs 2014-03-16 17:54:41.000000000 +0100
+++ new/css-text-0.1.2.2/runtests.hs 2016-07-07 17:34:33.000000000 +0200
@@ -69,7 +69,12 @@
deriving (Show, Eq)
instance Arbitrary NestedBlock where
- arbitrary = (LeafBlock . unBlock) `liftM` arbitrary
+ arbitrary = frequency
+ [ (80, (LeafBlock . unBlock) `liftM` arbitrary)
+ , (10, do mediatype <- elements ["print", "screen", "(min-width:768px)"]
+ contents <- arbitrary
+ return (NestedBlock mediatype contents))
+ ]
instance Arbitrary Blocks where
arbitrary = fmap (Blocks . map unBlock) arbitrary
