From bcf125435a015d5a4ba8d7109575ba737debed97 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sep 30 2013 14:22:44 +0000 Subject: Merge branch 'master' into f19 --- diff --git a/.gitignore b/.gitignore index 69a7bb3..f80dd78 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cinnamon-session-1.0.0.gitdf909ee.tar.gz /cinnamon-session-1.0.0.git58710ea.tar.gz /cinnamon-session-1.0.0.git405f80d.tar.gz +/cinnamon-session-1.9.2.tar.gz diff --git a/cinnamon-session.spec b/cinnamon-session.spec index 2bfacc6..c2e3398 100644 --- a/cinnamon-session.spec +++ b/cinnamon-session.spec @@ -3,12 +3,12 @@ Summary: Cinnamon session manager Name: cinnamon-session -Version: 1.0.0 -Release: 0.12.git%{_internal_version}%{?dist} +Version: 1.9.2 +Release: 1%{?dist} URL: http://cinnamon.linuxmint.com # To generate tarball # wget https://github.com/linuxmint/cinnamon-session/tarball/%%{_internal_version} -O cinnamon-session-%%{version}.git%%{_internal_version}.tar.gz -Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinnamon-session-%{version}.git%{_internal_version}.tar.gz +Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinnamon-session-%{version}.tar.gz Patch0: remove_sessionmigration.patch Patch1: systemd.patch @@ -67,7 +67,7 @@ Cinnamon-session manages a Cinnamon desktop or GDM login session. It starts up the other core components and handles logout and saving the session. %prep -%setup -q -n linuxmint-cinnamon-session-%{_internal_version} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 -b .systemd_login1_suspend @@ -125,6 +125,9 @@ fi %{_datadir}/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml %changelog +* Mon Sep 30 2013 Leigh Scott - 1.9.2-1 +- update to 1.9.2 + * Tue Sep 24 2013 Leigh Scott - 1.0.0-0.12.git405f80d - add some build conditionals diff --git a/sources b/sources index 15dfecb..177ac21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86783aa10cd40d205178ec149e06f416 cinnamon-session-1.0.0.git405f80d.tar.gz +52197392d214605e5b2707b9997a0528 cinnamon-session-1.9.2.tar.gz