Merge pull request #529 from atom/master

Create a new pull request by comparing
GulajavaMinistudio · Feb 15, 2021 · 1bab521 · 1bab521
2 parents 19a15df + ff1e4f6
commit 1bab521
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/language-rust-bundled/package.json b/packages/language-rust-bundled/package.json
@@ -11,7 +11,7 @@
   "repository": "https://github.com/atom/atom",
   "license": "MIT",
   "dependencies": {
-    "tree-sitter-rust": "^0.16.0"
+    "tree-sitter-rust": "^0.17.0"
   },
   "engines": {
     "atom": ">=1.0.0 <2.0.0"

diff --git a/resources/linux/redhat/atom.spec.in b/resources/linux/redhat/atom.spec.in
@@ -13,6 +13,11 @@ Requires: lsb-core-noarch, libXss.so.1 libsecret-1.so.0, polkit
 Requires: lsb-core-noarch, libXss.so.1()(64bit) libsecret-1.so.0()(64bit), polkit
 %endif
 
+# Disable Fedora's shebang mangling script,
+# which errors out on any file with versionless `python` in its shebang
+# See: https://github.com/atom/atom/issues/21937
+%undefine __brp_mangle_shebangs
+
 %description
 <%= description %>