From af4da948e9aed3d62de3a52992fab5f8c69e5f36 Mon Sep 17 00:00:00 2001 From: Phil Wyett Date: Sat, 10 Dec 2016 15:14:24 +0000 Subject: [PATCH 1/3] Commit... * Correct requires for libXss across Fedora/RedHat (and derivatives) and SUSE. --- resources/linux/redhat/atom.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/linux/redhat/atom.spec.in b/resources/linux/redhat/atom.spec.in index bc2397126..ca9fa290f 100644 --- a/resources/linux/redhat/atom.spec.in +++ b/resources/linux/redhat/atom.spec.in @@ -7,7 +7,12 @@ URL: https://atom.io/ AutoReqProv: no # Avoid libchromiumcontent.so missing dependency Prefix: <%= installDir %> -Requires: lsb-core-noarch, libXss.so.1 +Requires: lsb-core-noarch +%if 0%{?fedora} || 0%{?rhel} +Requires: libXScrnSaver +%else +Requires: libXss1 +%endif %description <%= description %> From 49526593a93cae533696f93e98129c6d1b573e14 Mon Sep 17 00:00:00 2001 From: Phil Wyett Date: Sat, 10 Dec 2016 15:38:15 +0000 Subject: [PATCH 2/3] Commit... * Split instructions for Fedora and RHEL etc. i.e. yum and dnf. * Never use --assumeyes or -y installing packages. atom 1.12.7 shows if this had been done by end users it would have caused them great issue. --- docs/build-instructions/linux.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md index a05bbff16..2a3e76b69 100644 --- a/docs/build-instructions/linux.md +++ b/docs/build-instructions/linux.md @@ -49,9 +49,13 @@ To also install the newly built application, use `--create-debian-package` or `- sudo update-alternatives --config gcc # choose gcc-5 from the list ``` -### Fedora / CentOS / RHEL +### Fedora -* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel` +* `sudo dnf install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel` + +### RHEL / CentOS + +* `sudo yum install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel` ### Arch From 76f08a8f26ffa41c453ecb22e432b2ccf8bddcb7 Mon Sep 17 00:00:00 2001 From: Phil Wyett Date: Sat, 10 Dec 2016 15:46:50 +0000 Subject: [PATCH 3/3] Commit... * Fedora 22 is End Of Life (EOL), so no instructions needed. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dc22ae866..0aff6e44b 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Atom is only available for 64-bit Linux systems. The Linux version does not currently automatically update so you will need to repeat these steps to upgrade to future releases. -### Red Hat Linux (Fedora 21 and under, CentOS, Red Hat) +### Red Hat Enterprise Linux (RHEL) / CentOS Atom is only available for 64-bit Linux systems. @@ -64,12 +64,12 @@ Atom is only available for 64-bit Linux systems. The Linux version does not currently automatically update so you will need to repeat these steps to upgrade to future releases. -### Fedora 22+ +### Fedora Atom is only available for 64-bit Linux systems. 1. Download `atom.x86_64.rpm` from the [Atom releases page](https://github.com/atom/atom/releases/latest). -2. Run `sudo dnf install ./atom.x86_64.rpm` on the downloaded package. +2. Run `sudo dnf install atom.x86_64.rpm` on the downloaded package. 3. Launch Atom using the installed `atom` command. The Linux version does not currently automatically update so you will need to