From 32de63db63ea5f205b6db315b6a1fcdf8e409baa Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: May 31 2021 17:05:03 +0000
Subject: Update to 5.0.0 release


---

diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index b0308b0..375e07c 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -1,10 +1,11 @@
 Summary: Cinnamon Screensaver
 Name:    cinnamon-screensaver
-Version: 4.8.1
-Release: 2%{?dist}
+Version: 5.0.0
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL:     https://github.com/linuxmint/%{name}
 Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:  %{url}/commit/ba98b56.patch#/fix_desktop_file.patch
 
 BuildRequires: meson
 BuildRequires: intltool
@@ -17,8 +18,8 @@ BuildRequires: gtk3-devel
 BuildRequires: libXext-devel
 BuildRequires: desktop-file-utils
 
-Requires: cinnamon-desktop%{?_isa} >= 4.8.0
-Requires: cinnamon-translations >= 4.8.0
+Requires: cinnamon-desktop%{?_isa} >= 5.0.0
+Requires: cinnamon-translations >= 5.0.0
 Requires: accountsservice-libs%{?_isa}
 Requires: libgnomekbd%{?_isa}
 Requires: python3-gobject%{?_isa}
@@ -52,7 +53,7 @@ desktop-file-install                                     \
   --delete-original                                      \
   --remove-only-show-in=Xfce                             \
   --dir %{buildroot}%{_datadir}/applications             \
-  %{buildroot}%{_datadir}/applications/cinnamon-screensaver.desktop
+  %{buildroot}%{_datadir}/applications/org.cinnamon.ScreenSaver.desktop
 
 # Fix rpmlint errors
 for file in %{buildroot}%{_datadir}/cinnamon-screensaver/{dbusdepot,util,widgets}/*.py; do
@@ -69,7 +70,6 @@ chmod a+x %{buildroot}%{_datadir}/cinnamon-screensaver/pamhelper/authClient.py
 rm %{buildroot}%{_libdir}/libcscreensaver.so
 rm %{buildroot}%{_libdir}/pkgconfig/cscreensaver.pc
 rm %{buildroot}%{_datadir}/gir-1.0/CScreensaver-1.0.gir
-rm %{buildroot}%{_includedir}/cinnamon-screensaver/libcscreensaver/*.h
 
 
 %ldconfig_scriptlets
@@ -80,15 +80,20 @@ rm %{buildroot}%{_includedir}/cinnamon-screensaver/libcscreensaver/*.h
 %license COPYING COPYING.LIB
 %config(noreplace) %{_sysconfdir}/pam.d/cinnamon-screensaver
 %{_bindir}/cinnamon-screensaver*
-%{_datadir}/applications/cinnamon-screensaver.desktop
+%{_bindir}/cinnamon-unlock-desktop
+%{_datadir}/applications/org.cinnamon.ScreenSaver.desktop
 %{_datadir}/cinnamon-screensaver/
 %{_datadir}/dbus-1/services/org.cinnamon.ScreenSaver.service
 %{_datadir}/icons/hicolor/scalable/*/*
 %{_libexecdir}/cinnamon-screensaver-pam-helper
+%{_libexecdir}/cs-backup-locker
 %{_libdir}/libcscreensaver.so.*
 %{_libdir}/girepository-1.0/CScreensaver-1.0.typelib
 
 %changelog
+* Mon May 31 2021 Leigh Scott <leigh123linux@gmail.com> - 5.0.0-1
+- Update to 5.0.0 release
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/fix_desktop_file.patch b/fix_desktop_file.patch
new file mode 100644
index 0000000..07c082e
--- /dev/null
+++ b/fix_desktop_file.patch
@@ -0,0 +1,75 @@
+From ba98b563d26e476fc565810146c6a902509c2922 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 31 May 2021 11:34:43 -0400
+Subject: [PATCH] Clean up the desktop file and rename it so that it passes
+ desktop-file- validate.
+
+---
+ data/cinnamon-screensaver.desktop.in  | 13 -------------
+ data/meson.build                      | 10 +---------
+ data/org.cinnamon.ScreenSaver.desktop |  8 ++++++++
+ 3 files changed, 9 insertions(+), 22 deletions(-)
+ delete mode 100644 data/cinnamon-screensaver.desktop.in
+ create mode 100644 data/org.cinnamon.ScreenSaver.desktop
+
+diff --git a/data/cinnamon-screensaver.desktop.in b/data/cinnamon-screensaver.desktop.in
+deleted file mode 100644
+index 06a9aea..0000000
+--- a/data/cinnamon-screensaver.desktop.in
++++ /dev/null
+@@ -1,13 +0,0 @@
+-[Desktop Entry]
+-Type=Application
+-Name=Screensaver
+-Comment=Launch screensaver and locker program
+-Icon=preferences-desktop-screensaver
+-Exec=cinnamon-screensaver
+-OnlyShowIn=X-Cinnamon;
+-NoDisplay=true
+-X-GNOME-Bugzilla-Bugzilla=GNOME
+-X-GNOME-Bugzilla-Product=cinnamon-screensaver
+-X-GNOME-Bugzilla-Component=general
+-X-GNOME-Bugzilla-Version=@VERSION@
+-DBusActivatable=true
+\ No newline at end of file
+diff --git a/data/meson.build b/data/meson.build
+index 1215f5d..c3852dd 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -5,14 +5,6 @@ if pamdir == ''
+   pamdir = sysconfdir
+ endif
+ 
+-desktop = configure_file(
+-  output: 'cinnamon-screensaver.desktop',
+-  input: 'cinnamon-screensaver.desktop.in',
+-  # meson 0.49
+-  # configuration: { 'VERSION': meson.project_version() }
+-  configuration: misc_conf
+-)
+-
+ dbus_service = configure_file(
+   output: 'org.cinnamon.ScreenSaver.service',
+   input: 'org.cinnamon.ScreenSaver.service.in',
+@@ -34,5 +26,5 @@ else
+   )
+ endif
+ 
+-install_data(desktop, install_dir: join_paths(datadir, 'applications'))
++install_data('org.cinnamon.ScreenSaver.desktop', install_dir: join_paths(datadir, 'applications'))
+ install_data(dbus_service, install_dir: dbus_services_dir)
+diff --git a/data/org.cinnamon.ScreenSaver.desktop b/data/org.cinnamon.ScreenSaver.desktop
+new file mode 100644
+index 0000000..a1234a1
+--- /dev/null
++++ b/data/org.cinnamon.ScreenSaver.desktop
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Type=Application
++Name=Screensaver
++Comment=Launch screensaver and locker program
++Exec=cinnamon-screensaver
++OnlyShowIn=X-Cinnamon;
++NoDisplay=true
++DBusActivatable=true
+\ No newline at end of file
diff --git a/sources b/sources
index f149fea..bed6e6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-screensaver-4.8.1.tar.gz) = 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
+SHA512 (cinnamon-screensaver-5.0.0.tar.gz) = bb22191678162a5f0dd689affb86f40e8b3ba15eb396ca6adb25cf837219cfbe526555ae86230924f6d158b238a396bbb3cf7b72e8f64cfe1d773d7ad754d7a5