Hello community,
here is the log from the commit of package compiz for openSUSE:Factory checked in at 2015-12-16 17:42:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/compiz (Old)
and /work/SRC/openSUSE:Factory/.compiz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compiz"
Changes:
--------
--- /work/SRC/openSUSE:Factory/compiz/compiz.changes 2015-11-28 15:19:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.compiz.new/compiz.changes 2015-12-16 17:43:30.000000000 +0100
@@ -1,0 +2,22 @@
+Sat Dec 12 10:02:46 UTC 2015 - sor.alexei@meowr.ru
+
+- Bring compiz-decorator back: Compiz must handle Emerald-only
+ installations.
+- Set back compiz-decorator as a default decorator in
+ compiz-suse-defaults.patch.
+- Fix crashes in gnome-window-decorator.
+- Force compiz-gnome bigger priority than compiz-emerald if
+ MATE or GNOME session is installed by supplements.
+- Simplify compiz-decorator: no need to fallback if decorator is
+ missing as it can't be (requirement).
+- Do not change default resize mode in compiz-suse-defaults.patch.
+- Do not even suggest Marco in compiz-gnome: gtk-window-decorator
+ only need a library for supporing Metacity decorations.
+- Remove bug-449168-avoid-independent-output-painting.diff:
+ considered harmful.
+- Modify compiz-add-manager-checks.patch: do not start Compiz
+ without --replace when other WM is running.
+- Do not generate MATE Control Centre keybindings after all:
+ support is removed from upstream.
+
+-------------------------------------------------------------------
Old:
----
bug-449168-avoid-independent-output-painting.diff
New:
----
compiz-decorator.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.GQSRzv/_old 2015-12-16 17:43:32.000000000 +0100
+++ /var/tmp/diff_new_pack.GQSRzv/_new 2015-12-16 17:43:32.000000000 +0100
@@ -27,26 +27,24 @@
Source: https://github.com/raveit65/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: opensuse.png
Source2: sle.png
-Source3: gnome-window-decorator.py
-Source4: %{name}.desktop
-Source5: baselibs.conf
+Source3: %{name}-decorator.sh
+Source4: gnome-window-decorator.py
+Source5: %{name}.desktop
+Source6: baselibs.conf
# PATCH-FEATURE-OPENSUSE compiz-suse-defaults.patch dimstar@opensuse.org -- Compiz default settings for openSUSE.
Patch0: %{name}-suse-defaults.patch
# PATCH-FIX-UPSTREAM compiz-java-config-notify.diff dreveman@novell.com -- Java config notify workaround.
Patch1: %{name}-java-config-notify.diff
-# PATCH-FIX-UPSTREAM boo#449168 dreveman@novell.com -- Avoid independent output painting.
-Patch2: bug-449168-avoid-independent-output-painting.diff
-# PATCH-FIX-UPSTREAM boo#474862 dreveman@novell.com -- Allow moving focus to fs window.
-Patch3: bug-474862-allow-moving-focus-to-fs-window.diff
+# PATCH-FIX-UPSTREAM bsc#474862 dreveman@novell.com -- Allow moving focus to fs window.
+Patch2: bug-474862-allow-moving-focus-to-fs-window.diff
# PATCH-FEATURE-OPENSUSE compiz-add-manager-checks.patch -- Add all relevant checks from compiz-manager.
-Patch4: %{name}-add-manager-checks.patch
+Patch3: %{name}-add-manager-checks.patch
BuildRequires: hicolor-icon-theme
BuildRequires: libjpeg-devel
BuildRequires: libxslt-tools
BuildRequires: mate-common
-# To get GNOME Control Centre keybindings.
-BuildRequires: metacity
BuildRequires: pkg-config
+BuildRequires: python3
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(cairo) >= 1.0
BuildRequires: pkgconfig(cairo-xlib-xrender)
@@ -54,7 +52,7 @@
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gobject-introspection-1.0)
-BuildRequires: pkgconfig(gtk+-2.0) >= 2.8.0
+BuildRequires: pkgconfig(gtk+-2.0) >= 2.10.0
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0
@@ -77,6 +75,7 @@
Requires: %{name}-decorator < 0.9
Requires: pciutils
Recommends: %{name}-plugins < 0.9
+Recommends: %{name}-lang
Suggests: compicc < 0.9
Provides: windowmanager
# KDE is no longer supported in Compiz.
@@ -84,8 +83,6 @@
Obsoletes: %{name}-kde4 < %{version}
ExclusiveArch: %ix86 x86_64 %arm aarch64 ppc ppc64 ia64
%if 0%{?suse_version} > 1310
-# To get MATE Control Centre keybindings.
-BuildRequires: marco
BuildRequires: pkgconfig(libmarco-private)
%endif
@@ -107,11 +104,10 @@
Requires: python3-gobject
Recommends: %{name}-plugins-main < 0.9
Suggests: ccsm < 0.9
+Supplements: packageand(%{name}:gnome-session)
+Supplements: packageand(%{name}:mate-session-manager)
Provides: %{name}-decorator = 0.8
-%if 0%{?suse_version} > 1310
-Recommends: marco
Provides: %{name}-mate = %{version}
-%endif
%description gnome
This package contains GNOME/MATE based configuration utilities for
@@ -237,11 +233,11 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
cp -f %{SOURCE1} opensuse.png
cp -f %{SOURCE2} sle.png
-cp -f %{SOURCE3} gnome-window-decorator
-cp -f %{SOURCE4} %{name}.desktop
+cp -f %{SOURCE3} compiz-decorator
+cp -f %{SOURCE4} gnome-window-decorator
+cp -f %{SOURCE5} %{name}.desktop
# Do not install helper scripts, we already have one.
sed -i 's/^\(SUBDIRS =.* \)scripts\(.*\)$/\1\2/' Makefile.am
@@ -258,31 +254,13 @@
install -Dm 0644 opensuse.png %{buildroot}%{_datadir}/%{name}/opensuse.png
install -Dm 0644 sle.png %{buildroot}%{_datadir}/%{name}/sle.png
+install -Dm 0755 %{name}-decorator %{buildroot}%{_bindir}/%{name}-decorator
install -Dm 0755 gnome-window-decorator %{buildroot}%{_bindir}/gnome-window-decorator
install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/mate/wm-properties/%{name}.desktop
install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/gnome/wm-properties/%{name}.desktop
-# Create Compiz keybiding files based on the Marco ones.
-mkdir -p %{buildroot}%{_datadir}/{mate,gnome}-control-center/keybindings/
-for de in mate gnome; do
- for wm in marco metacity; do
- for kb in desktop-key global-key window-key navigation windows; do
- if [ -r %{_datadir}/$de-control-center/keybindings/50-$wm-$kb.xml ]; then
- sed -re '/KeyListEntries/s/(wm_name=)\"[^\"]*\"/\1\"compiz\"/;/KeyListEntries/s/(package=)\"[^\"]*\"/\1\"compiz\"/' \
- %{_datadir}/$de-control-center/keybindings/50-$wm-$kb.xml \
- > %{buildroot}%{_datadir}/$de-control-center/keybindings/50-compiz-$kb.xml
- sed -i 's|key=\"num-workspaces\" comparison=\"gt\"||g' %{buildroot}%{_datadir}/$de-control-center/keybindings/50-compiz-$kb.xml
- # Remove unsupported keys from Compiz keybindings.
- for unsupported in switch-group switch-panels cycle-windows cycle-group cycle-panels; do
- sed -i "/name=\"$unsupported\"/d" %{buildroot}%{_datadir}/$de-control-center/keybindings/50-compiz-$kb.xml
- done
- fi
- done
- done
-done
-
find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name}
@@ -328,6 +306,7 @@
%defattr(-,root,root)
%doc COPYING*
%{_bindir}/%{name}
+%{_bindir}/%{name}-decorator
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/*.*
%dir %{_libdir}/%{name}/
@@ -391,9 +370,6 @@
%defattr(-,root,root)
%{_bindir}/gtk-window-decorator
%{_bindir}/gnome-window-decorator
-%dir %{_datadir}/*-control-center/
-%dir %{_datadir}/*-control-center/keybindings/
-%{_datadir}/*-control-center/keybindings/*
%dir %{_datadir}/mate/
%dir %{_datadir}/gnome/
%dir %{_datadir}/*/wm-properties/
++++++ compiz-0.8.9.tar.gz ++++++
++++ 20792 lines of diff (skipped)
++++++ compiz-add-manager-checks.patch ++++++
--- /var/tmp/diff_new_pack.GQSRzv/_old 2015-12-16 17:43:32.000000000 +0100
+++ /var/tmp/diff_new_pack.GQSRzv/_new 2015-12-16 17:43:32.000000000 +0100
@@ -1,8 +1,8 @@
Add all relevant checks from compiz-manager.
Authors:
-Travis Watkins