diff --git a/sources b/sources index 9bcfd5b..acff4d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sugar-0.112.tar.xz) = 499ad52fd7d855d7f8b71f32eaa78c94ec48c00e2c9a690bcb7c8cd6141bc0b534f881e0799910a8da333a2149d23fbe45c8cffba15a65dd2bc48e0e0ac2ce1d +SHA512 (sugar-0.113.tar.xz) = 8093ed2f138bb83252b7d5c48ed76d8683d17055f83194ca3a09e774f651d2eb492438b33636194c6ec1d71ec9f0228ee424209850919e547c788092b41dfea5 diff --git a/sugar-fix-networkManager.patch b/sugar-fix-networkManager.patch deleted file mode 100644 index 6470ef9..0000000 --- a/sugar-fix-networkManager.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 04c63f6dd2b6f10a80376a43c735822f5283bda7 Mon Sep 17 00:00:00 2001 -From: James Cameron -Date: Fri, 20 Apr 2018 14:52:03 +1000 -Subject: [PATCH] Port from NMClient to NM.Client - -Fixes https://bugs.debian.org/857230 ---- - extensions/cpsection/network/model.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py -index 0541f416c..66093141a 100644 ---- a/extensions/cpsection/network/model.py -+++ b/extensions/cpsection/network/model.py -@@ -18,10 +18,10 @@ - import logging - - import gi --gi.require_version('NMClient', '1.0') -+gi.require_version('NM', '1.0') - from gettext import gettext as _ - from gi.repository import Gio --from gi.repository import NMClient -+from gi.repository import NM - - from jarabe.model import network - -@@ -136,4 +136,4 @@ def set_publish_information(value): - settings.set_boolean('publish-gadget', value) - return 0 - --nm_client = NMClient.Client() -+nm_client = NM.Client() - diff --git a/sugar.spec b/sugar.spec index 49bf64b..4325162 100644 --- a/sugar.spec +++ b/sugar.spec @@ -6,14 +6,13 @@ Summary: Constructionist learning platform Name: sugar -Version: 0.112 -Release: 6%{?dist} +Version: 0.113 +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-fix-networkManager.patch BuildRequires: gcc BuildRequires: dconf-devel @@ -25,7 +24,6 @@ BuildRequires: gtksourceview3-devel BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig -BuildRequires: python-unversioned-command BuildRequires: python2-devel Requires: avahi-tools @@ -162,41 +160,18 @@ This is the Sugar Web Account control panel %build %configure -make +%make_build %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make install DESTDIR=%{buildroot} +%make_install mkdir %{buildroot}/%{_datadir}/sugar/activities -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %find_lang %{name} -%post -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || : - -%pre -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || : -fi - -%preun -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || : -fi - %files -f %{name}.lang %license COPYING %config %{_sysconfdir}/dbus-1/system.d/nm-user-settings.conf -%config %{_sysconfdir}/gconf/schemas/sugar.schemas %{_bindir}/sugar* -%{_datadir}/GConf/gsettings/sugar-schemas.convert %{_datadir}/glib-2.0/schemas/org.sugarlabs.gschema.xml %{_datadir}/mime/packages/sugar.xml %{_datadir}/xsessions/sugar.desktop @@ -254,6 +229,9 @@ fi %{_datadir}/sugar/extensions/cpsection/webaccount %changelog +* Tue Apr 16 2019 Peter Robinson 0.113-1 +- Update to sugar 0.113 release + * Sun Feb 03 2019 Fedora Release Engineering - 0.112-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild