Skip to content

Commit 206252c

Browse files
author
Antonio Scandurra
committed
Merge pull request atom#13421 from philwyett-hemi/rpm_dev
Multiple fixes for RPM and in docs RPM distros.
1 parent baefdda commit 206252c

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Atom is only available for 64-bit Linux systems.
5454
The Linux version does not currently automatically update so you will need to
5555
repeat these steps to upgrade to future releases.
5656

57-
### Red Hat Linux (Fedora 21 and under, CentOS, Red Hat)
57+
### Red Hat Enterprise Linux (RHEL) / CentOS
5858

5959
Atom is only available for 64-bit Linux systems.
6060

@@ -65,12 +65,12 @@ Atom is only available for 64-bit Linux systems.
6565
The Linux version does not currently automatically update so you will need to
6666
repeat these steps to upgrade to future releases.
6767

68-
### Fedora 22+
68+
### Fedora
6969

7070
Atom is only available for 64-bit Linux systems.
7171

7272
1. Download `atom.x86_64.rpm` from the [Atom releases page](https://github.com/atom/atom/releases/latest).
73-
2. Run `sudo dnf install ./atom.x86_64.rpm` on the downloaded package.
73+
2. Run `sudo dnf install atom.x86_64.rpm` on the downloaded package.
7474
3. Launch Atom using the installed `atom` command.
7575

7676
The Linux version does not currently automatically update so you will need to

docs/build-instructions/linux.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,13 @@ To also install the newly built application, use `--create-debian-package` or `-
4949
sudo update-alternatives --config gcc # choose gcc-5 from the list
5050
```
5151

52-
### Fedora / CentOS / RHEL
52+
### Fedora
5353

54-
* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
54+
* `sudo dnf install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
55+
56+
### RHEL / CentOS
57+
58+
* `sudo yum install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
5559

5660
### Arch
5761

resources/linux/redhat/atom.spec.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ URL: https://atom.io/
77
AutoReqProv: no # Avoid libchromiumcontent.so missing dependency
88
Prefix: <%= installDir %>
99

10-
Requires: lsb-core-noarch, libXss.so.1
10+
Requires: lsb-core-noarch
11+
%if 0%{?fedora} || 0%{?rhel}
12+
Requires: libXScrnSaver
13+
%else
14+
Requires: libXss1
15+
%endif
1116

1217
%description
1318
<%= description %>

0 commit comments

Comments
 (0)