Hello community, here is the log from the commit of package compiz-plugins-main for openSUSE:Factory checked in at 2012-06-06 16:06:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compiz-plugins-main (Old) and /work/SRC/openSUSE:Factory/.compiz-plugins-main.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "compiz-plugins-main", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/compiz-plugins-main/compiz-plugins-main.changes 2011-09-28 14:06:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.compiz-plugins-main.new/compiz-plugins-main.changes 2012-06-06 16:06:13.000000000 +0200 @@ -2 +2 @@ -Wed Sep 21 19:36:22 UTC 2011 - dimstar@opensuse.org +Thu May 31 12:00:00 UTC 2012 - robertherb@arcor.de @@ -4,2 +4 @@ -- Upudate to version 0.9.5.94: - + Fixed window type fixes in workarounds +- use correct license format @@ -8 +7 @@ -Wed Jul 6 18:32:08 UTC 2011 - dimstar@opensuse.org +Tue Apr 28 12:00:00 UTC 2011 - robertherb@arcor.de @@ -10,57 +9 @@ -- Update to version 0.9.5: - + Keep version in sync with main package - + API adjustments - + Bug fixing - -------------------------------------------------------------------- -Mon May 30 19:40:47 UTC 2011 - dimstar@opensuse.org - -- Forward to commit 9c545a3e0555e63d024c4c58155b5727c97a88de - -------------------------------------------------------------------- -Sat Feb 12 18:15:17 UTC 2011 - dimstar@opensuse.org - -- Update to commit a493658e055c59226de31406fe622aec3d4a1c6f: - + Fixes bugs: bnc#670124, bnc#670600, bnc#670605. - -------------------------------------------------------------------- -Sun Jan 16 22:10:29 UTC 2011 - dimstar@opensuse.org - -- Forward to commit 2960289ab3cca55c529aac020b1297d5cfeb58a1 - + Keep in sync with compiz main package. - + The install layout was fixed, no more gnome specific plugins. - -------------------------------------------------------------------- -Mon Nov 8 19:46:09 UTC 2010 - dimstar@opensuse.org - -- Update to version 0.9.2.1: - + Critical crasher bugfixes. -- Changes from version 0.9.2: - + Added MultiAnim class to Animation plugin - + Added support for KDE 4.5 blur hinting - + Added "natural" scale mode - + Added fake mninimization support - + Use libxml to write the session save file - -------------------------------------------------------------------- -Wed Nov 3 22:45:46 UTC 2010 - dimstar@opensuse.org - -- Forward to commit b2dfad5617c03fc07e32deffd84b5519b79f7864 - -------------------------------------------------------------------- -Wed Aug 25 21:22:31 UTC 2010 - dimstar@opensuse.org - -- Forward to git snapshot of today. -- BuildRequire gconf2-devel and use gconf_schemas_requires. - -------------------------------------------------------------------- -Sun Jul 4 09:13:53 UTC 2010 - dimstar@opensuse.org - -- Update to 0.9.0 - + Rewrite to C++ - + Follow API changes of compiz core. - -------------------------------------------------------------------- -Tue Jun 1 14:19:32 UTC 2010 - dimstar@opensuse.org - -- Update to 0.9 git snapshot for preview. +- Update to version 0.8.8 Old: ---- compiz-plugins-main.tar.bz2 update.sh New: ---- compiz-fusion-plugins-main-bnc511578.patch compiz-fusion-plugins-main-defaults.patch compiz-plugins-main-0.8.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-plugins-main.spec ++++++ --- /var/tmp/diff_new_pack.v3lFeq/_old 2012-06-06 16:06:15.000000000 +0200 +++ /var/tmp/diff_new_pack.v3lFeq/_new 2012-06-06 16:06:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package compiz-plugins-main # -# 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,33 +18,60 @@ Name: compiz-plugins-main -Version: 0.9.5.94 -Release: 1 -License: GPLv2+ -Summary: Compiz-Fusion community main plugins -Url: http://opencompositing.org -Group: System/X11/Utilities -Source: %{name}.tar.bz2 -# Helper script to update to latest gip snapshots. -Source99: update.sh BuildRequires: Mesa-devel -BuildRequires: boost-devel BuildRequires: cairo-devel -BuildRequires: cmake +BuildRequires: compiz-bcop BuildRequires: compiz-devel +BuildRequires: dbus-1-devel BuildRequires: gcc-c++ BuildRequires: gconf2-devel +BuildRequires: gnome-desktop-devel +BuildRequires: gtk2-devel +BuildRequires: intltool BuildRequires: libjpeg-devel +BuildRequires: librsvg-devel +BuildRequires: libwnck-devel +BuildRequires: libxslt-devel BuildRequires: pango-devel -BuildRequires: pkg-config +BuildRequires: perl-XML-Parser +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +%if 0%{suse_version} < 01120 +BuildRequires: compiz-kde +%endif +%if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10" +BuildRequires: xorg-x11-compat70-devel +%endif +%if %suse_version <= 1021 +BuildRequires: gconf2-rpm-macros +%endif +Version: 0.8.8 +Release: 1 +License: GPL-2.0+ +Summary: Compiz-Fusion community main plugins +Url: http://opencompositing.org +Group: System/X11/Utilities +Source: %{name}-%{version}.tar.bz2 +#default preference settings +Patch1: compiz-fusion-plugins-main-defaults.patch +# PATCH-FIX-UPSTREAM compiz-fusion-plugins-main-bnc511578.patch bnc#511578 dimstar@opensuse.org -- Fix undefined code. +Patch3: compiz-fusion-plugins-main-bnc511578.patch +PreReq: %fillup_prereq Requires: compiz +Obsoletes: compiz-fusion-plugins-git +Obsoletes: compiz-fusion-plugins-main < %{version} +Provides: compiz-fusion-plugins-main = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: compiz-extra compiz-extra-git ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 -%if 0%{?suse_version} >= 1140 -%gconf_schemas_requires +%define gnome_prefix %(pkg-config --variable=prefix gnome-desktop-2.0) +%if "%gnome_prefix" == "/usr" +%define gnome_etc /etc %else -%gconf_schemas_prereq +%define gnome_etc /etc%gnome_prefix %endif +#%define _libsuffix %(echo %{_lib} | cut -b4-) +%gconf_schemas_prereq %description This package contains Compiz-Fusion community main plugins. @@ -56,10 +83,36 @@ License: GPLv2+ Summary: Compiz-Fusion community main plugins Group: System/X11/Utilities -Requires: %{name} = %{version} +Provides: compiz-fusion-plugins-main-devel = %{version} +Obsoletes: compiz-fusion-plugins-main-devel < %{version} +Requires: %name = %version +Requires: Mesa-devel Requires: cairo-devel +Requires: compiz-bcop Requires: compiz-devel +Requires: dbus-1-devel +Requires: gcc-c++ +Requires: gconf2-devel +Requires: gnome-desktop-devel +Requires: gtk2-devel +Requires: intltool +Requires: libjpeg-devel +Requires: librsvg-devel +Requires: libwnck-devel +Requires: libxslt-devel Requires: pango-devel +Requires: perl-XML-Parser +Requires: update-desktop-files +Requires: xorg-x11-devel +%if 0%{suse_version} < 01120 +BuildRequires: compiz-kde +%endif +%if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10" +Requires: xorg-x11-compat70-devel +%endif +%if %suse_version <= 1021 +Requires: gconf2-rpm-macros +%endif %description devel This package contains Compiz-Fusion community main plugins. @@ -68,53 +121,51 @@ scaleaddon snap text thumbnail vpswitch wall winrules workarounds. %prep -%setup -q -n %{name} -mkdir build +%setup -q +%patch1 -p1 +%patch3 -p1 %build -CMAKE_MODULE_PATH="%{_datadir}/compiz/cmake:%{_datadir}/cmake/Modules:$CMAKE_MODULE_PATH" -pushd build -export BUILD_GLOBAL=true -cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -Dbindir=%{_bindir} \ - -Ddatadir=%{_datadir} \ - -Dincludedir=%{_includedir} \ - -Dlibdir=%{_libdir} \ - -Ddatadir=%{_datadir} \ - -DCOMPIZ_INSTALL_GCONF_SCHEMA_DIR=%{_sysconfdir}/gconf/schemas \ - -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=TRUE \ - -DCOMPIZ_PACKAGING_ENABLED=TRUE \ - -DCOMPIZ_DESTDIR=%{buildroot} \ -.. -make VERBOSE=1 -popd +# +#### plugins-main +# +#mkdir BUILD +#pushd BUILD +#cmake -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ +# -DLIB_SUFFIX=%{_lib}suffix -DCF_DISABLE_SCHEMAS_INSTALL=TRUE \ +# -DCF_INSTALL_GCONF_SCHEMA_DIR=%gnome_etc/gconf/schemas -d ../ +#popd +export IMAGEDIR=%{buildroot}%{_datadir}/compiz +%configure --disable-static --with-pic --enable-schemas --with-gconf-schema-file-dir=%gnome_etc/gconf/schemas --disable-schemas-install +make %{?jobs:-j%jobs} %install -pushd build -make install -popd +%makeinstall +find %{buildroot} -type f -name "*.la" | xargs rm -f +#remove locale data as it is not required anymore, translations are merged in .xml and .schemas +rm -r %{buildroot}%{_datadir}/locale %find_gconf_schemas -%clean -%__rm -rf %{buildroot} - %pre -f %name.schemas_pre %preun -f %name.schemas_preun %posttrans -f %name.schemas_posttrans -%files -f %{name}.schemas_list +%clean +%__rm -rf %{buildroot} + +%files -f %name.schemas_list %defattr(-, root, root) -%{_libdir}/compiz/*.so -%{_datadir}/compiz/ +%{_libdir}/compiz/* +%{_datadir}/compiz/* %files devel %defattr(-, root, root) -%{_includedir}/compiz/animation -%{_includedir}/compiz/mousepoll -%{_includedir}/compiz/text +%dir %{_includedir}/compiz +%{_includedir}/compiz/*.h +%if %suse_version >= 1020 %{_libdir}/pkgconfig/*.pc +%endif %changelog ++++++ compiz-fusion-plugins-main-bnc511578.patch ++++++ diff -aurp compiz-fusion-plugins-main-0.7.8/src/colorfilter/colorfilter.c compiz-fusion-plugins-main-0.7.8.patched/src/colorfilter/colorfilter.c --- compiz-fusion-plugins-main-0.7.8/src/colorfilter/colorfilter.c 2008-09-17 15:29:14.000000000 +0200 +++ compiz-fusion-plugins-main-0.7.8.patched/src/colorfilter/colorfilter.c 2009-08-24 19:04:29.000000000 +0200 @@ -168,7 +168,7 @@ colorFilterSwitchFilter (CompScreen * s) FILTER_SCREEN (s); /* % (count + 1) because of the cumulative filters mode */ - cfs->currentFilter = ++cfs->currentFilter % (cfs->filtersCount + 1); + cfs->currentFilter = (cfs->currentFilter + 1) % (cfs->filtersCount + 1); if (cfs->currentFilter == 0) compLogMessage ("colorfilter", CompLogLevelInfo, "Cumulative filters mode"); ++++++ compiz-fusion-plugins-main-defaults.patch ++++++ diff -ur a/metadata/wall.xml.in b/metadata/wall.xml.in --- a/metadata/wall.xml.in 2008-09-17 18:59:14.000000000 +0530 +++ b/metadata/wall.xml.in 2008-10-12 12:58:35.000000000 +0530 @@ -25,7 +25,7 @@ <option name="miniscreen" type="bool"> <_short>Show Live Viewport Previews <_long>Show live viewport previews in switcher window - <default>false</default> + <default>true</default> </option> <option name="preview_timeout" type="float"> <_short>Switch Target Preview Visibility Time -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org