Tag for commit e4445855ac

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVeKZ1AAoJEBu5sftaTG2tB5UP/0ZvsGpixgfFb8VV6jbor320
 pejrxHsa5IBpvrlUE7JPQ2+TAKwQUZ7BIlYlHHU49vHzejpTd7rAEOnIUg5o6gml
 ViEo2KociGsK6kwZgV2lTbr0yM9i5DEUhp+c+uf5QJr73rSfMWYIbpJLNjNEk3ri
 vduL9CfcGiNApABT6YreTlBU5/utr6zoQDij3Wu8XV5/uPcoohnTezr3AuA8id6W
 2PWHSuvu73szv5etE19iIbXundwmISgMwwsQ9baCqI+Qbithg0ANDyrlWlN2v0V9
 mOnJBBJlhFEKfRtnDwtOJAmZGGKbSJBdndXyn6w+KBAJhBlpFa5Xob5DF9ZSLJdm
 t91O5wIgInPmroalX+IRkwGSTdOirUs2gOXU+3pdUYgSe5hSKdnHRKuUzBWzJ8X0
 rCsrp8eIFfxOjde+zO6QnXNTMkaNxFTPRlZ5IzCYw8jW6aNoX4WLHg+am9i6BcbD
 5XgzxvS66g+fETqMBce2gZeDOyIeO/Qd/8ab3MyjmH8+BXbe0opUA0dNVBbsLHrG
 js5vsev7mLH8tiFu7vPdxvlWftyf0xfQtHpMkUcDQKEt/Vkq+9A9tmDCRIaHKnZm
 GOEX1CVf0yHcRlwpEWd29ctYLtJClUqyi1E2H88grc/59rzUUCTB/BBVUv4mojdt
 QfggjOjV+/qPrmv6lD4Q
 =VmGJ
 -----END PGP SIGNATURE-----

Merge tag 'jm_e4445855' into release2

Tag for commit e4445855ac

# gpg: Signature made Wed 10 Jun 2015 11:04:53 PM CEST using RSA key ID 5A4C6DAD
# gpg: Good signature from "Jason Mehring (Qubes OS Signing Key) <nrgaway@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: E0E3 2283 FDCA C1A5 1007  8F27 1BB9 B1FB 5A4C 6DAD

* tag 'jm_e4445855':
  Set a default locale if missing

rpm_spec/core-vm.spec

@@ -267,6 +267,14 @@ if [ ! -f '/etc/sysconfig/ip6tables' ]; then
   cp -p /usr/lib/qubes/init/ip6tables /etc/sysconfig/ip6tables
 fi
 
+%if %{fedora} >= 20
+# Make sure there is a default locale set so gnome-terminal will start
+if [ ! -e /etc/locale.conf ] || ! grep -q LANG /etc/locale.conf; then
+    touch /etc/locale.conf
+    echo "LANG=en_US.utf8" >> /etc/locale.conf
+fi
+%endif
+
 if [ "$1" !=  1 ] ; then
 # do the rest of %post thing only when updating for the first time...
 exit 0