From 4acf9793cda5060145d9868afc010dcd70e3b9f1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Nov 16 2019 21:32:54 +0000
Subject: 0.116


---

diff --git a/sources b/sources
index ab20d92..1a3512b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sugar-0.114.tar.xz) = ae0a98e0075d5f5a7e26251ef67409bddd2f3f5aeeb2b0d8ae96ffa02c17c0f957b11539af65dccb5234e61bcffeab1ceaa9727fb41b8dd9d2f3cc5a8559ab2d
+SHA512 (sugar-0.116.tar.xz) = 825a54cf3e865e57d82526ec68d7d91a44e9035a17d3b97e8e3f34d5e6c2d5e7d33f9fffd1a8d56fcc6d222222f843477c93bb77c2da88f8195124fa1dba55f3
diff --git a/sugar-0.116-config-empy-fix.patch b/sugar-0.116-config-empy-fix.patch
new file mode 100644
index 0000000..bc12863
--- /dev/null
+++ b/sugar-0.116-config-empy-fix.patch
@@ -0,0 +1,12 @@
+--- sugar-0.116/configure.ac.orig	2019-11-15 17:07:22.109579679 -0800
++++ sugar-0.116/configure.ac	2019-11-15 17:06:53.796797655 -0800
+@@ -15,7 +15,7 @@
+ PYTHON=python3
+ AM_PATH_PYTHON
+ 
+-AC_PATH_PROGS([EMPY], [empy empy3])
++AC_PATH_PROGS([EMPY], [empy empy3], [/usr/lib/python3.8/site_packages/em.py])
+ if test -z "$EMPY"; then
+ 	AC_MSG_ERROR([empy is required])
+ fi
+
diff --git a/sugar.spec b/sugar.spec
index bdbf861..24674f2 100644
--- a/sugar.spec
+++ b/sugar.spec
@@ -6,13 +6,14 @@
 
 Summary: Constructionist learning platform
 Name:    sugar
-Version: 0.114
+Version: 0.116
 Release: 1%{?dist}
 URL:     http://sugarlabs.org/
 License: GPLv2+
 
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.xz
 Patch0:  sugar-gnomekeyring.patch
+Patch1:  sugar-0.116-config-empy-fix.patch
 
 BuildRequires: gcc
 BuildRequires: dconf-devel
@@ -24,7 +25,8 @@ BuildRequires: gtksourceview3-devel
 BuildRequires: intltool
 BuildRequires: perl-XML-Parser
 BuildRequires: pkgconfig
-BuildRequires: python2-devel
+BuildRequires: python3-devel
+BuildRequires: python3-empy
 
 Requires: avahi-tools
 Requires: dbus-x11
@@ -40,8 +42,8 @@ Requires: metacity
 Requires: NetworkManager
 Requires: openssh
 Requires: polkit
-Requires: python2-gwebsockets
-Requires: python2-telepathy
+Requires: python3-gwebsockets
+Requires: python3-telepathy
 Requires: sugar-artwork
 Requires: sugar-toolkit-gtk3
 Requires: telepathy-mission-control
@@ -158,12 +160,14 @@ This is the Sugar Web Account control panel
 %autosetup -p1
 
 %build
+autoreconf
 %configure
 %make_build
 
 %install
 %make_install
 mkdir %{buildroot}/%{_datadir}/sugar/activities
+rm -rf %{buildroot}/%{_datadir}/sugar/extensions/cpsection/__pycache__/
 
 %find_lang %{name}
 
@@ -175,7 +179,7 @@ mkdir %{buildroot}/%{_datadir}/sugar/activities
 %{_datadir}/mime/packages/sugar.xml
 %{_datadir}/xsessions/sugar.desktop
 
-%{python2_sitelib}/*
+%{python3_sitelib}/*
 
 %dir %{_datadir}/sugar
 %dir %{_datadir}/sugar/activities
@@ -228,6 +232,9 @@ mkdir %{buildroot}/%{_datadir}/sugar/activities
 %{_datadir}/sugar/extensions/cpsection/webaccount
 
 %changelog
+* Sat Nov 16 2019 Peter Robinson <pbrobinson@fedoraproject.org> 0.116-1
+- Update to 0.116 release
+
 * Wed Aug 28 2019 Peter Robinson <pbrobinson@fedoraproject.org> 0.114-1
 - Update to 0.114 release