From edee53f6f2d55f6e721bbf2c1a696b6ee45c49d3 Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Tue, 28 Mar 2017 13:37:41 -0400 Subject: [PATCH 01/11] Added rpm build script ( Untested. ) --- assets/packaging/micro.1 | 56 +++++++++++++++++++++++++ tools/build-deb.sh | 5 ++- tools/build-rpm.sh | 88 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 assets/packaging/micro.1 create mode 100755 tools/build-rpm.sh diff --git a/assets/packaging/micro.1 b/assets/packaging/micro.1 new file mode 100644 index 00000000..ccd1822e --- /dev/null +++ b/assets/packaging/micro.1 @@ -0,0 +1,56 @@ +.\" micro manual page - micro(1) +.\" +.\" Copyright © 2017 Zachary Yedidia +.\" Copyright © 2017 Collin Warren +.\" +.\" This document is provided under the same licensing as micro. +.\" See \usr\share\doc\micro\LICENSE for more information. +.TH micro 1 "2017-03-28" +.SH NAME +micro \- An intuitive and modern terminal text editor +. +.SH SYNOPSIS +.B micro +.RB [] +[ +.I "filename \&..." +] +.SH DESCRIPTION +( Copied from the README file. ) + +Micro is a terminal-based text editor that aims to be easy to use and intuitive, while also taking advantage of the full capabilities +of modern terminals. It comes as one single, batteries-included, static binary with no dependencies. + +As the name indicates, micro aims to be somewhat of a successor to the nano editor by being easy to install and use in a pinch, but micro also aims to be +enjoyable to use full time, whether you work in the terminal because you prefer it (like me), or because you need to (over ssh). + +.SH OPTIONS +.B \-v --version +Displays the current version of micro and the git commit hash. +.TP +.SH ENVIRONMENT +Micro's behaviour can be changed by setting environment variables, of which +there is currently only one: +.I MICRO_TRUE_COLOR + +When MICRO_TRUE_COLOR is set to 1, micro will attempt to treat your terminal as +a true-color terminal and will be able to make full use of the true-color colorschemes +that are included with micro. If MICRO_TRUE_COLOR is not set or is set to 0, then +micro will only make use of 256 color features and will internally map true-color +colorschemes to the nearest colors available. For more information see micro's documentation. + +.SH NOTICE +This manpage is intended only to serve as a quick guide to the invocation of +micro and is not intended to replace the full documentation included with micro +which can be accessed from within micro. Micro tells you what key combination to +press to get help in the lower right. + +.SH BUGS +A comprehensive list of bugs will not be listed in this manpage. See the Github +page at \fBhttps://github.com/zyedidia/micro/issues\fP for a list of known bugs +and to report any newly encountered bugs you may find. We strive to correct +bugs as swiftly as possible. + +.SH COPYRIGHT +Copyright \(co 2017 Zachary Yedidia, Collin Warren, et al. +See /usr/share/doc/micro/LICENSE and /usr/share/doc/micro/AUTHORS for more information. diff --git a/tools/build-deb.sh b/tools/build-deb.sh index 95536c8d..62fc031a 100755 --- a/tools/build-deb.sh +++ b/tools/build-deb.sh @@ -24,6 +24,9 @@ function installFiles() { cp ../LICENSE $TO cp ../LICENSE-THIRD-PARTY $TO cp ../README.md $TO + gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz + cp ../assets/packaging/micro.desktop $1/$2/usr/share/applications/ + cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg } version=$1 @@ -39,7 +42,7 @@ echo "Beginning package build process" PKGPATH="../packages/deb" -rm -fr ../packages +rm -fr $PKGPATH mkdir -p $PKGPATH/amd64/DEBIAN/ mkdir -p $PKGPATH/i386/DEBIAN/ diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh new file mode 100755 index 00000000..3b038258 --- /dev/null +++ b/tools/build-rpm.sh @@ -0,0 +1,88 @@ + +#Builds two .rpm packages, for x86 (i386) and amd64 (amd64) +#Based on the build-deb.sh but for rpm instead + +function BuildRPMSpec() { +dategenerated = date +%F_%H:%M +echo Name: micro +echo Version: $2 +echo Release: 1 +echo "Summary: A feature-rich terminal text editor" +echo URL: https://micro-editor.github.io +echo "Packager: Zachary Yedidia " +echo License: MIT +echo ExclusiveArch: $1 +echo "Group: Applications/Editors" +echo "%description" +echo "A modern and intuitive terminal-based text editor." +echo " This package contains a modern alternative to other terminal-based" +echo " Editors. It is easy to use, supports mouse input, and is customizable" +echo " via themes and plugins." +echo "%install" +echo "mkdir -p /usr/share/doc/micro" +echo "install -m 755 micro /usr/bin/micro" +echo "install -m 744 AUTHORS /usr/share/doc/micro/AUTHORS" +echo "install -m 744 LICENSE /usr/share/doc/micro/LICENSE" +echo "install -m 744 LICENSE-THIRD-PARTY /usr/share/doc/micro/LICENSE-THIRD-PARTY" +echo "install -m 744 README.md /usr/share/doc/micro/README.md" +echo "install -m 744 micro.1.gz /usr/share/man/man1/micro.1.gz" +echo "install -m 744 micro.desktop /usr/share/applications/micro.desktop" +echo "install -m 744 micro.svg /usr/share/icons/micro.svg" +echo "%files" +echo "/usr/bin/micro" +echo "/usr/share/doc/micro" +echo "/usr/share/doc/micro/AUTHORS" +echo "/usr/share/doc/micro/LICENSE" +echo "/usr/share/doc/micro/LICENSE-THIRD-PARTY" +echo "/usr/share/doc/micro/README.md" +echo "/usr/share/man/man1/micro.1.gz" +echo "/usr/share/applications/micro.desktop" +echo "/usr/share/icons/micro.svg" +echo "%changelog" +echo "Version: $1-$2" +echo "Auto generated on $dategenerated by $USER@$HOSTNAME" +} + +function installFiles() { +TO="$1/$2/usr/share/doc/micro/" +mkdir -p $TO +cp ../AUTHORS $TO +cp ../LICENSE $TO +cp ../LICENSE-THIRD-PARTY $TO +cp ../README.md $TO +gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz +cp ../assets/packaging/micro.deskto $1/$2/usr/share/applications/ +cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg +} + +version=$1 +if [ "$1" == "" ] +then + version=$(go run build-version.go) +fi +echo "Building packages for Version '$version'" +echo "Running Cross-Compile" +./cross-compile.sh $version + +echo "Beginning package build process" + +PKGPATH="../packages/rpm" + +rm -fr $PKGPATH +mkdir -p $PKGPATH/amd64/ +mkdir -p $PKGPATH/i386/ + +buildRPMSpec "amd64" "$version" > "$PKGPATH/amd64/micro-$version-amd64.spec" +tar -xzf "../binaries/micro-$version-linux.tar.gz" "micro-$version/micro" +mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin" + +buildRPMSpec "i386" "$version" > "$PKGPATH/i386/micro-$version-i386.spec" +tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" +mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" + +rm -rf "micro-$version" +installFiles $PKGPATH "amd64" +installFiles $PKGPATH "i386" + +rpmbuild -bb --buildroot $PKGPATH/amd64 $PKGPATH/amd64/micro-$version-amd64.spec +rpmbuild -bb --buildroot $PKGPATH/i386 $PKGPATH/i386/micro-$version-i386.spec From 7bc870e72fcaa1319e2b004939bd342da4713994 Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Tue, 28 Mar 2017 13:39:47 -0400 Subject: [PATCH 02/11] Added a desktop specification. ( micro.desktop ) --- assets/packaging/micro.desktop | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 assets/packaging/micro.desktop diff --git a/assets/packaging/micro.desktop b/assets/packaging/micro.desktop new file mode 100644 index 00000000..90db584d --- /dev/null +++ b/assets/packaging/micro.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] + +Name=Micro %U +GenericName=Text Editor +Comment=Edit text files in a terminal + +Icon=micro +Type=Application +Categories=terminal;TextEditor; +Keywords=text;editor;syntax;terminal; + +Exec=micro +StartupNotify=false +Terminal=True +MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff; From d8aab386f1af5bde2c765e518103b0f81f376864 Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Tue, 28 Mar 2017 14:05:17 -0400 Subject: [PATCH 03/11] Stuff and things and stuff. --- tools/build-rpm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh index 3b038258..8385c91b 100755 --- a/tools/build-rpm.sh +++ b/tools/build-rpm.sh @@ -20,7 +20,7 @@ echo " Editors. It is easy to use, supports mouse input, and is customizable" echo " via themes and plugins." echo "%install" echo "mkdir -p /usr/share/doc/micro" -echo "install -m 755 micro /usr/bin/micro" +echo "install -m 755 micro /usr/local/bin/micro" echo "install -m 744 AUTHORS /usr/share/doc/micro/AUTHORS" echo "install -m 744 LICENSE /usr/share/doc/micro/LICENSE" echo "install -m 744 LICENSE-THIRD-PARTY /usr/share/doc/micro/LICENSE-THIRD-PARTY" @@ -29,7 +29,7 @@ echo "install -m 744 micro.1.gz /usr/share/man/man1/micro.1.gz" echo "install -m 744 micro.desktop /usr/share/applications/micro.desktop" echo "install -m 744 micro.svg /usr/share/icons/micro.svg" echo "%files" -echo "/usr/bin/micro" +echo "/usr/local/bin/micro" echo "/usr/share/doc/micro" echo "/usr/share/doc/micro/AUTHORS" echo "/usr/share/doc/micro/LICENSE" From e23d4d8fa1bd367b6015e90ff1c76a9caca7603c Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Wed, 29 Mar 2017 05:36:09 -0500 Subject: [PATCH 04/11] Added scalable logo for packaging. --- assets/logo.svg | 63 ++++++++++++++++++++++++++++++++++++++++++++++ tools/build-rpm.sh | 11 +++++--- 2 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 assets/logo.svg diff --git a/assets/logo.svg b/assets/logo.svg new file mode 100644 index 00000000..900e18cc --- /dev/null +++ b/assets/logo.svg @@ -0,0 +1,63 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh index 8385c91b..2c865dd1 100755 --- a/tools/build-rpm.sh +++ b/tools/build-rpm.sh @@ -9,7 +9,7 @@ echo Version: $2 echo Release: 1 echo "Summary: A feature-rich terminal text editor" echo URL: https://micro-editor.github.io -echo "Packager: Zachary Yedidia " +echo "Packager: Zachary Yedidia \" echo License: MIT echo ExclusiveArch: $1 echo "Group: Applications/Editors" @@ -46,12 +46,15 @@ echo "Auto generated on $dategenerated by $USER@$HOSTNAME" function installFiles() { TO="$1/$2/usr/share/doc/micro/" mkdir -p $TO +mkdir -p "$1/$2/usr/share/man/man1/micro.1.gz" +mkdir -p "$1/$2/usr/share/applications/" +mkdir -p "$1/$2/usr/share/icons/" cp ../AUTHORS $TO cp ../LICENSE $TO cp ../LICENSE-THIRD-PARTY $TO cp ../README.md $TO gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz -cp ../assets/packaging/micro.deskto $1/$2/usr/share/applications/ +cp ../assets/packaging/micro.desktop $1/$2/usr/share/applications/ cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg } @@ -73,10 +76,12 @@ mkdir -p $PKGPATH/amd64/ mkdir -p $PKGPATH/i386/ buildRPMSpec "amd64" "$version" > "$PKGPATH/amd64/micro-$version-amd64.spec" +buildRPMSpec "amd64" "$version" tar -xzf "../binaries/micro-$version-linux.tar.gz" "micro-$version/micro" mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin" buildRPMSpec "i386" "$version" > "$PKGPATH/i386/micro-$version-i386.spec" +buildRPMSpec "i386" "$version" tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" @@ -85,4 +90,4 @@ installFiles $PKGPATH "amd64" installFiles $PKGPATH "i386" rpmbuild -bb --buildroot $PKGPATH/amd64 $PKGPATH/amd64/micro-$version-amd64.spec -rpmbuild -bb --buildroot $PKGPATH/i386 $PKGPATH/i386/micro-$version-i386.spec +rpmbuild -bb --buildroot $PKGPATH/i386 $PKGPATH/i386/micro-$version-i386.spec \ No newline at end of file From 1fb405afd36f088e732676ad38926ce13074874a Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Wed, 29 Mar 2017 07:28:14 -0400 Subject: [PATCH 05/11] Tweaked build-deb script --- tools/build-deb.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build-deb.sh b/tools/build-deb.sh index 62fc031a..989a8b0d 100755 --- a/tools/build-deb.sh +++ b/tools/build-deb.sh @@ -21,6 +21,8 @@ echo " and it supports mouse input" function installFiles() { TO="$1/$2/usr/share/doc/micro/" mkdir -p $TO + mkdir -p "$1/$2/usr/share/applications/" + mkdir -p "$1/$2/usr/share/icons/" cp ../LICENSE $TO cp ../LICENSE-THIRD-PARTY $TO cp ../README.md $TO From 45992a0e0a2f450c8e98e773c59b84b91c83ec3b Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Wed, 29 Mar 2017 08:39:50 -0400 Subject: [PATCH 06/11] Fixed mistake in desktop file --- assets/packaging/micro.desktop | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/packaging/micro.desktop b/assets/packaging/micro.desktop index 90db584d..076a5350 100644 --- a/assets/packaging/micro.desktop +++ b/assets/packaging/micro.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=Micro %U +Name=Micro GenericName=Text Editor Comment=Edit text files in a terminal @@ -9,7 +9,7 @@ Type=Application Categories=terminal;TextEditor; Keywords=text;editor;syntax;terminal; -Exec=micro +Exec=micro %U StartupNotify=false -Terminal=True +Terminal=true MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff; From e52d05113e40c1abd064f80c958ddd4f63982d0f Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Wed, 29 Mar 2017 08:42:28 -0400 Subject: [PATCH 07/11] Added AUTHORS file for documentation --- AUTHORS | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..66bdac33 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,9 @@ +Zachary Yedidia +Collin Warren + +Github users: + + +For license and copyright information, see LICENSE instead. +Thank you from all of us for using micro. And thank you to everyone who +contributes, from bug reports to commits. From 4a45e69eb1faa0502e621d31741e02ac9be34a3e Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Wed, 29 Mar 2017 08:56:25 -0400 Subject: [PATCH 08/11] Properly include the man page --- tools/build-deb.sh | 1 + tools/build-rpm.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/build-deb.sh b/tools/build-deb.sh index 989a8b0d..6a8e53f6 100755 --- a/tools/build-deb.sh +++ b/tools/build-deb.sh @@ -21,6 +21,7 @@ echo " and it supports mouse input" function installFiles() { TO="$1/$2/usr/share/doc/micro/" mkdir -p $TO + mkdir -p "$1/$2/usr/share/man/man1/" mkdir -p "$1/$2/usr/share/applications/" mkdir -p "$1/$2/usr/share/icons/" cp ../LICENSE $TO diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh index 2c865dd1..edbb2ddd 100755 --- a/tools/build-rpm.sh +++ b/tools/build-rpm.sh @@ -46,7 +46,7 @@ echo "Auto generated on $dategenerated by $USER@$HOSTNAME" function installFiles() { TO="$1/$2/usr/share/doc/micro/" mkdir -p $TO -mkdir -p "$1/$2/usr/share/man/man1/micro.1.gz" +mkdir -p "$1/$2/usr/share/man/man1/" mkdir -p "$1/$2/usr/share/applications/" mkdir -p "$1/$2/usr/share/icons/" cp ../AUTHORS $TO @@ -90,4 +90,4 @@ installFiles $PKGPATH "amd64" installFiles $PKGPATH "i386" rpmbuild -bb --buildroot $PKGPATH/amd64 $PKGPATH/amd64/micro-$version-amd64.spec -rpmbuild -bb --buildroot $PKGPATH/i386 $PKGPATH/i386/micro-$version-i386.spec \ No newline at end of file +rpmbuild -bb --buildroot $PKGPATH/i386 $PKGPATH/i386/micro-$version-i386.spec From c3861955e0d3a026a4a38ca053992256068aeaed Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Wed, 29 Mar 2017 11:31:58 -0400 Subject: [PATCH 09/11] Added arm packaging to the scripts --- tools/build-deb.sh | 8 ++++++++ tools/build-rpm.sh | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/tools/build-deb.sh b/tools/build-deb.sh index 6a8e53f6..c09124f1 100755 --- a/tools/build-deb.sh +++ b/tools/build-deb.sh @@ -48,6 +48,7 @@ PKGPATH="../packages/deb" rm -fr $PKGPATH mkdir -p $PKGPATH/amd64/DEBIAN/ mkdir -p $PKGPATH/i386/DEBIAN/ +mkdir -p $PKGPATH/arm/DEBIAN/ getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro" @@ -59,10 +60,17 @@ tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" mkdir -p $PKGPATH/i386/usr/local/bin/ mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" +getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control +tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro" +mkdir -p $PKGPATH/arm/usr/local/bin +mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin" + rm -rf "micro-$version" installFiles $PKGPATH "amd64" installFiles $PKGPATH "i386" +installFiles $PKGPATH "arm" dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb" dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb" +dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb" diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh index edbb2ddd..5eeb596c 100755 --- a/tools/build-rpm.sh +++ b/tools/build-rpm.sh @@ -3,15 +3,22 @@ #Based on the build-deb.sh but for rpm instead function BuildRPMSpec() { -dategenerated = date +%F_%H:%M +dategenerated=$(date +%F_%H:%M) echo Name: micro -echo Version: $2 +echo Version: $(echo $2 | tr "-" "." ) echo Release: 1 echo "Summary: A feature-rich terminal text editor" echo URL: https://micro-editor.github.io echo "Packager: Zachary Yedidia \" echo License: MIT -echo ExclusiveArch: $1 +if [ $1 == "amd64" ] +then +echo BuildArch: "x86_64" +fi +if [ $1 == "i386" ] +then +echo BuildArch: "x86" +fi echo "Group: Applications/Editors" echo "%description" echo "A modern and intuitive terminal-based text editor." @@ -39,8 +46,8 @@ echo "/usr/share/man/man1/micro.1.gz" echo "/usr/share/applications/micro.desktop" echo "/usr/share/icons/micro.svg" echo "%changelog" -echo "Version: $1-$2" -echo "Auto generated on $dategenerated by $USER@$HOSTNAME" +echo "*Version: $1-$2" +echo "*Auto generated on $dategenerated by $USER@$HOSTNAME" } function installFiles() { @@ -74,20 +81,31 @@ PKGPATH="../packages/rpm" rm -fr $PKGPATH mkdir -p $PKGPATH/amd64/ mkdir -p $PKGPATH/i386/ +mkdir -p $PKGPATH/arm/ -buildRPMSpec "amd64" "$version" > "$PKGPATH/amd64/micro-$version-amd64.spec" -buildRPMSpec "amd64" "$version" -tar -xzf "../binaries/micro-$version-linux.tar.gz" "micro-$version/micro" +BuildRPMSpec "amd64" "$version" > "$PKGPATH/amd64/micro-$version-amd64.spec" +#BuildRPMSpec "amd64" "$version" +tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro" +mkdir -p $PKGPATH/amd64/usr/local/bin/ mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin" -buildRPMSpec "i386" "$version" > "$PKGPATH/i386/micro-$version-i386.spec" -buildRPMSpec "i386" "$version" +BuildRPMSpec "i386" "$version" > "$PKGPATH/i386/micro-$version-i386.spec" +#BuildRPMSpec "i386" "$version" tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" +mkdir -p $PKGPATH/i386/usr/local/bin/ mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" +BuildRPMSpec "arm" "$version" > "$PKGPATH/arm/micro-$version-arm.spec" +tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro" +mkdir -p $PKGPATH/arm/usr/local/bin +mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin" + rm -rf "micro-$version" + installFiles $PKGPATH "amd64" installFiles $PKGPATH "i386" +installFiles $PKGPATH "arm" rpmbuild -bb --buildroot $PKGPATH/amd64 $PKGPATH/amd64/micro-$version-amd64.spec rpmbuild -bb --buildroot $PKGPATH/i386 $PKGPATH/i386/micro-$version-i386.spec +rpmbuild -bb --buildroot $PKGPATH/arm $PKGPATH/arm/micro/$version-arm.spec From 6041e063e253a05c00459c7d8e83f3c6261111e0 Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Fri, 31 Mar 2017 05:22:32 -0400 Subject: [PATCH 10/11] Added script for rpm and template rpmspec --- tools/build-deb.sh | 30 ++++---- tools/build-packages.sh | 107 +++++++++++++++++++++++++++++ tools/build-rpm.sh | 148 +++++++++++++--------------------------- tools/compile-linux.sh | 32 +++++++++ tools/micro.spec | 71 +++++++++++++++++++ 5 files changed, 272 insertions(+), 116 deletions(-) create mode 100755 tools/build-packages.sh create mode 100755 tools/compile-linux.sh create mode 100644 tools/micro.spec diff --git a/tools/build-deb.sh b/tools/build-deb.sh index c09124f1..6e3755ba 100755 --- a/tools/build-deb.sh +++ b/tools/build-deb.sh @@ -1,7 +1,5 @@ -# Builds two .deb packages, for x86 (i386) and x86_64 (amd64) -# These packages are the bare minimum, which means that they can be installed -# But they do not feature everything yet. -# This does not mean that the editor itself is affected. +# Builds three .deb packages, for x86 (i386) and x86_64 (amd64) and arm (arm) +# These packages include a manpage, an icon, and a desktop file. function getControl() { echo Section: editors @@ -34,17 +32,17 @@ function installFiles() { version=$1 if [ "$1" == "" ] -then - version=$(go run build-version.go) + then + version=$(go run build-version.go | tr "-" ".") fi echo "Building packages for Version '$version'" -echo "Running Cross-Compile" -./cross-compile.sh $version - +echo "Compiling." +./compile-linux.sh $version + echo "Beginning package build process" - + PKGPATH="../packages/deb" - + rm -fr $PKGPATH mkdir -p $PKGPATH/amd64/DEBIAN/ mkdir -p $PKGPATH/i386/DEBIAN/ @@ -54,23 +52,23 @@ getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro" mkdir -p $PKGPATH/amd64/usr/local/bin/ mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin/" - + getControl "i386" "$version" > $PKGPATH/i386/DEBIAN/control tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" mkdir -p $PKGPATH/i386/usr/local/bin/ mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" - + getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro" mkdir -p $PKGPATH/arm/usr/local/bin mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin" - + rm -rf "micro-$version" - + installFiles $PKGPATH "amd64" installFiles $PKGPATH "i386" installFiles $PKGPATH "arm" - + dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb" dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb" dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb" diff --git a/tools/build-packages.sh b/tools/build-packages.sh new file mode 100755 index 00000000..8cce1579 --- /dev/null +++ b/tools/build-packages.sh @@ -0,0 +1,107 @@ +#Builds all packages we support + +version=$1 +if [ "$1" == "" ] + then + version=$(go run build-version.go | tr "-" ".") +fi +echo "Building packages for Version '$version'" +echo "Compiling." +./compile-linux.sh $version + +#Build the debs +function installFiles() { + TO="$1/$2/usr/share/doc/micro/" + mkdir -p $TO + mkdir -p "$1/$2/usr/share/man/man1/" + mkdir -p "$1/$2/usr/share/applications/" + mkdir -p "$1/$2/usr/share/icons/" + cp ../LICENSE $TO + cp ../LICENSE-THIRD-PARTY $TO + cp ../README.md $TO + gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz + cp ../assets/packaging/micro.desktop $1/$2/usr/share/applications/ + cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg +} +echo "Starting deb build process" +PKGPATH="../packages/deb" +rm -fr $PKGPATH +mkdir -p $PKGPATH/amd64/DEBIAN/ +mkdir -p $PKGPATH/i386/DEBIAN/ +mkdir -p $PKGPATH/arm/DEBIAN/ + +getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control +tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro" +mkdir -p $PKGPATH/amd64/usr/local/bin/ +mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin/" + +getControl "i386" "$version" > $PKGPATH/i386/DEBIAN/control +tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" +mkdir -p $PKGPATH/i386/usr/local/bin/ +mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" + +getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control +tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro" +mkdir -p $PKGPATH/arm/usr/local/bin +mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin" + +rm -rf "micro-$version" + +installFiles $PKGPATH "amd64" +installFiles $PKGPATH "i386" +installFiles $PKGPATH "arm" + +echo "Building debs" +dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb" +dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb" +dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb" +#Build the RPMS +echo "Starting RPM build process" +PKGPATH="../packages/rpm" + +rm -rf $PKGPATH +mkdir -p $PKGPATH + +versionsplit=$(echo $version | tr "." "\n") +version="" +i=0 +for string in $versionsplit +do + if (("$i" < "2")) + then + version=$(echo $version$string.) + fi + if (("$i" == "2")) + then + version=$(echo $version$string) + fi + if (("$i" == "3")) + then + dev=$(echo $dev$string.) + fi + if (("$i"=="4")) + then + dev=$(echo $dev$string) + fi + let "i+=1" +done +echo "Building the RPM packages" +rpmbuild -bs micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" +rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target x86_64 +rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target i686 +rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target armv7l + +cd .. + +mv x86_64/micro-$version-1.$dev.x86_64.rpm ./ +mv i686/micro-$version-1.$dev.i686.rpm ./ +mv armv7l/micro-$version-1.$dev.armv7l.rpm ./ + +echo "Cleaning up." +rm -rf x86_64 +rm -rf i686 +rm -rf armv7l +rm -rf rpm +rm -rf deb + +echo "Your packages should be ready now. Thank you, have a nice day. :)" diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh index 5eeb596c..235bc164 100755 --- a/tools/build-rpm.sh +++ b/tools/build-rpm.sh @@ -1,111 +1,59 @@ - -#Builds two .rpm packages, for x86 (i386) and amd64 (amd64) -#Based on the build-deb.sh but for rpm instead - -function BuildRPMSpec() { -dategenerated=$(date +%F_%H:%M) -echo Name: micro -echo Version: $(echo $2 | tr "-" "." ) -echo Release: 1 -echo "Summary: A feature-rich terminal text editor" -echo URL: https://micro-editor.github.io -echo "Packager: Zachary Yedidia \" -echo License: MIT -if [ $1 == "amd64" ] -then -echo BuildArch: "x86_64" -fi -if [ $1 == "i386" ] -then -echo BuildArch: "x86" -fi -echo "Group: Applications/Editors" -echo "%description" -echo "A modern and intuitive terminal-based text editor." -echo " This package contains a modern alternative to other terminal-based" -echo " Editors. It is easy to use, supports mouse input, and is customizable" -echo " via themes and plugins." -echo "%install" -echo "mkdir -p /usr/share/doc/micro" -echo "install -m 755 micro /usr/local/bin/micro" -echo "install -m 744 AUTHORS /usr/share/doc/micro/AUTHORS" -echo "install -m 744 LICENSE /usr/share/doc/micro/LICENSE" -echo "install -m 744 LICENSE-THIRD-PARTY /usr/share/doc/micro/LICENSE-THIRD-PARTY" -echo "install -m 744 README.md /usr/share/doc/micro/README.md" -echo "install -m 744 micro.1.gz /usr/share/man/man1/micro.1.gz" -echo "install -m 744 micro.desktop /usr/share/applications/micro.desktop" -echo "install -m 744 micro.svg /usr/share/icons/micro.svg" -echo "%files" -echo "/usr/local/bin/micro" -echo "/usr/share/doc/micro" -echo "/usr/share/doc/micro/AUTHORS" -echo "/usr/share/doc/micro/LICENSE" -echo "/usr/share/doc/micro/LICENSE-THIRD-PARTY" -echo "/usr/share/doc/micro/README.md" -echo "/usr/share/man/man1/micro.1.gz" -echo "/usr/share/applications/micro.desktop" -echo "/usr/share/icons/micro.svg" -echo "%changelog" -echo "*Version: $1-$2" -echo "*Auto generated on $dategenerated by $USER@$HOSTNAME" -} - -function installFiles() { -TO="$1/$2/usr/share/doc/micro/" -mkdir -p $TO -mkdir -p "$1/$2/usr/share/man/man1/" -mkdir -p "$1/$2/usr/share/applications/" -mkdir -p "$1/$2/usr/share/icons/" -cp ../AUTHORS $TO -cp ../LICENSE $TO -cp ../LICENSE-THIRD-PARTY $TO -cp ../README.md $TO -gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz -cp ../assets/packaging/micro.desktop $1/$2/usr/share/applications/ -cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg -} - +#This script builds four rpm packages +#One for x86 (i386) and x86_64 (amd64) and arm (armv7l) +#and one containing the source tarball version=$1 -if [ "$1" == "" ] -then - version=$(go run build-version.go) +if [ "$1" == "" ] + then + version=$(go run build-version.go | tr "-" ".") fi echo "Building packages for Version '$version'" -echo "Running Cross-Compile" -./cross-compile.sh $version - -echo "Beginning package build process" +echo "Compiling." +./compile-linux.sh $version PKGPATH="../packages/rpm" -rm -fr $PKGPATH -mkdir -p $PKGPATH/amd64/ -mkdir -p $PKGPATH/i386/ -mkdir -p $PKGPATH/arm/ +rm -rf $PKGPATH +mkdir -p $PKGPATH +versionsplit=$(echo $version | tr "." "\n") +version="" +i=0 +for string in $versionsplit +do + if (("$i" < "2")) + then + version=$(echo $version$string.) + fi + if (("$i" == "2")) + then + version=$(echo $version$string) + fi + if (("$i" == "3")) + then + dev=$(echo $dev$string.) + fi + if (("$i"=="4")) + then + dev=$(echo $dev$string) + fi + let "i+=1" +done +echo "Starting the packaging process" +#Generate the spec file +cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec -BuildRPMSpec "amd64" "$version" > "$PKGPATH/amd64/micro-$version-amd64.spec" -#BuildRPMSpec "amd64" "$version" -tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/amd64/usr/local/bin/ -mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin" +cd $PKGPATH -BuildRPMSpec "i386" "$version" > "$PKGPATH/i386/micro-$version-i386.spec" -#BuildRPMSpec "i386" "$version" -tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/i386/usr/local/bin/ -mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" +rpmbuild -bs micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" +rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target x86_64 +rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target i686 +rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target armv7l -BuildRPMSpec "arm" "$version" > "$PKGPATH/arm/micro-$version-arm.spec" -tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/arm/usr/local/bin -mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin" +cd .. -rm -rf "micro-$version" +mv x86_64/micro-$version-1.$dev.x86_64.rpm ./ +mv i686/micro-$version-1.$dev.i686.rpm ./ +mv armv7l/micro-$version-1.$dev.armv7l.rpm ./ -installFiles $PKGPATH "amd64" -installFiles $PKGPATH "i386" -installFiles $PKGPATH "arm" - -rpmbuild -bb --buildroot $PKGPATH/amd64 $PKGPATH/amd64/micro-$version-amd64.spec -rpmbuild -bb --buildroot $PKGPATH/i386 $PKGPATH/i386/micro-$version-i386.spec -rpmbuild -bb --buildroot $PKGPATH/arm $PKGPATH/arm/micro/$version-arm.spec +rm -rf x86_64 +rm -rf i686 +rm -rf armv7l diff --git a/tools/compile-linux.sh b/tools/compile-linux.sh new file mode 100755 index 00000000..ebb745fe --- /dev/null +++ b/tools/compile-linux.sh @@ -0,0 +1,32 @@ +# Source tar + +./vendor-src.sh micro-$1-src +cd .. + +mkdir -p binaries +mkdir -p micro-$1 + +mv micro-$1-src.tar.gz binaries +mv micro-$1-src.zip binaries + +cp LICENSE micro-$1 +cp README.md micro-$1 +cp LICENSE-THIRD-PARTY micro-$1 + +HASH="$(git rev-parse --short HEAD)" +VERSION="$(go run tools/build-version.go)" +DATE="$(go run tools/build-date.go)" +ADDITIONAL_GO_LINKER_FLAGS="$(go run tools/info-plist.go $VERSION)" + +echo "Linux 64" +GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +tar -czf micro-$1-linux64.tar.gz micro-$1 +mv micro-$1-linux64.tar.gz binaries +echo "Linux 32" +GOOS=linux GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +tar -czf micro-$1-linux32.tar.gz micro-$1 +mv micro-$1-linux32.tar.gz binaries +echo "Linux arm" +GOOS=linux GOARCH=arm go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +tar -czf micro-$1-linux-arm.tar.gz micro-$1 +mv micro-$1-linux-arm.tar.gz binaries diff --git a/tools/micro.spec b/tools/micro.spec new file mode 100644 index 00000000..e0cdad91 --- /dev/null +++ b/tools/micro.spec @@ -0,0 +1,71 @@ + +%global dev_rev dev.126 + +Name: micro +Version: 1.1.5 +Release: 1.%{dev_rev} +Summary: A feature-rich terminal text editor +URL: https://micro-editor.github.io +Packager: Zachary Yedidia +License: MIT +Group: Applications/Editors +Source0: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-src.tar.gz + +# disable debuginfo, using prebuilt binaries +%global debug_package %{nil} + +## x86_64 section +Source1: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux64.tar.gz +%ifarch x86_64 +%global micro_src -a 1 +%endif + +## x86 section +Source2: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux32.tar.gz +%ifarch %{ix86} +%define micro_src -a 2 +%endif + +## x86 section +Source3: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux-arm.tar.gz +%ifarch %{arm} +%define micro_src -a 3 +%endif + +%description +A modern and intuitive terminal-based text editor. + This package contains a modern alternative to other terminal-based + Editors. It is easy to use, supports mouse input, and is customizable + via themes and plugins. + + +%prep +%setup -q -n %{name} %{?micro_src} + + +%build +# skipped, using pre-built binaries + + +%install +install -D -m 755 micro-%{version}.%{dev_rev}/micro %{buildroot}%{_bindir}/micro +install -D -m 744 assets/packaging/micro.1 %{buildroot}%{_mandir}/man1/micro.1 +install -D -m 744 assets/packaging/micro.desktop %{buildroot}%{_datadir}/applications/micro.desktop +install -D -m 744 assets/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/micro.svg + + +%files +%doc AUTHORS +%doc LICENSE +%doc LICENSE-THIRD-PARTY +%doc README.md +%{_bindir}/micro +%{_mandir}/man1/micro.1* +%{_datadir}/applications/micro.desktop +%{_datadir}/icons/hicolor/scalable/apps/micro.svg + + +%changelog +* Thu Mar 30 2017 Zachary Yedidia +-Version: - +-Auto generated on by rdieter1@localhost.localdomain From e6797e0303f8da5959fa285169e1fb5e5ef94b0d Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Fri, 31 Mar 2017 09:26:12 -0400 Subject: [PATCH 11/11] Packaging scripts passed install test. --- tools/build-packages.sh | 22 ++++++++++++++++++++++ tools/build-rpm.sh | 2 +- tools/compile-linux.sh | 2 ++ tools/micro.spec | 14 +++++++------- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/tools/build-packages.sh b/tools/build-packages.sh index 8cce1579..b827afa7 100755 --- a/tools/build-packages.sh +++ b/tools/build-packages.sh @@ -10,6 +10,21 @@ echo "Compiling." ./compile-linux.sh $version #Build the debs +function getControl() { +echo Section: editors +echo Package: micro +echo Version: $2 +echo Priority: extra +echo Maintainer: \"Zachary Yedidia\" \ +echo Standards-Version: 3.9.8 +echo Homepage: https://micro-editor.github.io/ +echo Architecture: $1 +echo "Description: A modern and intuitive terminal-based text editor" +echo " This package contains a modern alternative to other terminal-based" +echo " Editors. It is easy to Use, highly customizable via themes and plugins" +echo " and it supports mouse input" +} + function installFiles() { TO="$1/$2/usr/share/doc/micro/" mkdir -p $TO @@ -55,6 +70,7 @@ echo "Building debs" dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb" dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb" dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb" + #Build the RPMS echo "Starting RPM build process" PKGPATH="../packages/rpm" @@ -85,6 +101,12 @@ do fi let "i+=1" done + +#Generate the spec file from template +cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"DATE"/"$(date +%F\ %H:%m)"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec + +cd $PKGPATH + echo "Building the RPM packages" rpmbuild -bs micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target x86_64 diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh index 235bc164..f910cb4a 100755 --- a/tools/build-rpm.sh +++ b/tools/build-rpm.sh @@ -39,7 +39,7 @@ do done echo "Starting the packaging process" #Generate the spec file -cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec +cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"DATE"/"$(date +%F\ %H:%m)"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec cd $PKGPATH diff --git a/tools/compile-linux.sh b/tools/compile-linux.sh index ebb745fe..0bdd87de 100755 --- a/tools/compile-linux.sh +++ b/tools/compile-linux.sh @@ -30,3 +30,5 @@ echo "Linux arm" GOOS=linux GOARCH=arm go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro tar -czf micro-$1-linux-arm.tar.gz micro-$1 mv micro-$1-linux-arm.tar.gz binaries + +rm -rf micro-$1 diff --git a/tools/micro.spec b/tools/micro.spec index e0cdad91..95b72d4f 100644 --- a/tools/micro.spec +++ b/tools/micro.spec @@ -2,28 +2,28 @@ %global dev_rev dev.126 Name: micro -Version: 1.1.5 +Version: 1.1.5 Release: 1.%{dev_rev} Summary: A feature-rich terminal text editor URL: https://micro-editor.github.io Packager: Zachary Yedidia License: MIT Group: Applications/Editors -Source0: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-src.tar.gz +Source0: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-src.tar.gz # disable debuginfo, using prebuilt binaries %global debug_package %{nil} ## x86_64 section Source1: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux64.tar.gz -%ifarch x86_64 +%ifarch x86_64 %global micro_src -a 1 %endif ## x86 section Source2: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux32.tar.gz %ifarch %{ix86} -%define micro_src -a 2 +%define micro_src -a 2 %endif ## x86 section @@ -39,7 +39,7 @@ A modern and intuitive terminal-based text editor. via themes and plugins. -%prep +%prep %setup -q -n %{name} %{?micro_src} @@ -67,5 +67,5 @@ install -D -m 744 assets/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable %changelog * Thu Mar 30 2017 Zachary Yedidia --Version: - --Auto generated on by rdieter1@localhost.localdomain +-Version: 1.1.5 +-Auto generated on DATE by rdieter1@localhost.localdomain