Merge branch 'jb-45154' into 'master'

Update changelog See merge request mer-core/qemu-usermode!6
sailfishos · Apr 26, 2019 · e322eb0 · e322eb0
2 parents 34c89c8 + 5f54c11
commit e322eb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/qemu-usermode.changes b/qemu-usermode.changes
@@ -1,3 +1,9 @@
+* Mon Apr 8 2019 Aapi Hämäläinen <aapi.hamalainen@jollamobile.com> - 2.1.0-8
+- Update qemu-binfmt-conf.sh from upstream JB#45154
+
+* Thu Mar 14 2019 Sergey Chupligin <s.chupligin@omprussia.ru> - 2.1.0-7
+- Add support glibc > 2.26 JB#45154
+
 * Fri Jan 11 2019 Marko Kenttala <marko.kenttala@jolla.com> - 2.1.0-6
 - Add --disable-smartcard-nss. Contriutes to JB#36180
 

diff --git a/qemu-usermode.spec b/qemu-usermode.spec
@@ -4,7 +4,7 @@
 Name:       qemu-usermode
 Summary:    Universal CPU emulator
 Version:    2.1.0
-Release:    6
+Release:    8
 Group:      System/Emulators/PC
 License:    GPLv2
 ExclusiveArch:  %{ix86}