Hello community,
here is the log from the commit of package simple-ccsm for openSUSE:11.4
checked in at Fri Feb 18 14:13:53 CET 2011.
--------
--- old-versions/11.4/all/simple-ccsm/simple-ccsm.changes 2010-12-28 16:08:30.000000000 +0100
+++ /mounts/work_src_done/11.4/simple-ccsm/simple-ccsm.changes 2011-02-18 12:01:40.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Feb 17 21:53:48 CET 2011 - vuntz@opensuse.org
+
+- Update simple-ccsm-disable-compiz.patch to create
+ ~/.config/compiz/ if it doesn't exist, and to respect
+ $XDG_CONFIG_HOME.
+
+-------------------------------------------------------------------
+Thu Feb 17 08:28:31 UTC 2011 - dimstar@opensuse.org
+
+- Do not package in_IN locale on 11.4.
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ simple-ccsm.spec ++++++
--- /var/tmp/diff_new_pack.qPbDaI/_old 2011-02-18 14:13:52.000000000 +0100
+++ /var/tmp/diff_new_pack.qPbDaI/_new 2011-02-18 14:13:52.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package simple-ccsm (Version 0.9.2.1)
+# spec file for package simple-ccsm
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
Name: simple-ccsm
Version: 0.9.2.1
-Release: 2
+Release: 6.<RELEASE2>
License: GPLv2+
Summary: Simple Settings Manager for Compiz
Url: http://opencompositing.org
@@ -81,7 +81,9 @@
%{_datadir}/simple-ccsm/
%{_datadir}/icons/*
%{python_sitelib}/
+%if 0%{?suse_version} < 1140
%dir %{_datadir}/locale/ml_IN
%dir %{_datadir}/locale/ml_IN/LC_MESSAGES
+%endif
%changelog
++++++ simple-ccsm-disable-compiz.patch ++++++
--- /var/tmp/diff_new_pack.qPbDaI/_old 2011-02-18 14:13:52.000000000 +0100
+++ /var/tmp/diff_new_pack.qPbDaI/_new 2011-02-18 14:13:52.000000000 +0100
@@ -1,23 +1,43 @@
-From 28dc57076fd11be48f8b90c679d251a5096d34bd Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger
-Date: Tue, 28 Dec 2010 15:50:26 +0100
-Subject: [PATCH] When disbaling compiz, put a disable-compiz file to indicate so.
- Otherwise, on relogin, compiz-manager is being started again and does not have indication that compiz should not be enabled.
-
----
- simple-ccsm.in | 15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/simple-ccsm.in b/simple-ccsm.in
-index 4e74929..c5c225b 100755
---- a/simple-ccsm.in
-+++ b/simple-ccsm.in
-@@ -1309,6 +1309,12 @@ class MainWin:
+Index: simple-ccsm/simple-ccsm.in
+===================================================================
+--- simple-ccsm.orig/simple-ccsm.in
++++ simple-ccsm/simple-ccsm.in
+@@ -192,6 +192,25 @@ GnomeSession = "GNOME_DESKTOP_SESSION_ID
+ KdeSession = "KDE_FULL_SESSION"
+
+ # Utility Functions
++def GetXdgConfigHome(subdir):
++ if 'XDG_CONFIG_HOME' in os.environ and os.environ['XDG_CONFIG_HOME']:
++ xdg = os.path.expanduser(os.environ['XDG_CONFIG_HOME'])
++ else:
++ xdg = os.path.expanduser('~/.config')
++
++ if subdir:
++ ret = os.path.join(xdg, subdir)
++ else:
++ ret = xdg
++
++ # create the directory if it's not there
++ try:
++ os.makedirs(ret, 0700)
++ except Exception:
++ pass
++
++ return ret
++
+ def EnablePlugin(plugin, active):
+ # attempt to resolve conflicts...
+ conflicts = (plugin.Enabled and plugin.DisableConflicts) or plugin.EnableConflicts
+@@ -1307,8 +1326,15 @@ class MainWin:
+ pass
+
# Create a file that indicates wether compiz is enabled or not
- path = os.path.expanduser("~/.config/compiz/enable-compiz")
+- path = os.path.expanduser("~/.config/compiz/enable-compiz")
++ xdg_compiz = GetXdgConfigHome('compiz')
++ path = os.path.join(xdg_compiz, 'enable-compiz')
open(path, "w+").close() # touch replacement
+
-+ path = os.path.expanduser("~/.config/compiz/disable-compiz")
++ path = os.path.join(xdg_compiz, 'disable-compiz')
+ try:
+ os.remove(path)
+ except (IOError, OSError):
@@ -25,16 +45,18 @@
else:
fallbackWM = ""
if GnomeSession in os.environ and os.environ[GnomeSession]:
-@@ -1328,11 +1334,18 @@ class MainWin:
+@@ -1328,11 +1354,19 @@ class MainWin:
except (IOError, OSError):
pass
+ # Create a file that indicates compiz is explicitly disabled, so should not be started
-+ path = os.path.expanduser("~/.config/compiz/disable-compiz")
++ xdg_compiz = GetXdgConfigHome('compiz')
++ path = os.path.join(xdg_compiz, 'disable-compiz')
+ open(path, "w+").close() # touch replacement
+
# Remove old config
- files = ("~/.config/compiz/enable-compiz", "~/.config/compiz/compiz-manager")
+- files = ("~/.config/compiz/enable-compiz", "~/.config/compiz/compiz-manager")
++ files = (os.path.join(xdg_compiz, 'enable-compiz'), os.path.join(xdg_compiz, 'compiz-manager'))
for file in files:
path = os.path.expanduser(file)
- os.remove(path)
@@ -45,7 +67,3 @@
self.Notebook.set_sensitive(enabled)
self.ProfileChooser.set_sensitive(enabled)
---
-1.7.1
-
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
