From e644e1a40c605a02cc284971b1f07ed03f1f944f Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Feb 18 2020 18:00:17 +0000
Subject: Update to 3.35.2


---

diff --git a/.gitignore b/.gitignore
index 27c8f7d..22a22e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@
 /gnome-calendar-3.34.0.tar.xz
 /gnome-calendar-3.34.1.tar.xz
 /gnome-calendar-3.34.2.tar.xz
+/gnome-calendar-3.35.2.tar.xz
diff --git a/0001-Fix-app-ID-outside-devel-profile.patch b/0001-Fix-app-ID-outside-devel-profile.patch
new file mode 100644
index 0000000..a36fee8
--- /dev/null
+++ b/0001-Fix-app-ID-outside-devel-profile.patch
@@ -0,0 +1,31 @@
+From 9766cd1858e380ca3ed5b68e0a5f911d5bb2f801 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Fri, 6 Dec 2019 14:06:41 -0600
+Subject: [PATCH] Fix app ID outside devel profile
+
+We accidentally have a trailing period here except when the Devel
+profile is selected, which is not a valid app ID.
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ecf1dc96..3adc3af4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -46,7 +46,11 @@ else
+   rev = ''
+ endif
+ 
+-application_id = 'org.gnome.Calendar.@0@'.format(profile)
++if profile == ''
++  application_id = 'org.gnome.Calendar'
++else
++  application_id = 'org.gnome.Calendar.@0@'.format(profile)
++endif
+ calendar_buildtype = get_option('buildtype')
+ calendar_debug = calendar_minor_version.is_odd() or calendar_buildtype.contains('debug')
+ enable_tracing = get_option('tracing')
+-- 
+2.24.1
+
diff --git a/gnome-calendar.spec b/gnome-calendar.spec
index 727de1d..ab198fb 100644
--- a/gnome-calendar.spec
+++ b/gnome-calendar.spec
@@ -5,13 +5,17 @@
 %global gtk3_version 3.22.20
 
 Name:           gnome-calendar
-Version:        3.34.2
-Release:        2%{?dist}
+Version:        3.35.2
+Release:        1%{?dist}
 Summary:        Simple and beautiful calendar application designed to fit GNOME 3
 
 License:        GPLv3+
 URL:            https://wiki.gnome.org/Apps/Calendar
-Source0:        https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/3.35/%{name}-%{version}.tar.xz
+
+# Backported from upstream
+Patch0:         0001-Fix-app-ID-outside-devel-profile.patch
+
 # These are all backports of crasher fix PRs by mcatanzaro
 Patch2:         84.patch
 
@@ -70,8 +74,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome
 %{_bindir}/gnome-calendar
 %{_datadir}/applications/org.gnome.Calendar.desktop
 %{_datadir}/dbus-1/services/org.gnome.Calendar.service
-%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Calendar.svg
-%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Calendar-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Calendar*.svg
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Calendar*-symbolic.svg
 %{_datadir}/metainfo/org.gnome.Calendar.appdata.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.calendar.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.calendar.gschema.xml
@@ -81,6 +85,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome
 %{_datadir}/gnome-shell/search-providers/org.gnome.Calendar.search-provider.ini
 
 %changelog
+* Tue Feb 18 2020 Kalev Lember <klember@redhat.com> - 3.35.2-1
+- Update to 3.35.2
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 8bd43cd..f4fabf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-calendar-3.34.2.tar.xz) = 6c69a1ee46a5ccfb4d6d1b7a60932412b486ad4576a4c78c89e03270147e30828ecaca6b5f0e27a741eb9d5ed74ca474ba0ddfb6d044748877b6c9ab7ae023a5
+SHA512 (gnome-calendar-3.35.2.tar.xz) = f4f755df98c9ec886fe27590285e5cfa6bde267807dc8793dc7d2bf9e68bd70fca3ffa60d4b3f0b481c4e97ff2e8eff0657d4c482b3b6ab8c31feed22d7a7971