Hello community, here is the log from the commit of package libcompizconfig for openSUSE:Factory checked in at 2012-06-06 16:07:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcompizconfig (Old) and /work/SRC/openSUSE:Factory/.libcompizconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcompizconfig", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libcompizconfig/libcompizconfig.changes 2011-09-29 12:52:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcompizconfig.new/libcompizconfig.changes 2012-06-06 16:07:47.000000000 +0200 @@ -2 +2 @@ -Thu Sep 29 07:17:48 UTC 2011 - [email protected] +Tue Apr 28 12:00:00 UTC 2011 - [email protected] - 0.8.8 @@ -4,60 +4 @@ -- Add libcompizconfig-backend-path.patch: Revert the change of the - backend installation location. This is simply not where - libcompizconfig is looking to find the backends. - -------------------------------------------------------------------- -Wed Sep 21 19:37:04 UTC 2011 - [email protected] - -- Update to version 0.9.5.94: - + Added settings upgrade framework for distributions - -------------------------------------------------------------------- -Fri Jul 8 12:01:28 UTC 2011 - [email protected] - -- Add gconf schema handling macros. - -------------------------------------------------------------------- -Sat Jan 22 23:41:41 UTC 2011 - [email protected] - -- Keep in sync with compiz main package: - + No more gconf schema handling required. - -------------------------------------------------------------------- -Sun Jan 16 22:12:22 UTC 2011 - [email protected] - -- Forward to commit 78a7cc8ca71020dff42dd2731071bfdf548ea2e8 - -------------------------------------------------------------------- -Tue Nov 16 17:33:03 UTC 2010 - [email protected] - -- Bump .spec version to 0.9.2.1 to reflect reality. - -------------------------------------------------------------------- -Mon Nov 8 19:58:41 UTC 2010 - [email protected] - -- Update to version 0.9.2.1: - + Version bump only. -- Changes from version 0.9.2: - + Fixed symbol linking issue with backends. - -------------------------------------------------------------------- -Wed Nov 3 22:33:17 UTC 2010 - [email protected] - -- Forward to commit 2526029f717644ee856af8a462228fd40ed60424 - -------------------------------------------------------------------- -Sun Jul 4 09:06:41 UTC 2010 - [email protected] - -- Update to 0.9.0 - + Removed multiscreen support to reflect core API changes - + Added cMake Buildsystem. - -------------------------------------------------------------------- -Tue Jun 1 18:03:09 UTC 2010 - [email protected] - -- Update to 0.9 git snapshot for preview. - -------------------------------------------------------------------- -Fri Apr 23 00:16:46 CEST 2010 - [email protected] - -- Completely drop NOMAD patches. +- Update to version 0.8.8 Old: ---- libcompizconfig-backend-path.patch libcompizconfig.tar.bz2 update.sh New: ---- libcompizconfig-0.8.8.tar.bz2 libcompizconfig-NOMAD.diff libcompizconfig-config-dir.patch libcompizconfig-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcompizconfig.spec ++++++ --- /var/tmp/diff_new_pack.ZOOkMW/_old 2012-06-06 16:07:50.000000000 +0200 +++ /var/tmp/diff_new_pack.ZOOkMW/_new 2012-06-06 16:07:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcompizconfig # -# 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,37 +18,56 @@ Name: libcompizconfig -Version: 0.9.5.94 +Version: 0.8.8 Release: 1 License: GPL-2.0+ Summary: CompizConfig plugin(ccp) required for compizconfig-settings-manager(ccsm) Url: http://opencompositing.org Group: System/X11/Utilities -Source: %name.tar.bz2 -# Helper script to update to latest git. -Source99: update.sh -# PATCH-FIX-UPSTREAM [email protected] -- Change the backend install location. As this seems wrong, we revert this commit for now. Reported upstream. -Patch0: libcompizconfig-backend-path.patch -BuildRequires: boost-devel -BuildRequires: cmake +Source: %name-%version.tar.bz2 +Source1: libcompizconfig-rpmlintrc +# PATCH-NEEDS-REBASE: libcompizconfig-NOMAD.diff [email protected] (Was: PATCH-FEATURE-UPSTREAM) +Patch0: libcompizconfig-NOMAD.diff +# PATCH-FIX-UPSTREAM libcompizconfig-config-dir.patch bnc#438081 [email protected] +Patch2: libcompizconfig-config-dir.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: compiz-devel +BuildRequires: compiz-gnome BuildRequires: gcc-c++ -BuildRequires: gconf2-devel -BuildRequires: protobuf-devel +BuildRequires: glib2-devel +BuildRequires: intltool +BuildRequires: libtool +BuildRequires: libxslt-devel +BuildRequires: perl-XML-Parser +BuildRequires: pkg-config +BuildRequires: startup-notification-devel +PreReq: %fillup_prereq +Requires: compiz +Provides: ccs-lib = %{version} +Obsoletes: ccs-lib <= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 -%gconf_schemas_prereq %description CompizConfig plugin(ccp) required for compizconfig-settings-manager(ccsm). %package devel -License: GPL-2.0+ +License: GPL v2 or later Summary: Development files for libcompizconfig Group: Development/Libraries/C and C++ -Requires: libcompizconfig +Requires: %name = %version +Requires: autoconf +Requires: automake Requires: compiz-devel +Requires: compiz-gnome +Requires: glib2-devel +Requires: intltool +Requires: libtool +Requires: libxslt-devel +Requires: perl-XML-Parser +Requires: pkg-config %description devel CompizConfig plugin(ccp) required for @@ -57,62 +76,42 @@ This package contains development files. %prep -%setup -q -n %{name} -%patch0 -p1 -R -mkdir build +%setup -q -n libcompizconfig-%{version} +# NEEDS REBASE +#%patch0 -p1 +%patch2 -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 +# +####libcompizconfig +# +%configure --disable-static --with-pic +make %{?jobs:-j%jobs} %install -pushd build -make install -install -D -m 644 ../cmake/FindCompizConfig.cmake %{buildroot}%{_datadir}/cmake/Modules/FindCompizConfig.cmake -popd -%find_gconf_schemas +%makeinstall +find %{buildroot} \( -name \*.la \) -print0 | xargs -0 rm -fv %clean +%__rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%pre -f %name.schemas_pre - -%preun -f %name.schemas_preun - -%posttrans -f %name.schemas_posttrans - -%files -f %{name}.schemas_list +%files %defattr(-, root, root) -%{_libdir}/compizconfig/ -%{_libdir}/compiz/libccp.so -%{_libdir}/libcompizconfig.so.0* +%{_libdir}/compiz* +%{_libdir}/libcompizconfig*.so.* +%dir %{_datadir}/compiz %{_datadir}/compiz/ccp.xml -%config(noreplace) %{_sysconfdir}/compizconfig +%dir %{_sysconfdir}/compizconfig +%{_sysconfdir}/compizconfig/config %files devel %defattr(-, root, root) -%{_includedir}/ccs*.h -%{_libdir}/libcompizconfig.so %{_libdir}/pkgconfig/libcompizconfig.pc -%{_datadir}/compiz/cmake/*.cmake -%{_datadir}/cmake/Modules/*.cmake +%{_includedir}/* +%{_libdir}/libcompizconfig*.so %changelog ++++++ libcompizconfig-NOMAD.diff ++++++ diff --git a/metadata/global.xml b/metadata/global.xml index 8839f59..561532c 100644 --- a/metadata/global.xml +++ b/metadata/global.xml @@ -6,6 +6,9 @@ <type>string</type> <default> <value>core</value> + <value>wm</value> + <value>glx</value> + <value>dmx</value> <value>dbus</value> <value>place</value> <value>move</value> @@ -207,6 +210,10 @@ <plugin name="glib"> <category>Utility</category> </plugin> + <!-- glx metadata --> + <plugin name="glx"> + <category>Utility</category> + </plugin> <!-- inotify metadata --> <plugin name="inotify"> <category>Utility</category> @@ -405,6 +412,10 @@ <plugin name="water"> <category>Effects</category> </plugin> + <!-- wm metadata --> + <plugin name="wm"> + <category>Utility</category> + </plugin> <!-- wobbly metadata --> <plugin name="wobbly"> <category>Effects</category> ++++++ libcompizconfig-config-dir.patch ++++++ Index: libcompizconfig-0.7.8/src/config.c =================================================================== --- libcompizconfig-0.7.8.orig/src/config.c +++ libcompizconfig-0.7.8/src/config.c @@ -27,7 +27,7 @@ #include "ccs-private.h" -#define SETTINGPATH "compiz/compizconfig" +#define SETTINGPATH "compiz/compizconfig-1" static char* getConfigFileName (void) Index: libcompizconfig-0.7.8/backend/ini.c =================================================================== --- libcompizconfig-0.7.8.orig/backend/ini.c +++ libcompizconfig-0.7.8/backend/ini.c @@ -38,7 +38,7 @@ #include <X11/Xlib.h> #define DEFAULTPROF "Default" -#define SETTINGPATH "compiz/compizconfig" +#define SETTINGPATH "compiz/compizconfig-1" typedef struct _IniPrivData { ++++++ libcompizconfig-rpmlintrc ++++++ addFilter("libcompizconfig shlib-policy-missing-suffix") addFilter("libcompizconfig shlib-policy-nonversioned-dir") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
