Hello community, here is the log from the commit of package compiz for openSUSE:Factory checked in at Mon Jun 27 15:30:18 CEST 2011.
-------- --- compiz/compiz.changes 2011-02-21 15:27:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2011-06-27 12:07:00.000000000 +0200 @@ -1,0 +2,29 @@ +Mon Jun 27 10:05:42 UTC 2011 - dims...@opensuse.org + +- Remove gnome bits: there seems no plan upstream yet to re-enable + the integration into GNOME desktop. Missing feature is mostly the + keyboard binding sync between gnome and compiz (on the other + hand, both seem to use the same gconf keys by now). + +------------------------------------------------------------------- +Fri Jun 3 11:11:38 UTC 2011 - dims...@opensuse.org + +- Forward to commit f3a17768d665abab97b888d4d6e66f47770c27df + +------------------------------------------------------------------- +Wed May 18 21:39:41 UTC 2011 - dims...@opensuse.org + +- Extend update.sh to extract the version from the git folder and + inject it into the .spec file. + +------------------------------------------------------------------- +Sun Mar 6 17:48:02 UTC 2011 - dims...@opensuse.org + +- Drop compiz-kde-w-d.patch: included upstream. + +------------------------------------------------------------------- +Sun Mar 6 17:08:57 UTC 2011 - dims...@opensuse.org + +- Forward to commit 16295397033bee4ace327b6ba48830e844e77b4d + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- compiz-kde-w-d.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.RblPcI/_old 2011-06-27 15:26:59.000000000 +0200 +++ /var/tmp/diff_new_pack.RblPcI/_new 2011-06-27 15:26:59.000000000 +0200 @@ -19,8 +19,8 @@ Name: compiz -Version: 0.9.2.1 -Release: 8 +Version: 0.9.5 +Release: 1 License: GPLv2+ ; MIT License (or similar) Summary: OpenGL window and compositing manager Url: http://www.compiz.org @@ -32,8 +32,6 @@ Source99: update.sh # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: 0001-Use-dynamic-allocation-for-plugin-class-indexes-and-.patch -# PATCH-FIX-UPSTREAM compiz-kde-w-d.patch bnc#671672 dims...@opensuse.org -- Fix kde window decorator maximize/minimize -Patch1: compiz-kde-w-d.patch BuildRequires: Mesa-devel BuildRequires: boost-devel BuildRequires: cairo-devel @@ -59,9 +57,10 @@ # BuildRequires. BuildRequires: pkgconfig(gnome-desktop-2.0) BuildRequires: pkgconfig(gnome-keybindings) -BuildRequires: pkgconfig(gnome-window-settings-2.0) +#BuildRequires: pkgconfig(gnome-window-settings-2.0) BuildRequires: pkgconfig(libmetacity-private) BuildRequires: pkgconfig(libwnck-1.0) +BuildRequires: pkgconfig(glibmm-2.4) %else BuildRequires: gconf2-devel BuildRequires: gnome-control-center-devel @@ -69,6 +68,7 @@ BuildRequires: libgnome-window-settings-devel BuildRequires: libwnck-devel BuildRequires: metacity-devel +BuildRequires: glibmm-devel %endif Recommends: %{name}-lang Provides: windowmanager @@ -178,7 +178,6 @@ %if 0%{?suse_version} > 1120 %patch0 -p1 %endif -%patch1 -p1 mkdir build %build @@ -203,11 +202,9 @@ pushd build make install install -D -m 644 ../cmake/FindCompiz.cmake %{buildroot}%{_datadir}/cmake/Modules/FindCompiz.cmake -#remove locale data as it is not required anymore, translations are merged in .xml and .schemas -install -m 444 %{S:1} %{buildroot}%{_datadir}/%{name}/images/ -install -m 444 %{S:2} %{buildroot}%{_datadir}/%{name}/images/ +install -D -m 644 %{S:1} %{buildroot}%{_datadir}/%{name}/cube/images/opensuse.png +install -D -m 644 %{S:2} %{buildroot}%{_datadir}/%{name}/cube/images/sle.png popd -%suse_update_desktop_file %{name} %find_gconf_schemas %find_lang %{name} @@ -222,27 +219,27 @@ %postun -p /sbin/ldconfig %post -n compiz-branding-openSUSE -/bin/ln -sf /usr/share/compiz/images/opensuse.png /usr/share/compiz/cube-image.png +/bin/ln -sf /usr/share/compiz/cube/images/opensuse.png /usr/share/compiz/cube/images/cube-image.png %post -n compiz-branding-SLE -/bin/ln -sf /usr/share/compiz/images/sle.png /usr/share/compiz/cube-image.png +/bin/ln -sf /usr/share/compiz/cube/images/sle.png /usr/share/compiz/cube/images/cube-image.png %post -n compiz-branding-upstream -/bin/ln -sf /usr/share/compiz/images/freedesktop.png /usr/share/compiz/cube-image.png +/bin/ln -sf /usr/share/compiz/cube/images/freedesktop.png /usr/share/compiz/cube/images/cube-image.png %postun -n compiz-branding-openSUSE -if [ -L /usr/share/compiz/cube-image.png ]; then - rm /usr/share/compiz/cube-image.png || true +if [ -L /usr/share/compiz/cube/images/cube-image.png ]; then + rm /usr/share/compiz/cube/images/cube-image.png || true fi %postun -n compiz-branding-SLE -if [ -L /usr/share/compiz/cube-image.png ]; then - rm /usr/share/compiz/cube-image.png || true +if [ -L /usr/share/compiz/cube/images/cube-image.png ]; then + rm /usr/share/compiz/cube/images/cube-image.png || true fi %postun -n compiz-branding-upstream -if [ -L /usr/share/compiz/cube-image.png ]; then - rm /usr/share/compiz/cube-image.png || true +if [ -L /usr/share/compiz/cube/images/cube-image.png ]; then + rm /usr/share/compiz/cube/images/cube-image.png || true fi %clean @@ -252,11 +249,11 @@ %defattr(-, root, root) %{_bindir}/compiz %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/images -%{_datadir}/%{name}/images/icon.png +%dir %{_datadir}/%{name}/cube +%dir %{_datadir}/%{name}/cube/images +%ghost %attr(644,root,root) %{_datadir}/%{name}/cube/images/cube-image.png +%{_datadir}/%{name}/icon.png %{_libdir}/libdecoration.so.0* -%{_libdir}/window-manager-settings/libcompiz.so -%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/xslt %dir %{_libdir}/%{name} %{_libdir}/%{name}/libannotate.so @@ -322,15 +319,15 @@ %files branding-openSUSE %defattr(-, root, root) -%{_datadir}/compiz/images/opensuse.png +%{_datadir}/compiz/cube/images/opensuse.png %files branding-SLE %defattr(-, root, root) -%{_datadir}/compiz/images/sle.png +%{_datadir}/compiz/cube/images/sle.png %files branding-upstream %defattr(-, root, root) -%{_datadir}/compiz/images/freedesktop.png +%{_datadir}/compiz/cube/images/freedesktop.png %files devel %defattr(-, root, root) @@ -353,12 +350,8 @@ %files gnome -f %{name}.schemas_list %defattr(-, root, root) %{_bindir}/gtk-window-decorator -%{_libdir}/%{name}/libglib.so -%{_datadir}/%{name}/glib.xml %{_libdir}/%{name}/libgnomecompat.so %{_datadir}/%{name}/gnomecompat.xml -%{_datadir}/gnome-control-center/keybindings/50-compiz-*.xml -%{_datadir}/gnome/wm-properties/compiz-wm.desktop %files kde4 %defattr(-, root, root) ++++++ compiz.tar.bz2 ++++++ compiz/compiz.tar.bz2 /mounts/work_src_done/STABLE/compiz/compiz.tar.bz2 differ: byte 11, line 1 ++++++ update.sh ++++++ --- /var/tmp/diff_new_pack.RblPcI/_old 2011-06-27 15:26:59.000000000 +0200 +++ /var/tmp/diff_new_pack.RblPcI/_new 2011-06-27 15:26:59.000000000 +0200 @@ -13,6 +13,18 @@ # The last changelog entry already was an automatic forward... let's not pullute too much. sed -i 1,5d $oscmodule.changes fi + # Setting the version in the .spec file to what the CMakeList.txt has defined + if [ -f "${oscmodule}/VERSION" ]; then + VERSION=$(cat ${oscmodule}/VERSION) + else + version_major=$(grep -P 'set \(COMPIZ_VERSION_MAJOR ([0-9])+\)' ${oscmodule}/CMakeLists.txt | tr -d "()a-zA-Z_ ") + version_minor=$(grep -P 'set \(COMPIZ_VERSION_MINOR ([0-9])+\)' ${oscmodule}/CMakeLists.txt | tr -d "()a-zA-Z_ ") + version_micro=$(grep -P 'set \(COMPIZ_VERSION_MICRO ([0-9])+\)' ${oscmodule}/CMakeLists.txt | tr -d "()a-zA-Z_ ") + VERSION=${version_major}.${version_minor}.${version_micro} + fi + if [ -n "$VERSION" ]; then + sed -i "s/Version:.*/Version: ${VERSION}/" *.spec + fi tar cjf $oscmodule.tar.bz2 $oscmodule osc vc -m "Forward to $commitid" osc ci -m "Forward to $commitid" --skip-validation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
