From dffeb610330f02b33bd5155663c8954e4a958ff8 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Fri, 28 Sep 2018 21:40:14 +0200 Subject: [PATCH] upgrading package: postgresql-walg 0.1.12.20180906 -> 0.1.12.20180928 --- postgresql-walg/postgresql-walg.patch | 47 +++++++++++++++++++++++++++ postgresql-walg/postgresql-walg.spec | 10 +++--- 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 postgresql-walg/postgresql-walg.patch diff --git a/postgresql-walg/postgresql-walg.patch b/postgresql-walg/postgresql-walg.patch new file mode 100644 index 0000000000..1eeef71aed --- /dev/null +++ b/postgresql-walg/postgresql-walg.patch @@ -0,0 +1,47 @@ +Index: src/github.com/wal-g/wal-g/Makefile +--- src/github.com/wal-g/wal-g/Makefile.orig 2018-09-28 21:15:09.000000000 +0200 ++++ src/github.com/wal-g/wal-g/Makefile 2018-09-28 21:33:14.103493000 +0200 +@@ -1,12 +1,14 @@ + CMD_FILES = $(wildcard cmd/wal-g/*.go) + PKG_FILES = $(wildcard *.go) + +-.PHONY : fmt test install all clean ++.PHONY : all + + ifdef GOTAGS + override GOTAGS := -tags $(GOTAGS) + endif + ++all: cmd/wal-g/wal-g ++ + test: cmd/wal-g/wal-g + go list ./... | grep -v 'vendor/' | xargs go vet + go test -v ./walg_test/ +@@ -15,8 +17,6 @@ + fmt: $(CMD_FILES) $(PKG_FILES) + gofmt -s -w $(CMD_FILES) $(PKG_FILES) + +-all: cmd/wal-g/wal-g +- + install: + (cd cmd/wal-g && go install) + +@@ -26,4 +26,4 @@ + (cd cmd/wal-g && go clean) + + cmd/wal-g/wal-g: $(CMD_FILES) $(PKG_FILES) +- (cd cmd/wal-g && go build $(GOTAGS) -ldflags "-X main.BuildDate=`date -u +%Y.%m.%d_%H:%M:%S` -X main.GitRevision=`git rev-parse --short HEAD` -X main.WalgVersion=`git tag -l --points-at HEAD`") ++ (cd cmd/wal-g && go build $(GOTAGS) -x -ldflags "-X main.BuildDate=`date -u +%Y.%m.%d_%H:%M:%S` -X main.GitRevision=000000 -X main.WalgVersion=0") +Index: src/github.com/wal-g/wal-g/build.sh +--- src/github.com/wal-g/wal-g/build.sh.orig 2018-09-28 21:15:09.000000000 +0200 ++++ src/github.com/wal-g/wal-g/build.sh 2018-09-28 21:32:30.421025000 +0200 +@@ -19,9 +19,3 @@ + cd $CWD + + make +-cp ./cmd/wal-g/wal-g ./docker/pg +-docker-compose build +-docker-compose up --exit-code-from pg +-rm -rf vendor/github.com/google/brotli/* +-mv .brotli.tmp/* vendor/github.com/google/brotli/ +-rm -rf .brotli.tmp diff --git a/postgresql-walg/postgresql-walg.spec b/postgresql-walg/postgresql-walg.spec index 840442abea..ff0266f018 100644 --- a/postgresql-walg/postgresql-walg.spec +++ b/postgresql-walg/postgresql-walg.spec @@ -23,7 +23,7 @@ # package version %define V_postgresql_walg_base 0.1.12 -%define V_postgresql_walg_snap 20180906 +%define V_postgresql_walg_snap 20180928 # package information Name: postgresql-walg @@ -36,10 +36,11 @@ Class: EVAL Group: Database License: Apache Version: %{V_postgresql_walg_base}.%{V_postgresql_walg_snap} -Release: 20180906 +Release: 20180928 # list of sources Source0: http://download.openpkg.org/components/versioned/postgresql-walg/postgresql-walg-%{V_postgresql_walg_snap}.tar.xz +Patch0: postgresql-walg.patch # build information BuildPreReq: OpenPKG, openpkg >= 20160101, go @@ -61,12 +62,13 @@ PreReq: postgresql %prep %setup -q -n postgresql-walg + %patch -p0 %build # build program export GOPATH=`pwd` - cd $GOPATH/src/github.com/wal-g/wal-g/cmd/wal-g - go build -x + cd $GOPATH/src/github.com/wal-g/wal-g + sh build.sh %install # create directory hierarchy