leigh123linux pushed to cinnamon-session (f20). "update to git snapshot"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 11:02:17 UTC 2015
From 421f6f76a00d739d420c89b3d039591d1d1a8154 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Sat, 9 May 2015 18:26:14 +0100
Subject: update to git snapshot
diff --git a/.gitignore b/.gitignore
index ef4bdfc..0aba931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/cinnamon-session-2.4.0.tar.gz
/cinnamon-session-2.4.1.tar.gz
/cinnamon-session-2.5.1.gitfc7111e.tar.gz
+/cinnamon-session-2.5.1.git2a18785.tar.gz
diff --git a/0001-Blacklist-xscreensaver-autostart-from-autostarting.patch b/0001-Blacklist-xscreensaver-autostart-from-autostarting.patch
deleted file mode 100644
index 5e53523..0000000
--- a/0001-Blacklist-xscreensaver-autostart-from-autostarting.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9b2dcece3fc46523722420ac83ba6be59b57f62c Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux at fedoraproject.org>
-Date: Tue, 5 May 2015 18:07:27 +0100
-Subject: [PATCH] Blacklist xscreensaver-autostart from autostarting
-
----
- cinnamon-session/csm-manager.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/cinnamon-session/csm-manager.c b/cinnamon-session/csm-manager.c
-index 6e2b853..d80f45e 100644
---- a/cinnamon-session/csm-manager.c
-+++ b/cinnamon-session/csm-manager.c
-@@ -110,7 +110,8 @@ const gchar *blacklist[] = {
- "indicator-",
- "gnome-initial-setup-copy-worker",
- "gnome-initial-setup-first-login",
-- "gnome-welcome-tour"
-+ "gnome-welcome-tour",
-+ "xscreensaver-autostart"
- };
-
- static void app_registered (CsmApp *app, CsmManager *manager);
---
-2.1.0
-
diff --git a/cinnamon-session.spec b/cinnamon-session.spec
index f5ffbd4..931611a 100644
--- a/cinnamon-session.spec
+++ b/cinnamon-session.spec
@@ -1,10 +1,10 @@
%global po_package cinnamon-session-3.0
-%global _internal_version fc7111e
+%global _internal_version 2a18785
Summary: Cinnamon session manager
Name: cinnamon-session
Version: 2.5.1
-Release: 0.2.git%{_internal_version}%{?dist}
+Release: 0.3.git%{_internal_version}%{?dist}
URL: http://cinnamon.linuxmint.com
License: GPLv2+ and LGPLv2+
Group: User Interface/Desktops
@@ -60,17 +60,16 @@ the other core components and handles logout and saving the session.
%prep
%setup -q -n linuxmint-%{name}-%{_internal_version}
-%patch0 -p1
+#patch0 -p1
NOCONFIGURE=1 ./autogen.sh
%build
%configure --enable-docbook-docs \
%if 0%{?fedora} < 20 || 0%{?rhel}
- --docdir=%{_datadir}/doc/%{name}-%{version} \
+ --docdir=%{_datadir}/doc/%{name}-%{version}
%else
- --docdir=%{_datadir}/doc/%{name} \
+ --docdir=%{_datadir}/doc/%{name}
%endif
- --enable-systemd
make %{?_smp_mflags} V=1
@@ -107,6 +106,9 @@ fi
%{_datadir}/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml
%changelog
+* Wed May 06 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.1-0.3.git2a18785
+- update to git snapshot
+
* Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.1-0.2.gitfc7111e
- blacklist xscreensaver from autostarting
diff --git a/sources b/sources
index 9c42415..1b5b8d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e9d295f9eb9e8aa6a1c90e1d00f8daf cinnamon-session-2.5.1.gitfc7111e.tar.gz
+8cdcd040d1a5970219afa61d50a58dbb cinnamon-session-2.5.1.git2a18785.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cinnamon-session.git/commit/?h=f20&id=421f6f76a00d739d420c89b3d039591d1d1a8154
More information about the scm-commits
mailing list