leigh123linux pushed to cinnamon-screensaver (f20). "clean patch"

[notifications at fedoraproject.org]

From 7ef9e77dfb1a6bbf9336a70aff331b22519e493d Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 5 May 2015 17:25:35 +0100
Subject: clean patch


diff --git a/.gitignore b/.gitignore
index d945c5b..bccb165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /cinnamon-screensaver-2.4.0.tar.gz
 /cinnamon-screensaver-2.4.1.tar.gz
 /cinnamon-screensaver-2.4.2.tar.gz
+/cinnamon-screensaver-2.5.0.git6ea738d.tar.gz
diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index e6728bf..1fcb39f 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -1,4 +1,4 @@
-#global _internal_version      8de7ff0
+%global _internal_version      6ea738d
 
 %global dbus_glib_version      0.74
 %global redhat_menus_version   5.0.1
@@ -6,8 +6,8 @@
 
 Summary: Cinnamon Screensaver
 Name:    cinnamon-screensaver
-Version: 2.4.2
-Release: 1%{?dist}
+Version: 2.5.0
+Release: 0.1.git%{_internal_version}%{?dist}
 License: GPLv2+ and LGPLv2+
 URL:     http://cinnamon.linuxmint.com
 
@@ -15,13 +15,13 @@ URL:     http://cinnamon.linuxmint.com
 #wget https://github.com/linuxmint/cinnamon-screensaver/archive/%{version}.tar.gz -O cinnamon-screensaver-%{version}.tar.gz
 # for git
 # wget https://github.com/linuxmint/cinnamon-screensaver/tarball/%%{_internal_version} -O cinnamon-screensaver-%%{version}.git%%{_internal_version}.tar.gz
-#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/cinnamon-screensaver-%%{version}.git%%{_internal_version}.tar.gz
-Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz
+Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/cinnamon-screensaver-%{version}.git%{_internal_version}.tar.gz
+#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%%{name}-%%{version}.tar.gz
 
 Patch0:  cinnamon-screensaver-2.20.0-selinux-permit.patch
 
 BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version}
-BuildRequires: pkgconfig(cinnamon-desktop) >= 2.3.0
+BuildRequires: pkgconfig(cinnamon-desktop) >= 2.5.0
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(xscrnsaver)
 BuildRequires: pkgconfig(xmu)
@@ -36,11 +36,14 @@ BuildRequires: desktop-file-utils
 BuildRequires: gnome-common
 BuildRequires: intltool
 BuildRequires: pam-devel
+BuildRequires: webkitgtk4-devel
 
 Requires: cinnamon-translations
 Requires: redhat-menus >= %{redhat_menus_version}
 # since we use it, and pam spams the log if a module is missing
 Requires: gnome-keyring-pam
+Requires: xscreensaver-extras
+Requires: xscreensaver-gl-extras
 Conflicts: xscreensaver < 1:5.00-19
 
 
@@ -48,7 +51,7 @@ Conflicts: xscreensaver < 1:5.00-19
 cinnamon-screensaver is a screen saver and locker.
 
 %prep
-%setup -q
+%setup -q -n linuxmint-%{name}-%{_internal_version}
 %patch0 -p1
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
@@ -74,11 +77,15 @@ desktop-file-install                                     \
 %{_bindir}/cinnamon-screensaver*
 %{_datadir}/applications/cinnamon-screensaver.desktop
 %{_datadir}/dbus-1/services/org.cinnamon.ScreenSaver.service
+%{_datadir}/cinnamon-screensaver/
 %{_libexecdir}/cinnamon-screensaver-dialog
 %config %{_sysconfdir}/pam.d/cinnamon-screensaver
 %{_mandir}/man1/cinnamon-screensaver*.1.*
 
 %changelog
+* Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.0-0.1.git6ea738d
+- update to git snapshot
+
 * Tue Mar 31 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.2-1
 - update to 2.4.2
 
diff --git a/sources b/sources
index 16ecb06..0dba7c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c31feb28156245ddc66eb9137929915d  cinnamon-screensaver-2.4.2.tar.gz
+3a1ecb956bff3da6d2b7d0a34db54eb9  cinnamon-screensaver-2.5.0.git6ea738d.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cinnamon-screensaver.git/commit/?h=f20&id=7ef9e77dfb1a6bbf9336a70aff331b22519e493d