[couchdb-pkg] branch master updated (6b77eae -> deef818)

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git.


 discard 6b77eae  Merge pull request #62 from jjrodrig/keep-vm-args
    omit 5b76554  Do not replace vm.args during update
    omit 18549af  fixes for snapcraft
     new deef818  fixes for snapcraft

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6b77eae)
            \
             N -- N -- N   refs/heads/master (deef818)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 rpm/SPECS/couchdb.spec.in | 1 -
 snap/snapcraft.yaml       | 2 --
 2 files changed, 3 deletions(-)

[couchdb-pkg] 01/01: fixes for snapcraft

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git

commit deef8181036cf32a01c134612f447d3da80b76bc
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Thu Feb 27 21:22:30 2020 -0800

    fixes for snapcraft
---
 README-SNAP.md      | 8 ++++----
 snap/snapcraft.yaml | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/README-SNAP.md b/README-SNAP.md
index 28628fb..1bd2432 100644
--- a/README-SNAP.md
+++ b/README-SNAP.md
@@ -253,15 +253,15 @@ upstream image is fully patched for `core18`, we'll move to it instead.)
 From an Ubuntu 18.04 machine with Docker installed:
 
 ```bash
-$ git clone https://github.com/couchdb/couchdb-pkg && cd couchdb-pkg`
-$ docker pull yakshaveinc/snapcraft:core18-edge`
-$ docker run -it -v "$PWD":/build:Z -w /build yakshaveinc/snapcraft:core18-edge snapcraft
+$ git clone https://github.com/couchdb/couchdb-pkg && cd couchdb-pkg
+$ docker pull yakshaveinc/snapcraft:core18
+$ docker run -it -v "$PWD":/build:Z -w /build yakshaveinc/snapcraft:core18 snapcraft
 ```
 
 The self-built snap will need to be installed using `--dangerous`:
 
 ```bash
-sudo snap install ./couchdb_2.3.1_amd64.snap --dangerous
+sudo snap install ./couchdb_3.0.0_amd64.snap --dangerous
 ```
 
 Clean up with:
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9137f12..c382529 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: couchdb
-version: 2.3.1
+version: 3.0.0
 summary: Official Apache CouchDB snap - a clustering document oriented database
 description: |
   CouchDB is a database that completely embraces the web. Store your data with
@@ -28,7 +28,7 @@ parts:
   couchdb: 
     after: [add-repo]
     plugin: dump
-    source: https://apache.bintray.com/couchdb-deb/pool/C/CouchDB/couchdb_2.3.1~bionic_amd64.deb
+    source: https://apache.bintray.com/couchdb-deb/pool/C/CouchDB/couchdb_3.0.0~bionic_amd64.deb
     source-type: deb
     # because this doesn't use apt, we have to manually list all of our dependencies :(
     # the following are all in core18, and warning output can safely be ignored:
@@ -62,8 +62,6 @@ parts:
       - couch-libmozjs185-1.0
       - lsb-base
       - procps
-      - python3
-      - python3-requests
       - libcurl4
       - libgcc1
       - libicu60
@@ -111,9 +109,6 @@ apps:
   remsh:
     command: opt/couchdb/bin/remsh
     plugs: [network, network-bind]
-  couchup:
-    command: opt/couchdb/bin/couchup
-    plugs: [network, network-bind]
   couchjs:
     command: opt/couchdb/bin/couchjs
     plugs: [network, network-bind]