Hello community,
here is the log from the commit of package ghc-postgresql-simple-url for
openSUSE:Factory checked in at 2017-03-03 17:51:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-postgresql-simple-url (Old)
and /work/SRC/openSUSE:Factory/.ghc-postgresql-simple-url.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-postgresql-simple-url"
Fri Mar 3 17:51:34 2017 rev:2 rq:461674 version:0.2.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-postgresql-simple-url/ghc-postgresql-simple-url.changes
2016-10-22 13:18:04.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-postgresql-simple-url.new/ghc-postgresql-simple-url.changes
2017-03-03 17:51:35.685291671 +0100
@@ -1,0 +2,5 @@
+Sun Feb 12 14:20:21 UTC 2017 - [email protected]
+
+- Update to version 0.2.0.0 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
7.cabal
postgresql-simple-url-0.1.0.1.tar.gz
New:
----
postgresql-simple-url-0.2.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-postgresql-simple-url.spec ++++++
--- /var/tmp/diff_new_pack.BRaFQk/_old 2017-03-03 17:51:36.385192819 +0100
+++ /var/tmp/diff_new_pack.BRaFQk/_new 2017-03-03 17:51:36.389192254 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-postgresql-simple-url
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -19,16 +19,14 @@
%global pkg_name postgresql-simple-url
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.1.0.1
+Version: 0.2.0.0
Release: 0
Summary: Parse postgres:// url into ConnectInfo
License: MIT
-Group: System/Libraries
+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
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/7.cabal
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-postgresql-simple-devel
BuildRequires: ghc-rpm-macros
@@ -38,7 +36,6 @@
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-quickcheck-devel
%endif
-# End cabal-rpm deps
%description
The 'Database.PostgreSQL.Simple.URL' module in this package exports two helper
@@ -58,22 +55,15 @@
%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
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
@@ -87,6 +77,6 @@
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
-%doc README.md
+%doc CHANGELOG.md README.md
%changelog
++++++ postgresql-simple-url-0.1.0.1.tar.gz ->
postgresql-simple-url-0.2.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postgresql-simple-url-0.1.0.1/.gitignore
new/postgresql-simple-url-0.2.0.0/.gitignore
--- old/postgresql-simple-url-0.1.0.1/.gitignore 2015-06-05
19:30:47.000000000 +0200
+++ new/postgresql-simple-url-0.2.0.0/.gitignore 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-dist/
-
-cabal.sandbox.config
-.cabal-sandbox/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postgresql-simple-url-0.1.0.1/CHANGELOG.md
new/postgresql-simple-url-0.2.0.0/CHANGELOG.md
--- old/postgresql-simple-url-0.1.0.1/CHANGELOG.md 1970-01-01
01:00:00.000000000 +0100
+++ new/postgresql-simple-url-0.2.0.0/CHANGELOG.md 2017-01-22
13:40:37.000000000 +0100
@@ -0,0 +1,4 @@
+# 0.2.0.0
+
+Allow empty host, i.e. don't use default provided by `postgresql-simple`.
+Empty host is required to use unix domain sockets.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/postgresql-simple-url-0.1.0.1/postgresql-simple-url.cabal
new/postgresql-simple-url-0.2.0.0/postgresql-simple-url.cabal
--- old/postgresql-simple-url-0.1.0.1/postgresql-simple-url.cabal
2015-06-05 19:30:47.000000000 +0200
+++ new/postgresql-simple-url-0.2.0.0/postgresql-simple-url.cabal
2017-01-22 13:40:37.000000000 +0100
@@ -1,6 +1,9 @@
name: postgresql-simple-url
-version: 0.1.0.1
-synopsis: PostgreSQL
+version: 0.2.0.0
+synopsis: Parse postgres:// url into ConnectInfo
+description:
+ The 'Database.PostgreSQL.Simple.URL' module in this package exports
+ two helper functions 'parseDatabaseUrl' and 'urlToConnectInfo'.
homepage: https://github.com/futurice/postgresql-simple-url
license: MIT
license-file: LICENSE
@@ -10,15 +13,19 @@
stability: experimental
category: Game
build-type: Simple
-extra-source-files: README.md, .gitignore
+extra-source-files: README.md, CHANGELOG.md
cabal-version: >=1.10
+source-repository head
+ type: git
+ location: https://github.com/futurice/postgresql-simple-url
+
library
exposed-modules: Database.PostgreSQL.Simple.URL
- build-depends: base >=4.6 && <4.9,
+ build-depends: base >=4.6 && <4.10,
split >=0.2 && <0.3,
network-uri >=2.6 && <2.7,
- postgresql-simple >=0.4 && <0.5
+ postgresql-simple >=0.4 && <0.6
hs-source-dirs: src
ghc-options: -Wall
default-language: Haskell2010
@@ -29,8 +36,8 @@
hs-source-dirs: tests
main-is: Tests.hs
ghc-options: -Wall
- build-depends: base >=4.6 && <4.9,
- tasty >=0.10 && <0.11,
+ build-depends: base >=4.6 && <4.10,
+ tasty >=0.10 && <0.12,
tasty-quickcheck >=0.8 && <0.9,
- postgresql-simple >=0.4 && <0.5,
+ postgresql-simple >=0.4 && <0.6,
postgresql-simple-url
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/postgresql-simple-url-0.1.0.1/src/Database/PostgreSQL/Simple/URL.hs
new/postgresql-simple-url-0.2.0.0/src/Database/PostgreSQL/Simple/URL.hs
--- old/postgresql-simple-url-0.1.0.1/src/Database/PostgreSQL/Simple/URL.hs
2015-06-05 19:30:47.000000000 +0200
+++ new/postgresql-simple-url-0.2.0.0/src/Database/PostgreSQL/Simple/URL.hs
2017-01-22 13:40:37.000000000 +0100
@@ -13,13 +13,13 @@
import Data.List.Split
import Database.PostgreSQL.Simple
import Network.URI
+import Prelude
-- | Parse string url into `ConnectInfo`.
---
+--
-- > parseDatabaseURL "postgres://foo:[email protected]:2345/database" ==
ConnectInfo "example.com" 2345 "foo" "bar" "database"
parseDatabaseUrl :: String -> Maybe ConnectInfo
parseDatabaseUrl databaseUrl = parseURI databaseUrl >>= uriToConnectInfo
- where
uriToConnectInfo :: URI -> Maybe ConnectInfo
uriToConnectInfo uri
@@ -47,7 +47,6 @@
(':' : p) -> \info -> info { connectPort = read p }
_ -> id
host = case uriRegName uriAuth of
- "" -> id
h -> \info -> info { connectHost = h }
auth = case splitOn ":" (uriUserInfo uriAuth) of
[""] -> id
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postgresql-simple-url-0.1.0.1/tests/Tests.hs
new/postgresql-simple-url-0.2.0.0/tests/Tests.hs
--- old/postgresql-simple-url-0.1.0.1/tests/Tests.hs 2015-06-05
19:30:47.000000000 +0200
+++ new/postgresql-simple-url-0.2.0.0/tests/Tests.hs 2017-01-22
13:40:37.000000000 +0100
@@ -9,9 +9,15 @@
cases :: [(String, Maybe ConnectInfo)]
cases =
- [ ("postgres:///local", Just $ defaultConnectInfo { connectDatabase =
"local"} )
+ [ ("postgres:///local", Just $ defaultConnectInfo
+ { connectHost = "", connectDatabase = "local"} )
+ , ("postgres://localhost/local", Just $ defaultConnectInfo
+ { connectHost = "localhost", connectDatabase = "local"} )
+ , ("postgres://user@/local", Just $ defaultConnectInfo
+ { connectHost = "", connectUser = "user", connectDatabase = "local"} )
, ("mysql:///typo", Nothing)
- , ("postgres://foo:[email protected]:2345/database", Just $ ConnectInfo
"example.com" 2345 "foo" "bar" "database")
+ , ("postgres://foo:[email protected]:2345/database", Just $
+ ConnectInfo "example.com" 2345 "foo" "bar" "database")
]
casesProps :: TestTree