diff --git a/.gitignore b/.gitignore index f424742..9009c65 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cinnamon-screensaver-1.8.1.git94ca899.tar.gz /cinnamon-screensaver-1.8.1.git4f741eb.tar.gz /cinnamon-screensaver-1.9.1.tar.gz +/cinnamon-screensaver-2.0.0.tar.gz diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec index f12d136..ceb4180 100644 --- a/cinnamon-screensaver.spec +++ b/cinnamon-screensaver.spec @@ -8,7 +8,7 @@ Summary: Cinnamon Screensaver Name: cinnamon-screensaver -Version: 1.9.1 +Version: 2.0.0 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com @@ -20,7 +20,6 @@ URL: http://cinnamon.linuxmint.com Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz Patch0: cinnamon-screensaver-2.20.0-selinux-permit.patch -Patch1: systemd.patch BuildRequires: gtk3-devel => %{gtk3_version} @@ -58,7 +57,6 @@ cinnamon-screensaver is a screen saver and locker. %prep %setup -q %patch0 -p1 -%patch1 -p1 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac @@ -82,7 +80,6 @@ desktop-file-install \ %doc AUTHORS NEWS README COPYING %{_bindir}/cinnamon-screensaver* # remove conflicting files -%exclude %{_bindir}/gnome-screensaver* %{_datadir}/dbus-1/services/org.cinnamon.ScreenSaver.service %{_libexecdir}/* %config %{_sysconfdir}/pam.d/* @@ -90,8 +87,11 @@ desktop-file-install \ %doc %{_mandir}/man1/*.1.gz %changelog +* Wed Oct 02 2013 Leigh Scott - 2.0.0-1 +- update to 2.0.0 + * Mon Sep 30 2013 Leigh Scott - 1.9.1-1 -- update to 1.9.1 +- 1.9.1 * Sun Sep 15 2013 Leigh Scott - 1.8.1-0.2.git4f741eb - update to latest git diff --git a/sources b/sources index a618d72..ab77a0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14ae21647bc64f9eb6733e426f0929f2 cinnamon-screensaver-1.9.1.tar.gz +b5800a3d4925e599687728c89fbe3625 cinnamon-screensaver-2.0.0.tar.gz diff --git a/systemd.patch b/systemd.patch deleted file mode 100644 index 3116490..0000000 --- a/systemd.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -606,7 +606,7 @@ AC_ARG_WITH(systemd, - [with_systemd=$withval], [with_systemd=auto]) - - PKG_CHECK_MODULES(SYSTEMD, -- [libsystemd-login libsystemd-daemon], -+ [libsystemd-login], - [have_systemd=yes], [have_systemd=no]) - - if test "x$with_systemd" = "xauto" ; then ---- a/src/gs-listener-dbus.c -+++ b/src/gs-listener-dbus.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include - -@@ -33,7 +34,6 @@ - #include - - #ifdef WITH_SYSTEMD --#include - #include - #endif - -@@ -1518,7 +1518,8 @@ gs_listener_init (GSListener *listener) - listener->priv = GS_LISTENER_GET_PRIVATE (listener); - - #ifdef WITH_SYSTEMD -- listener->priv->have_systemd = sd_booted () > 0; -+ /* check if logind is running */ -+ listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0); - #endif - - gs_listener_dbus_init (listener);