leigh123linux pushed to cinnamon-desktop (f22). "fix merge"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 09:24:14 UTC 2015
From 47cb81384b5e975d6a1133b680a46a5bfe8923ed Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 5 May 2015 15:30:09 +0100
Subject: fix comment
diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec
index 2afac2a..4cd1fe6 100644
--- a/cinnamon-desktop.spec
+++ b/cinnamon-desktop.spec
@@ -13,7 +13,7 @@ URL: http://cinnamon.linuxmint.com
# To generate tarball
# wget https://github.com/linuxmint/cinnamon-desktop/tarball/%%{_internal_version} -O cinnamon-desktop-%%{version}.git%%{_internal_version}.tar.gz
Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%{version}.git%{_internal_version}.tar.gz
-#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%{version}.tar.gz
+#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%%{version}.tar.gz
Source1: cinnamon-mimeapps.list
Patch0: set_font_defaults.patch
--
cgit v0.10.2
From a300e0ba61050eefacc514ffb48492849f7b9fb5 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Wed, 6 May 2015 11:33:34 +0100
Subject: update to git snapshot
diff --git a/.gitignore b/.gitignore
index 30aab8c..6fc9831 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/cinnamon-desktop-2.4.1.tar.gz
/cinnamon-desktop-2.4.2.tar.gz
/cinnamon-desktop-2.5.1.gitdb43144.tar.gz
+/cinnamon-desktop-2.5.1.gitfcbafe3.tar.gz
diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec
index 4cd1fe6..be64bef 100644
--- a/cinnamon-desktop.spec
+++ b/cinnamon-desktop.spec
@@ -1,4 +1,4 @@
-%global _internal_version db43144
+%global _internal_version fcbafe3
%global gtk3_version 3.10.0
%global startup_notification_version 0.5
%global gtk_doc_version 1.9
@@ -7,7 +7,7 @@
Summary: Shared code among cinnamon-session, nemo, etc
Name: cinnamon-desktop
Version: 2.5.1
-Release: 0.1.git%{_internal_version}%{?dist}
+Release: 0.2.git%{_internal_version}%{?dist}
License: GPLv2+ and LGPLv2+ add MIT
URL: http://cinnamon.linuxmint.com
# To generate tarball
@@ -17,6 +17,7 @@ Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinna
Source1: cinnamon-mimeapps.list
Patch0: set_font_defaults.patch
+Patch1: set_logind.patch
Requires: redhat-menus
@@ -60,6 +61,7 @@ libcinnamondesktop.
%prep
%setup -q -n linuxmint-%{name}-%{_internal_version}
%patch0 -p1
+%patch1 -p1
NOCONFIGURE=1 ./autogen.sh
%build
@@ -111,6 +113,9 @@ fi
%{_datadir}/gir-1.0/C*-3.0.gir
%changelog
+* Wed May 06 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.1-0.2.gitfcbafe3
+- update to git snapshot
+
* Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.1-0.1.gitdb43144
- update to git snapshot
diff --git a/set_logind.patch b/set_logind.patch
new file mode 100644
index 0000000..d3cc795
--- /dev/null
+++ b/set_logind.patch
@@ -0,0 +1,11 @@
+--- a/schemas/org.cinnamon.desktop.session.gschema.xml.in.in 2015-05-06 08:20:04.000000000 +0100
++++ b/schemas/org.cinnamon.desktop.session.gschema.xml.in.in 2015-05-06 11:30:48.119691380 +0100
+@@ -12,7 +12,7 @@
+ "gnome" and "gnome-fallback".</description>
+ </key>
+ <key name="use-systemd" type="b">
+- <default>false</default>
++ <default>true</default>
+ <_summary>Whether or not Cinnamon should use systemd/logind, or rely on upower/consolekit when appropriate</_summary>
+ <_description>If true, Cinnamon interacts with systemd/logind. If false, Cinnamon interacts with upower/consolekit when appropriate.</_description>
+ </key>
diff --git a/sources b/sources
index 0322e59..313d0e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-104f73c873a89a79efa1f74f78a3e454 cinnamon-desktop-2.5.1.gitdb43144.tar.gz
+6b4728ce522590e2ace34ce1ee9050a4 cinnamon-desktop-2.5.1.gitfcbafe3.tar.gz
--
cgit v0.10.2
From 6b4470ff89bbaa34989dc2d7b273a4c6e24b4527 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Wed, 20 May 2015 07:56:45 +0100
Subject: update to 2.6.0 release
diff --git a/.gitignore b/.gitignore
index 6fc9831..e3d4584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/cinnamon-desktop-2.4.2.tar.gz
/cinnamon-desktop-2.5.1.gitdb43144.tar.gz
/cinnamon-desktop-2.5.1.gitfcbafe3.tar.gz
+/cinnamon-desktop-2.6.0.tar.gz
diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec
index be64bef..7dcaaf6 100644
--- a/cinnamon-desktop.spec
+++ b/cinnamon-desktop.spec
@@ -1,4 +1,4 @@
-%global _internal_version fcbafe3
+#global _internal_version fcbafe3
%global gtk3_version 3.10.0
%global startup_notification_version 0.5
%global gtk_doc_version 1.9
@@ -6,14 +6,14 @@
Summary: Shared code among cinnamon-session, nemo, etc
Name: cinnamon-desktop
-Version: 2.5.1
-Release: 0.2.git%{_internal_version}%{?dist}
+Version: 2.6.0
+Release: 1%{?dist}
License: GPLv2+ and LGPLv2+ add MIT
URL: http://cinnamon.linuxmint.com
# To generate tarball
# wget https://github.com/linuxmint/cinnamon-desktop/tarball/%%{_internal_version} -O cinnamon-desktop-%%{version}.git%%{_internal_version}.tar.gz
-Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%{version}.git%{_internal_version}.tar.gz
-#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%%{version}.tar.gz
+#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%%{version}.git%%{_internal_version}.tar.gz
+Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%{version}.tar.gz
Source1: cinnamon-mimeapps.list
Patch0: set_font_defaults.patch
@@ -59,7 +59,7 @@ Libraries and header files for the CINNAMON-internal private library
libcinnamondesktop.
%prep
-%setup -q -n linuxmint-%{name}-%{_internal_version}
+%setup -q
%patch0 -p1
%patch1 -p1
NOCONFIGURE=1 ./autogen.sh
@@ -113,6 +113,9 @@ fi
%{_datadir}/gir-1.0/C*-3.0.gir
%changelog
+* Wed May 20 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-1
+- update to 2.6.0 release
+
* Wed May 06 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.1-0.2.gitfcbafe3
- update to git snapshot
diff --git a/sources b/sources
index 313d0e0..fd6e9c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b4728ce522590e2ace34ce1ee9050a4 cinnamon-desktop-2.5.1.gitfcbafe3.tar.gz
+48d780a78edfed435dc696c2da579e0a cinnamon-desktop-2.6.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cinnamon-desktop.git/commit/?h=f22&id=7d6ad74057c563038ee79f299699f6ea00cdfbca
More information about the scm-commits
mailing list