[couchdb-pkg] branch master updated (8b83c40 -> 780a37b)

[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 8b83c40  Remove js-185 packages on CentOS 7
     new 780a37b  Remove js-185 packages on CentOS 7

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   (8b83c40)
            \
             N -- N -- N   refs/heads/master (780a37b)

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:
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb-pkg] 01/01: Remove js-185 packages on CentOS 7

[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 780a37be87f452df027e1942e031ed4be97b6f7b
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Thu Jul 13 01:04:31 2017 -0400

    Remove js-185 packages on CentOS 7
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4594d43..1e0e6dc 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ centos: find-couch-dist link-couch-dist build-rpm
 
 centos6: make-rpmbuild install-js185 centos
 
-centos7: make-rpmbuild centos
+centos7: make-rpmbuild centos rm-js185-rpms
 
 # ######################################
 get-couch:
@@ -99,3 +99,6 @@ make-js185:
 install-js185:
 	sudo rpm -i ~/rpmbuild/RPMS/x86_64/js-1*
 	sudo rpm -i ~/rpmbuild/RPMS/x86_64/js-devel*
+
+rm-js185-rpms:
+	rm -f ~/rpmbuild/RPMS/x86_64/js*

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.