Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Commit

Permalink
Revert "Merge pull request #13421 from philwyett-hemi/rpm_dev"
Browse files Browse the repository at this point in the history
This reverts commit 206252c.
  • Loading branch information
iolsen committed Jan 4, 2017
1 parent cc46949 commit 5995d34
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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 Enterprise Linux (RHEL) / CentOS
### Red Hat Linux (Fedora 21 and under, CentOS, Red Hat)

Atom is only available for 64-bit Linux systems.

Expand All @@ -65,12 +65,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
### Fedora 22+

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
Expand Down
8 changes: 2 additions & 6 deletions docs/build-instructions/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,9 @@ To also install the newly built application, use `--create-debian-package` or `-
sudo update-alternatives --config gcc # choose gcc-5 from the list
```

### Fedora
### Fedora / CentOS / RHEL

* `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`
* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`

### Arch

Expand Down
7 changes: 1 addition & 6 deletions resources/linux/redhat/atom.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ URL: https://atom.io/
AutoReqProv: no # Avoid libchromiumcontent.so missing dependency
Prefix: <%= installDir %>

Requires: lsb-core-noarch
%if 0%{?fedora} || 0%{?rhel}
Requires: libXScrnSaver
%else
Requires: libXss1
%endif
Requires: lsb-core-noarch, libXss.so.1

%description
<%= description %>
Expand Down

0 comments on commit 5995d34

Please sign in to comment.