upgrading package: cockroach22 2.2.0a20181119 -> 2.2.0a20190211

cockroach22/cockroach22.patch

@@ -1,12 +1,35 @@
 Index: src/github.com/cockroachdb/cockroach/Makefile
---- src/github.com/cockroachdb/cockroach/Makefile.orig	2018-08-27 19:28:14.000000000 +0200
-+++ src/github.com/cockroachdb/cockroach/Makefile	2018-09-01 09:55:54.180753000 +0200
-@@ -972,10 +972,10 @@
+--- src/github.com/cockroachdb/cockroach/Makefile.orig	2019-02-08 00:35:10.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/Makefile	2019-02-17 09:42:30.034406000 +0100
+@@ -314,11 +314,6 @@
+ 
+ .SECONDARY: bin/.submodules-initialized
+ bin/.submodules-initialized:
+-ifneq ($(GIT_DIR),)
+-	git submodule update --init --recursive
+-endif
+-	mkdir -p $(@D)
+-	touch $@
+ 
+ IGNORE_GOVERS :=
+ 
+@@ -674,8 +669,8 @@
+ 	@echo "NCPUS = $$({ getconf _NPROCESSORS_ONLN || sysctl -n hw.ncpu || nproc; } 2>/dev/null)" >> $@
+ 	@echo "UNAME = $$(uname)" >> $@
+ 	@echo "HOST_TRIPLE = $$($$($(GO) env CC) -dumpmachine)" >> $@
+-	@echo "GIT_DIR = $$(git rev-parse --git-dir 2>/dev/null)" >> $@
+-	@echo "GITHOOKSDIR = $$(test -d .git && echo '.git/hooks' || git rev-parse --git-path hooks)" >> $@
++	@echo "GIT_DIR = .git" >> $@
++	@echo "GITHOOKSDIR = .git/hooks" >> $@
+ 	@echo "have-defs = 1" >> $@
+ 	$(if $(have-defs),$(info Detected change in build system. Rebooting Make.))
+ 
+@@ -1013,10 +1008,10 @@
  # For details, see the "Possible timestamp problems with diff-files?" thread on
  # the Git mailing list (http://marc.info/?l=git&m=131687596307197).
  .buildinfo/tag: | .buildinfo
--	@{ git describe --tags --dirty 2> /dev/null || git rev-parse --short HEAD; } | tr -d \\n > $@
-+	@echo "2.1.0.alpha" >$@
+-	@{ git describe --tags --dirty --match=v[0-9]* 2> /dev/null || git rev-parse --short HEAD; } | tr -d \\n > $@
++	@echo "2.2.0.alpha" >$@
  
  .buildinfo/rev: | .buildinfo
 -	@git rev-parse HEAD > $@
@@ -15,8 +38,8 @@ Index: src/github.com/cockroachdb/cockroach/Makefile
  ifneq ($(GIT_DIR),)
  # If we're in a Git checkout, we update the buildinfo information on every build
 Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
---- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig	2018-08-27 19:28:15.000000000 +0200
-+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go	2018-09-01 09:55:54.181344000 +0200
+--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig	2019-02-08 00:35:11.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go	2019-02-17 09:42:30.034994000 +0100
 @@ -56,6 +56,7 @@
  // #cgo LDFLAGS: -lprotobuf
  // #cgo LDFLAGS: -lrocksdb
@@ -26,19 +49,19 @@ Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
  // #cgo windows LDFLAGS: -lshlwapi -lrpcrt4
  //
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
---- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig	2018-09-01 09:55:54.181581000 +0200
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go	2018-09-01 10:04:02.182929000 +0200
-@@ -12,11 +12,9 @@
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig	2019-02-17 09:42:30.035331000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go	2019-02-17 09:45:41.259439000 +0100
+@@ -26,11 +26,9 @@
  	"github.com/knz/go-libedit/unix/sigtramp"
  )
  
 -// #cgo openbsd netbsd freebsd dragonfly darwin LDFLAGS: -ledit
 -// #cgo openbsd netbsd freebsd dragonfly darwin CPPFLAGS: -Ishim
 -// #cgo linux LDFLAGS: -lncurses
--// #cgo linux CFLAGS: -Wno-unused-result
+-// #cgo linux CFLAGS: -Wno-unused-result -Wno-pointer-sign
 -// #cgo linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build -D_GNU_SOURCE
 +// #cgo freebsd linux LDFLAGS: -lncurses
-+// #cgo freebsd linux CFLAGS: -Wno-unused-result
++// #cgo freebsd linux CFLAGS: -Wno-unused-result -Wno-pointer-sign
 +// #cgo freebsd linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build -D_GNU_SOURCE
  // #cgo darwin CPPFLAGS: -D__darwin__=1
  //

cockroach22/cockroach22.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg 2.2.0a20181119
-%define       V_dist 2.2.0-alpha.20181119
+%define       V_opkg 2.2.0a20190211
+%define       V_dist 2.2.0-alpha.20190211
 
 #   package information
 Name:         cockroach22
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Database
 License:      Apache
 Version:      %{V_opkg}
-Release:      20181204
+Release:      20190217
 
 #   list of sources
 Source0:      https://binaries.cockroachdb.com/cockroach-v%{V_dist}.src.tgz
@@ -76,7 +76,7 @@ Provides:     cockroachdb = %{version}
     prog cockroach22:snapshot = {
         version   = %{V_dist}
         url       = https://www.cockroachlabs.com/docs/releases/
-        regex     = cockroach-v(2\.2.0-(?:alpha|beta|rc).\d+)\.src\.tgz
+        regex     = cockroach-v(2\.2\.0-(?:alpha|beta|rc).\d+)\.src\.tgz
     }
 
 %prep