[gnome-build-meta/cherry-pick-6dc0fb9c] Fix spelling of GNOME

[Jordan Petridis <jpetridis src gnome org>]

commit ceed925f38b0c67c4908077e345098c59beae806
Author: Jordan Petridis <jpetridis gnome org>
Date:   Sat Aug 22 17:32:08 2020 +0000

    Fix spelling of GNOME
    
    This is part of #291 and appends to 856c075a571119ae40bc98196756602b3ddb0d8f
    
    It also fixes a bug where the orgigin for the ostree repo was still
    set to `GnomeOS` even though we renamed the repo. Now
    `ostree adming upgrade` will work again  works ootb
    
    
    (cherry picked from commit 6dc0fb9cdfb6cb4e55bfbb520146f962cc534973)

 elements/boards/pinebook-pro/image.bst  | 2 +-
 elements/boards/raspberrypi-4/image.bst | 2 +-
 elements/boards/rock64/image.bst        | 2 +-
 elements/vm/image.bst                   | 6 +++---
 files/os-release/issue                  | 2 +-
 files/os-release/issue.net              | 2 +-
 utils/update-local-repo.sh              | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/image.bst b/elements/boards/pinebook-pro/image.bst
index 1e015261..e6dcdf6b 100644
--- a/elements/boards/pinebook-pro/image.bst
+++ b/elements/boards/pinebook-pro/image.bst
@@ -59,7 +59,7 @@ config:
   - |
     ostree admin set-origin --sysroot="%{sysroot}" \
            --index=0 \
-           GnomeOS dummy \
+           gnome-os dummy \
            %{ostree-branch}
 
   - |
diff --git a/elements/boards/raspberrypi-4/image.bst b/elements/boards/raspberrypi-4/image.bst
index df79a4b4..16d49b1f 100644
--- a/elements/boards/raspberrypi-4/image.bst
+++ b/elements/boards/raspberrypi-4/image.bst
@@ -62,7 +62,7 @@ config:
   - |
     ostree admin set-origin --sysroot="%{sysroot}" \
            --index=0 \
-           GnomeOS dummy \
+           gnome-os dummy \
            %{ostree-branch}
 
   - |
diff --git a/elements/boards/rock64/image.bst b/elements/boards/rock64/image.bst
index bc2797c2..41cea243 100644
--- a/elements/boards/rock64/image.bst
+++ b/elements/boards/rock64/image.bst
@@ -59,7 +59,7 @@ config:
   - |
     ostree admin set-origin --sysroot="%{sysroot}" \
            --index=0 \
-           GnomeOS dummy \
+           gnome-os dummy \
            %{ostree-branch}
 
   - |
diff --git a/elements/vm/image.bst b/elements/vm/image.bst
index 2922ec25..a30d4ab0 100644
--- a/elements/vm/image.bst
+++ b/elements/vm/image.bst
@@ -61,12 +61,12 @@ config:
   - |
     ostree admin set-origin --sysroot="%{sysroot}" \
            --index=0 \
-           GnomeOS %{ostree-remote-url} \
+           gnome-os %{ostree-remote-url} \
            %{ostree-branch}
 
   - |
-    # GnomeOS will be provided in /etc
-    ostree remote delete GnomeOS
+    # gnome-os will be provided in /etc
+    ostree remote delete gnome-os
 
   - |
     cp -r "%{sysroot}"/ostree/boot.1/gnome-os/*/*/boot/EFI/ "%{sysroot}/boot/"
diff --git a/files/os-release/issue b/files/os-release/issue
index d7040816..daa3acc8 100644
--- a/files/os-release/issue
+++ b/files/os-release/issue
@@ -1 +1 @@
-Gnome Platform master \n \l
+GNOME Platform master \n \l
diff --git a/files/os-release/issue.net b/files/os-release/issue.net
index d066e40a..7addee53 100644
--- a/files/os-release/issue.net
+++ b/files/os-release/issue.net
@@ -1 +1 @@
-Gnome Platform master %h
+GNOME Platform master %h
diff --git a/utils/update-local-repo.sh b/utils/update-local-repo.sh
index 5c91d263..49030b2d 100755
--- a/utils/update-local-repo.sh
+++ b/utils/update-local-repo.sh
@@ -19,7 +19,7 @@ Key-Type: DSA
 Key-Length: 1024
 Subkey-Type: ELG-E
 Subkey-Length: 1024
-Name-Real: Gnome OS
+Name-Real: GNOME OS
 Expire-Date: 0
 %no-protection
 %commit
@@ -34,7 +34,7 @@ script_dir=$(dirname $0)
 $script_dir/update-repo.sh \
     --gpg-homedir=ostree-gpg \
     --gpg-sign="$(cat ostree-gpg/default-id)" \
-    --collection-id=org.gnome.GnomeOS \
+    --collection-id=org.gnome.gnomeos \
     --target-ref="${ref%-*}-${OSTREE_LAYER}" \
     ostree-repo "${REPO_ELEMENT}" \
     "${ref}"