Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10887118
D8248.id19771.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D8248.id19771.diff
View Options
diff --git a/files/0001-remove-usages-of-git-as-we-use-a-tarball.patch b/files/0001-remove-usages-of-git-as-we-use-a-tarball.patch
deleted file mode 100644
--- a/files/0001-remove-usages-of-git-as-we-use-a-tarball.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 01b61a2f50e92d266b5c833ba9f790fbe190b780 Mon Sep 17 00:00:00 2001
-From: Campbell Jones <git@serebit.com>
-Date: Fri, 3 Jan 2020 19:15:16 -0500
-Subject: [PATCH] remove usages of git as we use a tarball
-
----
- Makefile | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 76da995..33c94a3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,13 +2,12 @@
-
- VERSION = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
- go run tools/build-version.go)
--HASH = $(shell git rev-parse --short HEAD)
- DATE = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
- go run tools/build-date.go)
- ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
- GOARCH=$(shell go env GOHOSTARCH))
- GOBIN ?= $(shell go env GOPATH)/bin
--GOVARS = -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
-+GOVARS = -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
-
- # Builds micro after checking dependencies but without updating the runtime
- build:
-@@ -37,7 +36,6 @@ install-quick:
-
- # Builds the runtime
- runtime:
-- git submodule update --init
- go run runtime/syntax/make_headers.go runtime/syntax
- go build -o tools/bindata ./tools/go-bindata
- tools/bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
---
-2.24.1
-
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,8 @@
name : micro
version : 2.0.1
-release : 14
+release : 15
source :
- - https://github.com/zyedidia/micro/archive/v2.0.1.tar.gz : dabbc94f58f63b2b2c4589cdfc83e265019f3ac02e13654bf91927f4bc6434ec
- - git|https://github.com/zyedidia/go-bindata.git : 9453701aa0dbd20f88145dbd77c6f50937f17a19
+ - git|https://github.com/zyedidia/micro.git : v2.0.1
license : MIT
component : editor
summary : Micro is a terminal-based text editor that aims to be easy to use and intuitive
@@ -17,15 +16,10 @@
rundeps :
- xclip
setup : |
- export GOPATH=$workdir
mkdir -p micro-$version/src/github.com/zyedidia/micro
- tar xf $sources/v$version.tar.gz -C micro-$version/src/github.com/zyedidia/micro --strip-components=1
- cd micro-$version/src/github.com/zyedidia/micro/
- cp -R $sources/go-bindata.git/. tools/go-bindata
- %patch -p1 < $pkgfiles/0001-remove-usages-of-git-as-we-use-a-tarball.patch
+ cp -R $sources/micro.git/. micro-$version/src/github.com/zyedidia/micro/
install : |
export GOPATH=$workdir
cd src/github.com/zyedidia/micro
- go get -u github.com/blang/semver
%make install-all
- install -D -m 00755 $GOPATH/bin/micro $installdir/usr/bin/micro
+ install -Dm00755 $GOPATH/bin/micro $installdir/usr/bin/micro
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>micro</Name>
<Packager>
- <Name>Campbell Jones</Name>
- <Email>dev@serebit.com</Email>
+ <Name>Troy Harvey</Name>
+ <Email>harveydev@protonmail.com</Email>
</Packager>
<License>MIT</License>
<PartOf>editor</PartOf>
@@ -23,12 +23,12 @@
</Files>
</Package>
<History>
- <Update release="14">
- <Date>2020-02-13</Date>
+ <Update release="15">
+ <Date>2020-02-15</Date>
<Version>2.0.1</Version>
<Comment>Packaging update</Comment>
- <Name>Campbell Jones</Name>
- <Email>dev@serebit.com</Email>
+ <Name>Troy Harvey</Name>
+ <Email>harveydev@protonmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Jun 27 2023, 7:13 AM (6 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5803300
Default Alt Text
D8248.id19771.diff (4 KB)
Attached To
Mode
D8248: manually set version and short hash so the plugin manager and plugins work
Attached
Detach File
Event Timeline
Log In to Comment