Hello community, here is the log from the commit of package compiz for openSUSE:Factory checked in at 2014-08-13 17:08:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-23 12:30:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.compiz.new/compiz.changes 2014-08-13 17:08:25.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------ +Thu Aug 14 12:00:00 UTC 2014 - [email protected] + +- disable metacity; fix compile error due to private function changes +- remove unused compiz-gtk_widget_visible.patch + Old: ---- compiz-gtk_widget_visible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.S1t7Q8/_old 2014-08-13 17:08:27.000000000 +0200 +++ /var/tmp/diff_new_pack.S1t7Q8/_new 2014-08-13 17:08:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package compiz # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -21,9 +21,6 @@ Release: 0 Url: http://www.compiz.org Requires(pre): %fillup_prereq -%if 0%{?suse_version} <= 01100 -Enhances: xgl >= git_070104 -%endif Summary: OpenGL window and compositing manager License: HPND and GPL-2.0+ Group: System/GUI/Other @@ -31,15 +28,8 @@ BuildRequires: freeglut-devel BuildRequires: fuse-devel BuildRequires: gcc-c++ -#BuildRequires: gtk-devel BuildRequires: intltool BuildRequires: libgnome-desktop-2-devel -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -%if 0%{?suse_version} < 01120 -BuildRequires: kdebase3-devel -BuildRequires: kdelibs3-devel -%endif BuildRequires: librsvg-devel BuildRequires: libwnck2-devel BuildRequires: libxslt-devel @@ -50,9 +40,11 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libwnck-1.0) BuildRequires: pkgconfig(pango) -%if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10" +%if "%_repository" == "SLE_10" BuildRequires: xorg-x11-compat70-devel %endif BuildRequires: gnome-control-center-devel @@ -70,13 +62,16 @@ BuildRequires: kdebase4-workspace-devel BuildRequires: kwin BuildRequires: libkde4-devel +%else +Recommends: compiz-emerald %endif +Recommends: compiz-plugins-main #BuildRequires: libgnome-window-settings-devel BuildRequires: libgnomeui-devel # KWin has, since 4.11 version, dropped support for Compiz in KDecoration # For details see http://lists.kde.org/?l=kwin&m=136335502805911&w=2 and commit c146941 in kde-workspace %if 0%{?suse_version} > 1230 -Obsoletes: compiz-kde4 +#Obsoletes: compiz-kde4 %endif # To be nuked: MesaLib, patch60 $mesagl Source: compiz-%{version}.tar.bz2 @@ -95,8 +90,6 @@ Patch3: bug-474862-allow-moving-focus-to-fs-window.diff # PATCH-FIX-UPSTREAM kde-auto-comp.diff [email protected] -- unknown Patch4: kde-auto-comp.diff -# PATCH-FIX-UPSTREAM compiz-gtk_widget_visible.patch [email protected] -- Patch reverting to gtk_vidget_visible for openSUSE < 11.2 (too old gtk). -Patch5: compiz-gtk_widget_visible.patch # PATCH-FIX-UPSTREAM compiz-unmanaged-window-position.patch [email protected] -- Fix gravity of unmanaged windows (clock applet for example) Patch6: compiz-unmanaged-window-position.patch # PATCH-FIX-UPSTREAM compiz-global_Region_define.patch [email protected] -- Fix compiler irritation about X11 ::Region versus KDecorationDefines::Region @@ -174,33 +167,28 @@ compositing manager. %endif -%if 0%{?suse_version} < 1310 %package kde4 Summary: OpenGL window and compositing managerdecorator for kde4 License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Requires: %{name} = %{version} -%if 0%{?suse_version} > 1130 -BuildRequires: kdebase4-workspace-devel -%endif -%if 0%{?suse_version} <= 01030 -BuildRequires: control-center2-devel -%endif -%if 0%{?suse_version} >= 01120 +%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1310 BuildRequires: kdebase4-session +BuildRequires: kdebase4-workspace-devel Requires: kde4-kwin Requires: kdebase4-session -Recommends: icc_examin -Recommends: kolor-manager Recommends: simple-ccsm-kde4 -Provides: compiz-decorator = %{version} %kde4_runtime_requires +Recommends: icc_examin +%else +Recommends: icc-examin %endif +Recommends: kolor-manager +Provides: compiz-decorator = %{version} %description kde4 This package contains the KDE4 window decorator for the Compiz compositing manager. -%endif %package devel Summary: OpenGL window and compositing manager @@ -288,10 +276,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%if 0%{?suse_version} <= 1110 -# Reverse back to old GTK symbols. -%patch5 -p1 -R -%endif %patch6 -p1 -R %patch7 -p1 %patch8 -p1 @@ -311,7 +295,11 @@ %else --disable-kde \ %endif +%if 0%{?suse_version} > 1310 + --disable-metacity \ +%else --enable-metacity \ +%endif %if 0%{?suse_version} > 1230 --disable-kde4 \ %endif @@ -443,9 +431,9 @@ %kde_prefix/share/config.kcfg/compiz-* %endif -%if 0%{?suse_version} < 1310 %files kde4 %defattr(-, root, root) +%if 0%{?suse_version} < 1310 %{_bindir}/kde4-window-decorator %{_bindir}/startkde-compiz %{_datadir}/xsessions/kde-compiz.desktop -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
