Hello community, here is the log from the commit of package compiz checked in at Mon Apr 24 21:27:56 CEST 2006. -------- --- compiz/compiz.changes 2006-04-21 02:23:08.000000000 +0200 +++ STABLE/compiz/compiz.changes 2006-04-24 17:04:23.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 24 17:03:28 CEST 2006 - danw@suse.de + +- Update to gnome-xgl-settings 0.2 and add it back to the build. +- Patch compiz.schemas to make the switcher/initiate binding + clearer in gnome-keybinding-properties. + +------------------------------------------------------------------- Old: ---- xgl-switch-0.1.tar.bz2 xgl-switch-desktop.patch New: ---- compiz-schema.patch xgl-settings-0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.KhyRcI/_old 2006-04-24 21:27:30.000000000 +0200 +++ /var/tmp/diff_new_pack.KhyRcI/_new 2006-04-24 21:27:30.000000000 +0200 @@ -18,19 +18,19 @@ Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck Autoreqprov: on Version: cvs_060421 -Release: 2 +Release: 3 Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 ### /bin/ls *.tar.{gz,bz2} 2>/dev/null|perl -ne 'print "Source$n: ".$_; $n++;' Source: Mesa-CVS-20060413.tar.bz2 Source1: compiz-0.0.9.tar.bz2 -Source2: xgl-switch-0.1.tar.bz2 +Source2: xgl-settings-0.2.tar.bz2 ### /bin/ls *.{diff,patch} | perl -ne 'print "Patch$n: ".$_; $n++;' Patch: Mesa-6.4.1-x86_64-fixes-1.patch Patch1: Mesa-configs.diff Patch2: mesa-tfp-defines-1.patch -Patch3: xgl-switch-desktop.patch +Patch3: compiz-schema.patch %description Compiz is an OpenGL compositing manager that use @@ -52,7 +52,7 @@ patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-6.4.1-x86_64-fixes-1.patch patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-configs.diff patch -d Mesa -p0 < $RPM_SOURCE_DIR/mesa-tfp-defines-1.patch -patch -p0 < $RPM_SOURCE_DIR/xgl-switch-desktop.patch +patch -d compiz-* -p0 < $RPM_SOURCE_DIR/compiz-schema.patch %build PREFIX=/usr @@ -92,19 +92,18 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL popd # -##### xgl-switch +##### xgl-settings # -#pushd xgl-switch-* || exit 1 -#./configure --prefix=/opt/gnome -#make DESTDIR=$RPM_BUILD_ROOT install || exit 1 -#popd +pushd xgl-settings-* || exit 1 +./configure --prefix=/opt/gnome +make DESTDIR=$RPM_BUILD_ROOT install || exit 1 +popd %install PREFIX=/usr mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates $RPM_BUILD_ROOT$PREFIX find $RPM_BUILD_ROOT \( -name \*.a -o -name \*.la \) -print -execdir rm \{\} + rm -rf $RPM_BUILD_ROOT$PREFIX/%_lib/pkgconfig $RPM_BUILD_ROOT$PREFIX/include -rm -f $RPM_BUILD_ROOT$PREFIX/%_lib/compiz/libgconf-dump.so %post opt/gnome/bin/gconftool-2 --shutdown @@ -126,14 +125,22 @@ #/usr/%_lib/pkgconfig/*.pc /opt/gnome/%_lib/window-manager-settings/libcompiz* /opt/gnome/share/gnome/wm-properties/compiz.desktop -#/opt/gnome/bin/gnome-xgl-switch -#/opt/gnome/share/applications/gnome-xgl-switch.desktop -#/opt/gnome/share/control-center-2.0/icons/xgl-switch-capplet.png -#/opt/gnome/share/control-center-2.0/interfaces/gnome-xgl-switch.glade -#/opt/gnome/share/pixmaps/xgl-switch-capplet.png +/opt/gnome/bin/gnome-xgl-settings +/opt/gnome/bin/gnome-xgl-info +/opt/gnome/bin/gnome-xgl-switch +/opt/gnome/share/applications/gnome-xgl-settings.desktop +/opt/gnome/share/control-center-2.0/icons/xgl-settings-capplet.svg +/opt/gnome/share/control-center-2.0/icons/xgl-icon-16.png +/opt/gnome/share/control-center-2.0/icons/xgl-icon-22.png +/opt/gnome/share/control-center-2.0/interfaces/gnome-xgl-settings.glade +/opt/gnome/share/pixmaps/xgl-settings-capplet.svg /etc/opt/gnome/gconf/schemas/compiz.schemas %changelog -n compiz +* Mon Apr 24 2006 - danw@suse.de +- Update to gnome-xgl-settings 0.2 and add it back to the build. +- Patch compiz.schemas to make the switcher/initiate binding + clearer in gnome-keybinding-properties. * Fri Apr 21 2006 - dreveman@suse.de - Add window menu binding. - Default bindings now the same as metacity. Alt-Button2 for ++++++ compiz-schema.patch ++++++ Index: plugins/compiz.schemas =================================================================== RCS file: /cvs/xorg/app/compiz/plugins/compiz.schemas,v retrieving revision 1.10 diff -u -r1.10 compiz.schemas --- plugins/compiz.schemas 24 Apr 2006 14:16:25 -0000 1.10 +++ plugins/compiz.schemas 24 Apr 2006 14:46:28 -0000 @@ -1616,7 +1616,7 @@ <type>string</type> <default><Alt>Tab</default> <locale name="C"> - <short>Initiate</short> + <short>Initiate Window Switcher</short> <long> Show switcher </long> @@ -1827,7 +1827,7 @@ <type>string</type> <default>Pause</default> <locale name="C"> - <short>Initiate</short> + <short>Initiate Window Picker</short> <long> Layout and start transforming windows </long> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...