leigh123linux pushed to cinnamon-screensaver (f20). "Merge branch 'master' into f20"

[notifications at fedoraproject.org]

From f9b7aae4a6cd36a6a92b47f1836afdca6b758869 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 2 Jun 2015 12:14:03 +0100
Subject: use new license macro


diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index d01cad2..32a4feb 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -80,7 +80,8 @@ desktop-file-install                                     \
 
 
 %files
-%doc AUTHORS NEWS README COPYING
+%doc AUTHORS NEWS README
+%license COPYING COPYING.LIB
 %{_bindir}/cinnamon-screensaver*
 %{_datadir}/applications/cinnamon-screensaver.desktop
 %{_datadir}/dbus-1/services/org.cinnamon.ScreenSaver.service
-- 
cgit v0.10.2


From c2b6e2d8fbe21c432014b4fad27aeff9378e4722 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Wed, 3 Jun 2015 13:20:32 +0100
Subject: split webkit and xscreensaver into an unsupported sub-package


diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index 32a4feb..188c3a7 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -7,7 +7,7 @@
 
 Summary: Cinnamon Screensaver
 Name:    cinnamon-screensaver
-Version: 2.6.1
+Version: 2.6.3
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL:     http://cinnamon.linuxmint.com
@@ -49,14 +49,23 @@ Requires: cinnamon-translations >= 2.6.0
 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
 
-
 %description
 cinnamon-screensaver is a screen saver and locker.
 
+%package unsupported
+Summary: Additional unsupported screensavers
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: xscreensaver-extras
+Requires: xscreensaver-gl-extras
+
+%description unsupported
+This package provides additional unsupported screensavers.
+They are unsupported in fedora due to issues with suspend,
+you may need to use the Esc key to get the unlock screen.
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -66,7 +75,7 @@ echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
 NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure --with-mit-ext=no --without-console-kit
+%configure --with-mit-ext=no
 make V=1 %{?_smp_mflags}
 
 %install
@@ -85,12 +94,18 @@ 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.*
 
+%files unsupported
+%{_datadir}/cinnamon-screensaver/
+
 %changelog
+* Wed Jun 03 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.3-1
+- update to 2.6.3 release
+- split webkit and xscreensaver into an unsupported sub-package
+
 * Mon May 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.1-1
 - update to 2.6.1 release
 
-- 
cgit v0.10.2


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