Hello community,
here is the log from the commit of package compizconfig-settings-manager for
openSUSE:Factory checked in at 2012-06-06 16:06:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/compizconfig-settings-manager (Old)
and /work/SRC/openSUSE:Factory/.compizconfig-settings-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compizconfig-settings-manager", Maintainer is "jzh...@suse.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/compizconfig-settings-manager/compizconfig-settings-manager.changes
2011-09-28 14:06:06.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.compizconfig-settings-manager.new/compizconfig-settings-manager.changes
2012-06-06 16:06:03.000000000 +0200
@@ -2 +2 @@
-Thu Sep 22 19:00:07 UTC 2011 - dims...@opensuse.org
+Thu May 31 12:00:01 UTC 2012 - k...@gmx.de
@@ -4,2 +4 @@
-- Update to 0.9.5.94:
- + Added settings upgrade framework
+- correct license format
@@ -8 +7 @@
-Sat Sep 17 23:48:01 UTC 2011 - jeng...@medozas.de
+Sat Nov 11 12:00:01 UTC 2010 - k...@gmx.de
@@ -10,41 +9,2 @@
-- Remove redundant tags/sections from specfile
-
--------------------------------------------------------------------
-Mon May 16 17:55:34 UTC 2011 - dims...@opensuse.org
-
-- Forward to commit 93921a6e96fcfd714210374a56c823e7b3aaadd3:
- + Synchronize with compiz API changes.
-- Drop unsexy.patch: This codepath has been replaced upstream.
-- Add %icon_theme_cache_post/postun macros.
-- Improve update.sh script for automatic git updates.
-
--------------------------------------------------------------------
-Sat Jan 22 23:39:00 UTC 2011 - dims...@opensuse.org
-
-- Fix files section, language folders.
-
--------------------------------------------------------------------
-Mon Nov 8 20:11:52 UTC 2010 - dims...@opensuse.org
-
-- Update to version 0.9.2.1:
- - Version bump to stay in sync.
-- Changes from version 0.9.2:
- + Updated tango icon set.
-
--------------------------------------------------------------------
-Wed Sep 22 13:30:41 UTC 2010 - dims...@opensuse.org
-
-- Move python-compizconfig Requires from main package to python-ccm
-
--------------------------------------------------------------------
-Wed Aug 25 21:25:31 UTC 2010 - dims...@opensuse.org
-
-- Forward to git snapshot of today.
-
--------------------------------------------------------------------
-Sun Jul 4 09:09:39 UTC 2010 - dims...@opensuse.org
-
-- Update to 0.9.0
- + Added new Tango Icons by coz_
-- Drop compizconfig-settings-manager-profile-extensions.patch,
- merged upstream.
+- add the requirement for a compiz version less than 0.9
+- require a version less than 0.9 of python-ccm
Old:
----
compizconfig-settings-manager.tar.bz2
update.sh
New:
----
ccsm-0.8.4.tar.bz2
compizconfig-settings-manager-profile-extensions.patch
unsexy.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compizconfig-settings-manager.spec ++++++
--- /var/tmp/diff_new_pack.bbWK5k/_old 2012-06-06 16:06:05.000000000 +0200
+++ /var/tmp/diff_new_pack.bbWK5k/_new 2012-06-06 16:06:05.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package compizconfig-settings-manager
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -18,73 +18,87 @@
Name: compizconfig-settings-manager
-Version: 0.9.5.94
+Version: 0.8.4
Release: 1
License: GPL-2.0+
Summary: Settings Manager for Compiz (CCSM)
Url: http://opencompositing.org
Group: System/X11/Utilities
-Source: %{name}.tar.bz2
-# Helper to update to latest git.
-Source99: update.sh
+Source: ccsm-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM compizconfig-settings-manager-profile-extensions.patch
bgo#458343 rodr...@novell.com
+Patch1: compizconfig-settings-manager-profile-extensions.patch
+# PATCH-FIX-OPENSUSE Don't warn about missing sexy-python
+Patch2: unsexy.patch
+BuildRequires: compiz-devel
+BuildRequires: compiz-gnome
+BuildRequires: gconf2-devel
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
BuildRequires: intltool
-BuildRequires: python
-BuildRequires: python-gtk
+BuildRequires: libcompizconfig-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
+BuildRequires: pkg-config
+BuildRequires: pyrex
+BuildRequires: python-compizconfig
+BuildRequires: python-devel
BuildRequires: update-desktop-files
-Requires: python-ccm
-Requires: python-gtk
+PreReq: %fillup_prereq
+Requires: python-ccm < 0.9
+Obsoletes: ccs-settings
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %suse_version <= 1110
+%define python_sitelib %{py_sitedir}
+%define python_sitearch %{py_sitedir}
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
+%else
BuildArch: noarch
+%endif
%description
Compiz Config and Settings tool (CCSM).
%package -n python-ccm
-License: GPL-2.0+
+License: GPLv2+
Summary: CompizConfig Manager Backend
Group: System/X11/Utilities
-Requires: python-compizconfig
+Requires: compiz < 0.9
+Requires: python-compizconfig < 0.9
+Requires: python-xml
%py_requires
-%if %suse_version <= 1110
-%define python_sitelib %{py_sitedir}
-%define python_sitearch %{py_sitedir}
-%endif
%description -n python-ccm
The backend to Compiz Config Manager.
%prep
-%setup -q -n %{name}
+%setup -q -n ccsm-%{version}
+%patch1 -p0
+%patch2 -p0
%build
./setup.py --prefix=%{_prefix}
%install
-./setup.py install --root=%{buildroot} --prefix=%{_prefix}
+./setup.py install --root=%{buildroot} --prefix=/usr
+find %{buildroot} \( -name \*.a -o -name \*.la \) -print0 | xargs -0 rm -f
+%__ln_s %{_bindir}/ccsm %{buildroot}%{_bindir}/compizconfig-settings-manager
%suse_update_desktop_file ccsm DesktopSettings
%find_lang ccsm
-%if 0%{?suse_version} > 1130
-
-%post
-%icon_theme_cache_post
-
-%postun
-%icon_theme_cache_postun
-%endif
+%clean
+%__rm -rf %{buildroot}
%files -f ccsm.lang
%defattr(-, root, root)
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/*
-%if 0%{?suse_version} < 1140
-%dir %{_datadir}/locale/ml_IN
-%dir %{_datadir}/locale/ml_IN/LC_MESSAGES
-%endif
+#%dir %{_datadir}/locale/ml_IN
+#%dir %{_datadir}/locale/ml_IN/LC_MESSAGES
%files -n python-ccm
%defattr(-, root, root)
+%dir %{python_sitelib}/ccm
%{python_sitelib}/*
%{_datadir}/ccsm/
++++++ compizconfig-settings-manager-profile-extensions.patch ++++++
Index: ccm/Pages.py
===================================================================
--- ccm/Pages.py.orig
+++ ccm/Pages.py
@@ -840,6 +840,8 @@ class ProfileBackendPage(object):
dlg.set_markup(_("Do you want to skip default option values while
exporting your profile?"))
ret = dlg.run()
dlg.destroy()
+ if not path.endswith(".profile"):
+ path = "%s.profile" % path
self.Context.Export(path, ret == gtk.RESPONSE_YES)
def ImportProfileDialog (self, main):
++++++ unsexy.patch ++++++
Index: ccsm
===================================================================
--- ccsm.orig
+++ ccsm
@@ -90,7 +90,8 @@ try:
import sexy
has_sexy = True
except ImportError:
- print "Info: No sexy-python package found, don't worry it's optional."
+ # openSUSE does not come with sexy-python, so don't warn
+ # print "Info: No sexy-python package found, don't worry it's optional."
has_sexy = False
if gtk.pygtk_version < (2,12,0):
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
