Mailinglist Archive: opensuse-commit (2129 mails)
| < Previous | Next > |
commit compiz
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 23 Apr 2008 01:17:29 +0200
- Message-id: <20080422231729.EA100678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package compiz
checked in at Wed Apr 23 01:17:29 CEST 2008.
--------
--- compiz/compiz.changes 2008-04-14 20:19:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2008-04-22
14:25:31.462895000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 22 14:29:49 CEST 2008 - rodrigo@xxxxxxx
+
+- Disable gnome-xgl-settings, its functionality is now provided
+ in simple-ccsm.
+- Depend on gnome-control-center*, not control-center2
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.L19896/_old 2008-04-23 01:17:11.000000000 +0200
+++ /var/tmp/diff_new_pack.L19896/_new 2008-04-23 01:17:11.000000000 +0200
@@ -12,7 +12,7 @@
Name: compiz
-BuildRequires: Mesa-devel control-center2-devel freeglut-devel gcc-c++
gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel
libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files
xorg-x11-devel
+BuildRequires: Mesa-devel freeglut-devel gcc-c++ gconf2-devel
gnome-control-center-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel
librsvg-devel libwnck-devel metacity pango-devel perl-XML-Parser
update-desktop-files xorg-x11-devel
%if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10"
BuildRequires: xorg-x11-compat70-devel
%endif
@@ -35,7 +35,7 @@
Enhances: xgl >= git_070104
AutoReqProv: on
Version: 0.7.4
-Release: 1
+Release: 6
Requires: compiz-decorator = %{version}
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -88,7 +88,7 @@
License: GPL v2 or later; X11/MIT
Summary: OpenGL window and compositing manager configuration utilities
Group: System/GUI/GNOME
-Requires: gnome-desktop control-center2 xgl-hardware-list >= 060526
3ddiag freeglut pciutils %name = %version
+Requires: gnome-desktop gnome-control-center xgl-hardware-list >= 060526
3ddiag freeglut pciutils %name = %version
Requires: metacity >= 2.15.1
Provides: compiz-decorator = %version
AutoReqProv: on
@@ -143,7 +143,7 @@
License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
Summary: OpenGL window and compositing manager.
Group: System/GUI/Other
-Requires: Mesa-devel control-center2-devel freeglut-devel gcc-c++
gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel
libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files
xorg-x11-devel %name = %version
+Requires: Mesa-devel gnome-control-center-devel freeglut-devel gcc-c++
gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel
libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files
xorg-x11-devel %name = %version
%if 0%{suse_version} < 01020
Requires: xorg-x11-compat70-devel
%endif
@@ -172,7 +172,8 @@
%prep
#%%setup -q -c -n %name -T -a 0 -a 1 -a 2
-%setup -q -c -n %name -T -a 0 -a 2
+#%setup -q -c -n %name -T -a 0 -a 2
+%setup -q -c -n %name -T -a 0
cd compiz-*
%patch
%patch1 -p1
@@ -185,10 +186,10 @@
#%patch7 -p1
#%patch9 -p1
cd -
-cd gnome-xgl-*
-%patch29 -p1
-%patch36 -p1
-sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c
./xgl-settings/gnome-xgl-switch
+#cd gnome-xgl-*
+#%patch29 -p1
+#%patch36 -p1
+#sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c
./xgl-settings/gnome-xgl-switch
cd -
#cd Mesa-*
#%patch60
@@ -237,10 +238,10 @@
#
##### gnome-xgl-settings
#
-pushd gnome-xgl-settings-*
-./configure --prefix=%gnome_prefix
-make %{?jobs:-j%jobs} CFLAGS="%optflags"
-popd
+#pushd gnome-xgl-settings-*
+#./configure --prefix=%gnome_prefix
+#make %{?jobs:-j%jobs} CFLAGS="%optflags"
+#popd
%install
pushd compiz-*
@@ -249,20 +250,20 @@
#remove locale data as it is not required anymore, translations are merged in
.xml and .schemas
rm -r %buildroot/usr/share/locale
popd
-pushd gnome-xgl-settings-*
-%makeinstall
-popd
+#pushd gnome-xgl-settings-*
+#%makeinstall
+#popd
install -d -m 755 %buildroot%xorg_prefix
install -d -m 755 %buildroot/var/adm/fillup-templates
find %buildroot \( -name \*.a -o -name \*.la \) -print0 | xargs -0 rm -f
install -m 444 %_sourcedir/opensuse.png %buildroot%_datadir/compiz/
install -m 755 %_sourcedir/compiz-decorator %buildroot%_bindir/
%find_gconf_schemas
-%find_lang xgl-settings
+#%find_lang xgl-settings
touch %name.schemas_pre %name.schemas_preun %name.schemas_posttrans
%name.schemas_list
-%if "%gnome_prefix" != "/usr"
-mv %buildroot%gnome_prefix/bin/gnome-xgl-info
%buildroot%gnome_prefix/bin/gnome-xgl-switch %buildroot%_bindir/ || true
-%endif
+#%if "%gnome_prefix" != "/usr"
+#mv %buildroot%gnome_prefix/bin/gnome-xgl-info
%buildroot%gnome_prefix/bin/gnome-xgl-switch %buildroot%_bindir/ || true
+#%endif
%pre -f %name.schemas_pre
@@ -280,8 +281,8 @@
%defattr(-, root, root)
%_bindir/compiz
%_bindir/compiz-decorator
-%_bindir/gnome-xgl-info
-%_bindir/gnome-xgl-switch
+#%_bindir/gnome-xgl-info
+#%_bindir/gnome-xgl-switch
%_libdir/libdecoration.so.*
%dir %_libdir/compiz
%_libdir/compiz/libannotate.so
@@ -320,21 +321,22 @@
%dir %_includedir/compiz
%_includedir/compiz/*.h
%_datadir/compiz/*.xslt
+#%files -f xgl-settings.lang gnome
-%files -f xgl-settings.lang gnome
+%files gnome
%defattr(-, root, root)
%_bindir/gtk-window-decorator
%_libdir/compiz/libglib.so
%_libdir/compiz/libgconf.so
%_libdir/compiz/libsvg.so
-%gnome_prefix/bin/gnome-xgl-settings
-%gnome_prefix/share/applications/gnome-xgl-settings.desktop
-%dir %gnome_prefix/share/gnome-xgl-settings
-%gnome_prefix/share/gnome-xgl-settings/xgl-settings-capplet.svg
-%gnome_prefix/share/gnome-xgl-settings/xgl-icon-16.png
-%gnome_prefix/share/gnome-xgl-settings/xgl-icon-22.png
-%gnome_prefix/share/gnome-xgl-settings/gnome-xgl-settings.glade
-%gnome_prefix/share/pixmaps/xgl-settings-capplet.svg
+#%gnome_prefix/bin/gnome-xgl-settings
+#%gnome_prefix/share/applications/gnome-xgl-settings.desktop
+#%dir %gnome_prefix/share/gnome-xgl-settings
+#%gnome_prefix/share/gnome-xgl-settings/xgl-settings-capplet.svg
+#%gnome_prefix/share/gnome-xgl-settings/xgl-icon-16.png
+#%gnome_prefix/share/gnome-xgl-settings/xgl-icon-22.png
+#%gnome_prefix/share/gnome-xgl-settings/gnome-xgl-settings.glade
+#%gnome_prefix/share/pixmaps/xgl-settings-capplet.svg
%gnome_prefix/%_lib/window-manager-settings/libcompiz*
%gnome_prefix/share/gnome/wm-properties/compiz.desktop
%if "%gnome_prefix" != "/usr"
@@ -359,6 +361,10 @@
%endif
%changelog
+* Tue Apr 22 2008 rodrigo@xxxxxxx
+- Disable gnome-xgl-settings, its functionality is now provided
+ in simple-ccsm.
+- Depend on gnome-control-center*, not control-center2
* Mon Apr 14 2008 mhopf@xxxxxxx
- Update from buildservice.
* Thu Apr 03 2008 cyberorg@xxxxxxxxxxxxx
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |