commit ghc-licensor for openSUSE:Factory

31 Aug 2017

Hello community,

here is the log from the commit of package ghc-licensor for openSUSE:Factory checked in at 2017-08-31 20:57:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-licensor (Old)
 and      /work/SRC/openSUSE:Factory/.ghc-licensor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ghc-licensor"

Thu Aug 31 20:57:07 2017 rev:2 rq:513420 version:0.2.1

Changes:
--------

--- /work/SRC/openSUSE:Factory/ghc-licensor/ghc-licensor.changes	2017-04-06 11:00:29.565638892 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-licensor.new/ghc-licensor.changes	2017-08-31 20:57:10.033483959 +0200
@@ -1,0 +2,5 @@
+Thu Jul 27 14:07:34 UTC 2017 - psimons@suse.com
+
+- Update to version 0.2.1.
+
+-------------------------------------------------------------------

Old:
----
  licensor-0.2.0.tar.gz

New:
----
  licensor-0.2.1.tar.gz

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

Other differences:
------------------
++++++ ghc-licensor.spec ++++++
--- /var/tmp/diff_new_pack.E58ryc/_old	2017-08-31 20:57:10.653396859 +0200
+++ /var/tmp/diff_new_pack.E58ryc/_new	2017-08-31 20:57:10.661395735 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name licensor
 Name:           ghc-%{pkg_name}
-Version:        0.2.0
+Version:        0.2.1
 Release:        0
 Summary:        A license compatibility helper
 License:        MIT

++++++ licensor-0.2.0.tar.gz -> licensor-0.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licensor-0.2.0/CHANGELOG.md new/licensor-0.2.1/CHANGELOG.md
--- old/licensor-0.2.0/CHANGELOG.md	2016-09-19 00:17:42.000000000 +0200
+++ new/licensor-0.2.1/CHANGELOG.md	2017-07-24 16:26:29.000000000 +0200
@@ -1,3 +1,7 @@
+# 0.2.1 (2017-07-24)
+
+- Allow base 4.10 and Cabal 2.0 (7bbb360)
+
 # 0.2.0 (2016-09-18)
 
 ## Enhancements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licensor-0.2.0/Main.hs new/licensor-0.2.1/Main.hs
--- old/licensor-0.2.0/Main.hs	2016-09-16 15:27:50.000000000 +0200
+++ new/licensor-0.2.1/Main.hs	2017-07-05 15:01:13.000000000 +0200
@@ -64,6 +64,7 @@
       }
   &= program s
   &= summary (unwords ["licensor", Version.showVersion version])
+  &= verbosity
 
 
 -- |
@@ -74,6 +75,8 @@
 main = do
   LiArgs <- cmdArgsRun . liArgs =<< getProgName
 
+  quiet <- fmap not isNormal
+
   maybePackage <- getPackage
 
   pid <-
@@ -105,7 +108,7 @@
 
     Just dependencies -> do
       (dependenciesByLicense', failed) <-
-        orderPackagesByLicense pid dependencies
+        orderPackagesByLicense quiet pid dependencies
 
       let dependenciesByLicense = fmap (Set.map display) dependenciesByLicense'
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licensor-0.2.0/README.md new/licensor-0.2.1/README.md
--- old/licensor-0.2.0/README.md	2016-09-18 23:46:36.000000000 +0200
+++ new/licensor-0.2.1/README.md	2017-07-05 15:01:13.000000000 +0200
@@ -5,8 +5,8 @@
 [0]: https://circleci.com/gh/jpvillaisaza/licensor
 [1]: https://circleci.com/gh/jpvillaisaza/licensor.svg?style=svg
 
-![][2]
-![][3]
+[![][2]](https://www.stackage.org/lts/package/licensor)
+[![][3]](https://www.stackage.org/nightly/package/licensor)
 
 [2]: https://www.stackage.org/package/licensor/badge/lts
 [3]: https://www.stackage.org/package/licensor/badge/nightly
@@ -167,7 +167,8 @@
 
 ## Additional resources
 
-- [Choose a License](http://choosealicense.com/)
+- [Choose a License](https://choosealicense.com/)
+- [The Legal Side of Open Source](https://opensource.guide/legal/)
 - [License compatibility][ar-01]
 - [Understanding open source and free software licensing][ar-02]
   (Andrew M. St. Laurent)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licensor-0.2.0/licensor.cabal new/licensor-0.2.1/licensor.cabal
--- old/licensor-0.2.0/licensor.cabal	2016-09-19 00:18:09.000000000 +0200
+++ new/licensor-0.2.1/licensor.cabal	2017-07-24 16:26:14.000000000 +0200
@@ -1,5 +1,5 @@
 name: licensor
-version: 0.2.0
+version: 0.2.1
 
 build-type: Simple
 cabal-version: >= 1.21
@@ -21,7 +21,7 @@
 
 category: Distribution
 
-tested-with: GHC == 7.10.3, GHC == 8.0.1
+tested-with: GHC == 7.10.3, GHC == 8.0.1, GHC == 8.0.2, GHC == 8.2.1
 
 extra-source-files: CHANGELOG.md, README.md
 
@@ -34,9 +34,9 @@
   other-modules:
       Paths_licensor
   build-depends:
-      base >= 4.8 && < 4.10
+      base >= 4.8 && < 4.11
     , bytestring
-    , Cabal >= 1.22 && < 1.25
+    , Cabal >= 1.22 && < 2.1
     , containers
     , directory
     , http-conduit >= 2.1 && < 2.3
@@ -51,8 +51,8 @@
   main-is:
       Main.hs
   build-depends:
-      base >= 4.8 && < 5.0
-    , Cabal >= 1.22 && < 1.25
+      base
+    , Cabal
     , cmdargs >= 0.10 && < 0.11
     , containers
     , directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licensor-0.2.0/src/Licensor.hs new/licensor-0.2.1/src/Licensor.hs
--- old/licensor-0.2.0/src/Licensor.hs	2016-09-11 22:25:54.000000000 +0200
+++ new/licensor-0.2.1/src/Licensor.hs	2017-07-05 15:01:13.000000000 +0200
@@ -24,6 +24,7 @@
 
 -- base
 import qualified Control.Exception as Exception
+import Control.Monad (unless)
 import Data.Monoid ((<>))
 import Data.Version (Version)
 import System.IO
@@ -130,9 +131,9 @@
 --
 --
 
-getPackageLicense :: PackageIdentifier -> IO (Maybe LiLicense)
-getPackageLicense p@PackageIdentifier{..} = do
-  putStr $ display p ++ "..."
+getPackageLicense :: Bool -> PackageIdentifier -> IO (Maybe LiLicense)
+getPackageLicense quiet p@PackageIdentifier{..} = do
+  unless quiet (putStr $ display p ++ "...")
   let
     url =
       "GET https://hackage.haskell.org/package/"
@@ -157,7 +158,7 @@
       hClose handle
       removeFile file
 
-      putStrLn $ display license
+      unless quiet (putStrLn $ display license)
 
       return $ Just (LiLicense license)
 
@@ -167,16 +168,17 @@
 --
 
 orderPackagesByLicense
-  :: Maybe PackageIdentifier
+  :: Bool
+  -> Maybe PackageIdentifier
   -> Set PackageIdentifier
   -> IO (Map LiLicense (Set PackageIdentifier), Set PackageIdentifier)
-orderPackagesByLicense maybeP =
+orderPackagesByLicense quiet maybeP =
   let
     cond =
       maybe (const False) (==) maybeP
 
     insertPackage package orderedPackages' = do
-      maybeLicense <- getPackageLicense package
+      maybeLicense <- getPackageLicense quiet package
 
       (orderedPackages, failed) <- orderedPackages'
       return $

    

root＠hilbert.suse.de

tags

participants (1)