Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8aeb4eddff377004a8eff3682ae71c18e05cf0e3

commit 8aeb4eddff377004a8eff3682ae71c18e05cf0e3
Author: DeX77 <de...@frugalware.org>
Date:   Wed Aug 9 09:40:31 2017 +0200

syncthing-0.14.35-1-x86_64

* version bump

diff --git a/source/network-extra/syncthing/FrugalBuild 
b/source/network-extra/syncthing/FrugalBuild
index f684214..ad6a7d8 100644
--- a/source/network-extra/syncthing/FrugalBuild
+++ b/source/network-extra/syncthing/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: DeX77 <de...@frugalware.org>

pkgname=syncthing
-pkgver=0.14.33
+pkgver=0.14.35
pkgrel=1
pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing"
url="http://syncthing.net/";
@@ -17,30 +17,26 @@ _F_github_tag_v="y"
_F_systemd_units="syncthing="
_F_archive_grepv="beta\|-rc"
Finclude github systemd
-source+=("fix-build.patch")
-sha1sums=('d748faeeda4db6127777f691a617770d12bfbaa3' \
-          '9a529b8e6ebb1fb50596748eb22c2e484e340531')
-_F_cd_path="src/github.com/syncthing/syncthing"
+sha1sums=('8337469f1a058f7a6291d4a9bae34c61f058e07d')

build() {
-       Fpatchall

-       Fexec rm -rf src/github.com/syncthing/
-       Fexec mkdir -p src/github.com/syncthing/
-       Fexec mv "${pkgname}-${pkgver}" src/github.com/syncthing/syncthing
+       Fexec rm -rf src/github.com/syncthing/ || Fdie
+       Fexec mkdir -p src/github.com/syncthing/ || Fdie
+       Fexec mv "${pkgname}-${pkgver}" src/github.com/syncthing/syncthing || 
Fdie

-       Fcd
+       Fexec cd src/github.com/syncthing/syncthing || Fdie

export GOPATH="$Fsrcdir"
export PATH=$PATH:$GOROOT/bin

# cover and vet are installed via go package
-       Fexec sed -i '/cmd\/cover/d' build.go
-        Fexec sed -i '/cmd\/vet/d' build.go
+       Fexec sed -i '/cmd\/cover/d' build.go || Fdie
+        Fexec sed -i '/cmd\/vet/d' build.go || Fdie

-       Fexec go run build.go -version v${pkgver} -no-upgrade
+       Fexec go run build.go -version v${pkgver} -no-upgrade || Fdie

-       Fexe src/github.com/syncthing/syncthing/bin/syncthing /usr/bin/syncthing
+       Fexe src/github.com/syncthing/syncthing/bin/syncthing 
/usr/bin/syncthing || Fdie

Finstallrel 644 etc/linux-systemd/system/syncthing-resume.service 
lib/systemd/system/syncthing-resume.service
Finstallrel 644 etc/linux-systemd/system/syncthing@.service 
lib/systemd/system/syncthing@.service
diff --git a/source/network-extra/syncthing/fix-build.patch 
b/source/network-extra/syncthing/fix-build.patch
deleted file mode 100644
index 54b4952..0000000
--- a/source/network-extra/syncthing/fix-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 414c58174b76adf22c783d04ace5e5caa326de2e Mon Sep 17 00:00:00 2001
-From: Jakob Borg <ja...@kastelo.net>
-Date: Thu, 27 Jul 2017 12:55:07 +0200
-Subject: [PATCH] build: Move -installsuffix behind an explicit option (fixes
- #4272)
-
----
- build.go | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/build.go b/build.go
-index f2d32d890..d8e7f0057 100644
---- a/build.go
-+++ b/build.go
-@@ -44,6 +44,7 @@ var (
-       debug         = os.Getenv("BUILDDEBUG") != ""
-       noBuildGopath bool
-       extraTags     string
-+      installSuffix string
- )
-
- type target struct {
-@@ -340,6 +341,7 @@ func parseFlags() {
-       flag.BoolVar(&race, "race", race, "Use race detector")
-       flag.BoolVar(&noBuildGopath, "no-build-gopath", noBuildGopath, "Don't 
build GOPATH, assume it's OK")
-       flag.StringVar(&extraTags, "tags", extraTags, "Extra tags, space 
separated")
-+      flag.StringVar(&installSuffix, "installsuffix", installSuffix, "Install 
suffix, optional")
-       flag.Parse()
- }
-
-@@ -404,7 +406,9 @@ func install(target target, tags []string) {
-       args := []string{"install", "-v", "-ldflags", ldflags()}
-       if len(tags) > 0 {
-               args = append(args, "-tags", strings.Join(tags, " "))
--              args = append(args, "-installsuffix", strings.Join(tags, "-"))
-+      }
-+      if installSuffix != "" {
-+              args = append(args, "-installsuffix", installSuffix)
-       }
-       if race {
-               args = append(args, "-race")
-@@ -425,7 +429,9 @@ func build(target target, tags []string) {
-       args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
-       if len(tags) > 0 {
-               args = append(args, "-tags", strings.Join(tags, " "))
--              args = append(args, "-installsuffix", strings.Join(tags, "-"))
-+      }
-+      if installSuffix != "" {
-+              args = append(args, "-installsuffix", installSuffix)
-       }
-       if race {
-               args = append(args, "-race")
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to