remove update update-desktop-database from %post mate
- remove (noreplace) from mateconf schema dir - remove Requires(post): desktop-file-utils - add epoch tags
This commit is contained in:
raveit65
parent
9dcac2c352
commit
1ad7ce9732
|
|
@ -0,0 +1,82 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<KeyListEntries wm_name="Marco" package="marco" group="system" name="Navigation">
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/window_keybindings/move_to_workspace_1" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/window_keybindings/move_to_workspace_2" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="2" name="/apps/marco/window_keybindings/move_to_workspace_3" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="3" name="/apps/marco/window_keybindings/move_to_workspace_4" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="4" name="/apps/marco/window_keybindings/move_to_workspace_5" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="5" name="/apps/marco/window_keybindings/move_to_workspace_6" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="6" name="/apps/marco/window_keybindings/move_to_workspace_7" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="7" name="/apps/marco/window_keybindings/move_to_workspace_8" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="8" name="/apps/marco/window_keybindings/move_to_workspace_9" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="9" name="/apps/marco/window_keybindings/move_to_workspace_10" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="10" name="/apps/marco/window_keybindings/move_to_workspace_11" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="11" name="/apps/marco/window_keybindings/move_to_workspace_12" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/window_keybindings/move_to_workspace_left" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/window_keybindings/move_to_workspace_right" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/window_keybindings/move_to_workspace_up" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/window_keybindings/move_to_workspace_down" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/switch_windows"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/switch_group"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/switch_panels"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/cycle_windows"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/cycle_group"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/cycle_panels"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/show_desktop"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/global_keybindings/switch_to_workspace_1" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/global_keybindings/switch_to_workspace_2" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="2" name="/apps/marco/global_keybindings/switch_to_workspace_3" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="3" name="/apps/marco/global_keybindings/switch_to_workspace_4" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="4" name="/apps/marco/global_keybindings/switch_to_workspace_5" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="5" name="/apps/marco/global_keybindings/switch_to_workspace_6" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="6" name="/apps/marco/global_keybindings/switch_to_workspace_7" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="7" name="/apps/marco/global_keybindings/switch_to_workspace_8" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="8" name="/apps/marco/global_keybindings/switch_to_workspace_9" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="9" name="/apps/marco/global_keybindings/switch_to_workspace_10" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="10" name="/apps/marco/global_keybindings/switch_to_workspace_11" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="11" name="/apps/marco/global_keybindings/switch_to_workspace_12" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/global_keybindings/switch_to_workspace_left" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/global_keybindings/switch_to_workspace_right" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/global_keybindings/switch_to_workspace_up" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/global_keybindings/switch_to_workspace_down" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
</KeyListEntries>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<KeyListEntries wm_name="Marco" package="marco" group="system" name="System">
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/panel_run_dialog"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/global_keybindings/panel_main_menu"/>
|
||||
|
||||
</KeyListEntries>
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<KeyListEntries wm_name="Marco" package="marco" group="system" name="Windows">
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/activate_window_menu"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/toggle_fullscreen"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/toggle_maximized"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/maximize"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/unmaximize"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/toggle_shaded"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/close"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/minimize"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/begin_move"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/begin_resize"/>
|
||||
|
||||
<KeyListEntry value="1" name="/apps/marco/window_keybindings/toggle_on_all_workspaces" key="/apps/marco/general/num_workspaces" comparison="gt"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/raise_or_lower"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/raise"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/lower"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/maximize_vertically"/>
|
||||
|
||||
<KeyListEntry name="/apps/marco/window_keybindings/maximize_horizontally"/>
|
||||
|
||||
</KeyListEntries>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,35 @@
|
|||
diff -upNr compiz-0.8.6.orign/include/compiz-core.h compiz-0.8.6/include/compiz-core.h
|
||||
--- compiz-0.8.6.orign/include/compiz-core.h 2010-03-28 14:15:35.000000000 +0200
|
||||
+++ compiz-0.8.6/include/compiz-core.h 2010-03-30 14:48:59.055172395 +0200
|
||||
@@ -27,6 +27,7 @@
|
||||
#define _COMPIZ_CORE_H
|
||||
|
||||
#include <compiz-plugin.h>
|
||||
+#include <dlfcn.h>
|
||||
|
||||
#define CORE_ABIVERSION 20091102
|
||||
|
||||
diff -upNr compiz-0.8.6.orign/plugins/mateconf.c compiz-0.8.6/plugins/mateconf.c
|
||||
--- compiz-0.8.6.orign/plugins/mateconf.c 2010-03-28 14:15:35.000000000 +0200
|
||||
+++ compiz-0.8.6/plugins/mateconf.c 2010-03-30 14:48:59.056187055 +0200
|
||||
@@ -802,6 +802,8 @@ mateconfFiniObject (CompPlugin *p,
|
||||
static Bool
|
||||
mateconfInit (CompPlugin *p)
|
||||
{
|
||||
+ dlopen ("libmateconf-2.so.4", RTLD_LAZY);
|
||||
+
|
||||
if (!compInitPluginMetadataFromInfo (&mateconfMetadata, p->vTable->name,
|
||||
0, 0, 0, 0))
|
||||
return FALSE;
|
||||
diff -upNr compiz-0.8.6.orign/plugins/glib.c compiz-0.8.6/plugins/glib.c
|
||||
--- compiz-0.8.6.orign/plugins/glib.c 2010-03-28 14:15:35.000000000 +0200
|
||||
+++ compiz-0.8.6/plugins/glib.c 2010-03-30 14:48:59.056187055 +0200
|
||||
@@ -197,6 +197,8 @@ glibInitDisplay (CompPlugin *p,
|
||||
{
|
||||
GLibDisplay *gd;
|
||||
|
||||
+ dlopen ("libglib-2.0.so.0", RTLD_LAZY);
|
||||
+
|
||||
if (!checkPluginABI ("core", CORE_ABIVERSION))
|
||||
return FALSE;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,14 @@
|
|||
diff -upr compiz-0.8.8-orig/plugins/place.c compiz-0.8.8/plugins/place.c
|
||||
--- compiz-0.8.8-orig/plugins/place.c 2010-10-18 07:56:02.000000000 +0200
|
||||
+++ compiz-0.8.8/plugins/place.c 2012-09-26 11:19:31.056809174 +0200
|
||||
@@ -16,8 +16,8 @@
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
- * 02111-1307, USA.
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
||||
+ * 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <math.h>
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
#!/bin/bash
|
||||
|
||||
function runCompiz() {
|
||||
gtk-window-decorator &
|
||||
if ( [ -e /usr/lib/compizconfig/backends/libmateconf.so ] || [ -e /usr/lib64/compizconfig/backends/libmateconf.so ] )
|
||||
then
|
||||
exec compiz --ignore-desktop-hints ccp $@
|
||||
else
|
||||
exec compiz --ignore-desktop-hints glib mateconf matecompat $@
|
||||
fi
|
||||
}
|
||||
|
||||
ISSW=`glxinfo | grep "Software Rasterizer" -c`
|
||||
|
||||
# Try with direct rendering
|
||||
HAVETFP=`glxinfo | grep texture_from_pixmap -c`
|
||||
|
||||
if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then
|
||||
runCompiz $@
|
||||
fi
|
||||
|
||||
# Try again with indirect rendering
|
||||
export LIBGL_ALWAYS_INDIRECT=1
|
||||
|
||||
HAVETFP=`glxinfo | grep texture_from_pixmap -c`
|
||||
|
||||
if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then
|
||||
runCompiz $@
|
||||
fi
|
||||
|
||||
# Fall back to marco
|
||||
exec marco $@
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Encoding=UTF-8
|
||||
Name=Compiz
|
||||
TryExec=compiz-mate-gtk
|
||||
Exec=compiz-mate-gtk
|
||||
NoDisplay=true
|
||||
|
|
@ -0,0 +1,283 @@
|
|||
%global core_plugins blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs obs commands wall
|
||||
|
||||
%global mate_plugins annotate mateconf glib svg matecompat
|
||||
|
||||
# List of plugins passed to ./configure. The order is important
|
||||
|
||||
%global plugins core,glib,mateconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall,obs
|
||||
|
||||
Name: compiz
|
||||
URL: http://www.compiz.org
|
||||
License: GPLv2+ and LGPLv2+ and MIT
|
||||
Group: User Interface/Desktops
|
||||
Version: 0.8.8
|
||||
Release: 6%{?dist}
|
||||
Epoch: 1
|
||||
Summary: OpenGL window and compositing manager
|
||||
|
||||
# libdrm is not available on these arches
|
||||
ExcludeArch: s390 s390x
|
||||
|
||||
Requires: system-logos
|
||||
Requires: glx-utils
|
||||
Requires(post): desktop-file-utils
|
||||
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libdrm-devel
|
||||
BuildRequires: libwnck-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: libXrender-devel
|
||||
BuildRequires: libXcomposite-devel
|
||||
BuildRequires: libXdamage-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libICE-devel
|
||||
BuildRequires: libXmu-devel
|
||||
BuildRequires: mate-desktop-devel
|
||||
BuildRequires: mate-control-center-devel
|
||||
BuildRequires: mate-conf-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gettext
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: dbus-glib-devel
|
||||
BuildRequires: librsvg2-devel
|
||||
BuildRequires: mate-window-manager-devel
|
||||
BuildRequires: mesa-libGLU-devel
|
||||
BuildRequires: fuse-devel
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxslt-devel
|
||||
|
||||
Source0: http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
|
||||
Source2: compiz-mate-gtk
|
||||
Source3: compiz-mate-gtk.desktop
|
||||
Source4: 50-marco-navigation.xml
|
||||
Source5: 50-marco-system.xml
|
||||
Source6: 50-marco-windows.xml
|
||||
|
||||
# fork gnome to mate
|
||||
Patch0: comiz_mate_fork.patch
|
||||
# fix http://forums.mate-desktop.org/viewtopic.php?f=8&t=818
|
||||
Patch1: compiz_gtk_window_decoration_button_placement.patch
|
||||
Patch2: compiz_windows-decorator.patch
|
||||
# Patches that are not upstream
|
||||
Patch3: composite-cube-logo.patch
|
||||
Patch4: fedora-logo.patch
|
||||
Patch5: redhat-logo.patch
|
||||
Patch6: compiz-0.8.6-wall.patch
|
||||
Patch7: compiz-0.8.6-unloadpluginfix.patch
|
||||
Patch8: no-more-mate-wm-settings.patch
|
||||
Patch9: compiz-0.88_incorrect-fsf-address.patch
|
||||
|
||||
%description
|
||||
Compiz is one of the first OpenGL-accelerated compositing window
|
||||
managers for the X Window System. The integration allows it to perform
|
||||
compositing effects in window management, such as a minimization
|
||||
effect and a cube work space. Compiz is an OpenGL compositing manager
|
||||
that use Compiz use EXT_texture_from_pixmap OpenGL extension for
|
||||
binding redirected top-level windows to texture objects.
|
||||
|
||||
%package devel
|
||||
Summary: Development packages for compiz
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Requires: libXcomposite-devel libXfixes-devel libXdamage-devel libXrandr-devel
|
||||
Requires: libXinerama-devel libICE-devel libSM-devel libxml2-devel
|
||||
Requires: libxslt-devel startup-notification-devel
|
||||
|
||||
%description devel
|
||||
The compiz-devel package includes the header files,
|
||||
and developer docs for the compiz package.
|
||||
|
||||
Install compiz-devel if you want to develop plugins for the compiz
|
||||
windows and compositing manager.
|
||||
|
||||
%package mate
|
||||
Summary: Compiz mate integration bits
|
||||
Group: User Interface/Desktops
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires(pre): mate-conf
|
||||
Requires(post): mate-conf
|
||||
Requires(preun): mate-conf
|
||||
|
||||
%description mate
|
||||
The compiz-mate package contains gtk-window-decorator,
|
||||
and other mate integration related stuff.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .comiz_mate_fork
|
||||
%patch1 -p1 -b .compiz_gtk_window_decoration_button
|
||||
%patch2 -p1 -b .compiz_windows-decorator
|
||||
%patch3 -p1 -b .composite-cube-logo
|
||||
%if 0%{?fedora}
|
||||
%patch4 -p1 -b .fedora-logo
|
||||
%else
|
||||
%patch5 -p1 -b .redhat-logo
|
||||
%endif
|
||||
%patch6 -p1 -b .wall
|
||||
%patch7 -p1 -b .unloadfix
|
||||
%patch8 -p1 -b .mate-wm-settings
|
||||
%patch9 -p1 -b .incorrect-fsf-address
|
||||
|
||||
%build
|
||||
|
||||
libtoolize
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
%configure \
|
||||
--enable-mateconf \
|
||||
--enable-dbus \
|
||||
--enable-librsvg \
|
||||
--enable-gtk \
|
||||
--enable-marco \
|
||||
--enable-mate \
|
||||
--with-default-plugins=%{plugins} \
|
||||
--enable-mate-keybindings \
|
||||
--disable-kde \
|
||||
--disable-kde4 \
|
||||
--disable-kconfig
|
||||
|
||||
make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
|
||||
|
||||
|
||||
%install
|
||||
export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
||||
make DESTDIR=$RPM_BUILD_ROOT install || exit 1
|
||||
unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
||||
|
||||
install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}
|
||||
|
||||
desktop-file-install --vendor="" \
|
||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||
%SOURCE3
|
||||
|
||||
rm $RPM_BUILD_ROOT%{_datadir}/compiz/kconfig.xml
|
||||
rm $RPM_BUILD_ROOT%{_sysconfdir}/mateconf/schemas/compiz-kconfig.schemas
|
||||
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
|
||||
|
||||
# create compiz keybindings file based on the marco ones
|
||||
# lifted straight from Ubuntu, as long as installation of the upstream
|
||||
# ones is broken at least (I've reported this upstream)
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings
|
||||
sed 's/wm_name=\"Marco\" package=\"marco\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/mate-control-center/keybindings/50-marco-desktop-key.xml > $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings/50-compiz-desktop-key.xml
|
||||
sed 's/wm_name=\"Marco\" package=\"marco\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/mate-control-center/keybindings/50-marco-key.xml > $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings/50-compiz-key.xml
|
||||
|
||||
cp %SOURCE4 $RPM_BUILD_ROOT%{_datadir}/mate-control-center/keybindings/50-compiz-navigation.xml
|
||||
cp %SOURCE5 $RPM_BUILD_ROOT%{_datadir}/mate-control-center/keybindings/50-compiz-system.xml
|
||||
cp %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/mate-control-center/keybindings/50-compiz-windows.xml
|
||||
|
||||
sed -i 's#key=\"/apps/marco/general/num_workspaces\" comparison=\"gt\"##g' $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings/50-compiz-desktop-key.xml
|
||||
sed -i 's#key=\"/apps/marco/general/num_workspaces\" comparison=\"gt\"##g' $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings/50-compiz-key.xml
|
||||
|
||||
|
||||
%find_lang compiz
|
||||
|
||||
cat compiz.lang > core-files.txt
|
||||
|
||||
for f in %{core_plugins}; do
|
||||
echo %{_libdir}/compiz/lib$f.so
|
||||
echo %{_datadir}/compiz/$f.xml
|
||||
done >> core-files.txt
|
||||
|
||||
for f in %{mate_plugins}; do
|
||||
echo %{_libdir}/compiz/lib$f.so
|
||||
echo %{_datadir}/compiz/$f.xml
|
||||
done >> mate-files.txt
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%post mate
|
||||
%mateconf_schema_upgrade compiz-annotate compiz-blur compiz-clone compiz-commands compiz-core compiz-cube compiz-dbus compiz-decoration compiz-fade compiz-fs compiz-glib compiz-ini compiz-inotify compiz-kconfig compiz-matecompat compiz-mateconf compiz-minimize compiz-move compiz-obs compiz-place compiz-png compiz-regex compiz-resize compiz-rotate compiz-scale compiz-screenshot compiz-svg compiz-switcher compiz-video compiz-wall compiz-water compiz-wobbly compiz-zoom gwd
|
||||
|
||||
%pre mate
|
||||
%mateconf_schema_prepare compiz-annotate compiz-blur compiz-clone compiz-commands compiz-core compiz-cube compiz-dbus compiz-decoration compiz-fade compiz-fs compiz-glib compiz-ini compiz-inotify compiz-kconfig compiz-matecompat compiz-mateconf compiz-minimize compiz-move compiz-obs compiz-place compiz-png compiz-regex compiz-resize compiz-rotate compiz-scale compiz-screenshot compiz-svg compiz-switcher compiz-video compiz-wall compiz-water compiz-wobbly compiz-zoom gwd
|
||||
|
||||
%preun mate
|
||||
%mateconf_schema_remove compiz-annotate compiz-blur compiz-clone compiz-commands compiz-core compiz-cube compiz-dbus compiz-decoration compiz-fade compiz-fs compiz-glib compiz-ini compiz-inotify compiz-kconfig compiz-matecompat compiz-mateconf compiz-minimize compiz-move compiz-obs compiz-place compiz-png compiz-regex compiz-resize compiz-rotate compiz-scale compiz-screenshot compiz-svg compiz-switcher compiz-video compiz-wall compiz-water compiz-wobbly compiz-zoom gwd
|
||||
|
||||
%files -f core-files.txt
|
||||
%doc AUTHORS ChangeLog COPYING.GPL COPYING.LGPL README TODO NEWS
|
||||
%{_bindir}/compiz
|
||||
%{_libdir}/libdecoration.so.*
|
||||
%dir %{_libdir}/compiz
|
||||
%dir %{_datadir}/compiz
|
||||
%{_datadir}/compiz/*.png
|
||||
%{_datadir}/compiz/core.xml
|
||||
|
||||
|
||||
%files mate -f mate-files.txt
|
||||
%{_bindir}/compiz-mate-gtk
|
||||
%{_bindir}/gtk-window-decorator
|
||||
%{_datadir}/mate-control-center/keybindings/50-compiz-desktop-key.xml
|
||||
%{_datadir}/mate-control-center/keybindings/50-compiz-key.xml
|
||||
%{_datadir}/mate-control-center/keybindings/50-compiz-navigation.xml
|
||||
%{_datadir}/mate-control-center/keybindings/50-compiz-system.xml
|
||||
%{_datadir}/mate-control-center/keybindings/50-compiz-windows.xml
|
||||
%{_datadir}/applications/compiz-mate-gtk.desktop
|
||||
%exclude %{_datadir}/applications/compiz.desktop
|
||||
%config(noreplace) %{_sysconfdir}/mateconf/schemas/*.schemas
|
||||
|
||||
|
||||
%files devel
|
||||
%{_libdir}/pkgconfig/compiz.pc
|
||||
%{_libdir}/pkgconfig/libdecoration.pc
|
||||
%{_libdir}/pkgconfig/compiz-cube.pc
|
||||
%{_libdir}/pkgconfig/compiz-mateconf.pc
|
||||
%{_libdir}/pkgconfig/compiz-scale.pc
|
||||
%{_datadir}/compiz/schemas.xslt
|
||||
%{_includedir}/compiz/
|
||||
%{_libdir}/libdecoration.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 05 2012 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.8.8-6
|
||||
- remove update update-desktop-database from %%post mate
|
||||
- remove (noreplace) from mateconf schema dir
|
||||
- remove Requires(post): desktop-file-utils
|
||||
- add epoch tags
|
||||
|
||||
* Wed Sep 26 2012 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.8.8-5
|
||||
- change compiz-0.88_incorrect-fsf-address.patch
|
||||
|
||||
* Wed Sep 26 2012 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.8.8-4
|
||||
- remove upstreamed patches
|
||||
- own include dir
|
||||
- add compiz-mate-gtk source and compiz-mate-gtk.desktop file
|
||||
- add keybinding sources
|
||||
- change %%define to %%global entries
|
||||
- rename no-more-gnome-wm-settings.patch to no-more-mate-wm-settings.patch
|
||||
- add compiz-0.88_incorrect-fsf-address.patch
|
||||
- clean up build section
|
||||
|
||||
* Sun Sep 16 2012 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.8.8-3
|
||||
- add isa tags
|
||||
- remove kde stuff
|
||||
- remove obsolete beryl stuff
|
||||
- add comiz_mate_fork.patch
|
||||
- remove %%defattr(-, root, root)
|
||||
- add compiz_gtk_window_decoration_button_placement.patch
|
||||
- enable some compiz keybindings
|
||||
|
||||
* Tue May 15 2012 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.8.8-2
|
||||
- add compiz_mate_fix.patch
|
||||
|
||||
* Tue May 15 2012 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.8.8-1
|
||||
- build for mate
|
||||
|
||||
* Sun May 06 2012 Andrew Wyatt <andrew@fuduntu.org> - 0.8.8-1
|
||||
- Update to latest stable release
|
||||
|
||||
* Tue Nov 30 2010 leigh scott <leigh123linux@googlemail.com> - 0.8.6-6
|
||||
- add more upstream gdk fixes
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
diff -upr compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac
|
||||
--- compiz-0.8.8-orig/configure.ac 2012-09-16 10:04:18.000000000 +0200
|
||||
+++ compiz-0.8.8/configure.ac 2012-09-16 10:10:26.095872922 +0200
|
||||
@@ -323,12 +323,12 @@ if test "x$use_gtk" = "xyes"; then
|
||||
if test "x$use_marco" = "xyes"; then
|
||||
PKG_CHECK_MODULES(MARCO, libmarco-private,
|
||||
[use_marco=yes], [use_marco=no])
|
||||
- PKG_CHECK_EXISTS(libmarco-private >= 2.15.21,
|
||||
+ PKG_CHECK_EXISTS(libmarco-private >= 1.2.0,
|
||||
[have_marco_2_15_21=yes], [have_marco_2_15_21=no])
|
||||
- PKG_CHECK_EXISTS(libmarco-private >= 2.17.0,
|
||||
+ PKG_CHECK_EXISTS(libmarco-private >= 1.2.0,
|
||||
[have_marco_2_17_0=yes], [have_marco_2_17_0=no])
|
||||
PKG_CHECK_EXISTS(libmarco-private >= 1.2.0,
|
||||
- [have_marco_2_23_2=yes], [have_marco_1_2_0=no])
|
||||
+ [have_marco_2_23_2=yes], [have_marco_2_23_2=no])
|
||||
fi
|
||||
|
||||
if test "x$use_mate" = "xyes"; then
|
||||
@@ -382,8 +382,8 @@ if test "$use_marco" = yes; then
|
||||
AC_DEFINE(HAVE_MARCO_2_17_0, 1,
|
||||
[Define to 1 if marco version >= 2.17.0])
|
||||
fi
|
||||
- if test "$have_marco_1_2_0" = yes; then
|
||||
- AC_DEFINE(HAVE_MARCO_1_2_0, 1,
|
||||
+ if test "$have_marco_2_23_2" = yes; then
|
||||
+ AC_DEFINE(HAVE_MARCO_2_23_2, 1,
|
||||
[Define to 1 if marco version >= 1.2.0])
|
||||
fi
|
||||
fi
|
||||
diff -upr compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c compiz-0.8.8/gtk/mate/compiz-window-manager.c
|
||||
--- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c 2012-09-16 10:04:18.000000000 +0200
|
||||
+++ compiz-0.8.8/gtk/mate/compiz-window-manager.c 2012-09-16 10:12:15.613373978 +0200
|
||||
@@ -370,7 +370,7 @@ add_themes_from_dir (GList *current_list
|
||||
{
|
||||
theme_file_path =
|
||||
g_build_filename (path, entry->d_name,
|
||||
- "marco-1/marco-theme-1.xml", NULL);
|
||||
+ "metacity-1/metacity-theme-1.xml", NULL);
|
||||
|
||||
if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS))
|
||||
{
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
diff -upr compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
|
||||
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c 2012-05-16 12:40:35.000000000 +0200
|
||||
+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c 2012-05-16 13:55:44.000000000 +0200
|
||||
@@ -1318,7 +1318,7 @@ draw_window_decoration (decor_t *d)
|
||||
}
|
||||
}
|
||||
|
||||
-#ifdef USE_MARCO
|
||||
+
|
||||
static void
|
||||
decor_update_meta_window_property (decor_t *d,
|
||||
MetaTheme *theme,
|
||||
@@ -1405,17 +1405,16 @@ meta_get_corner_radius (const MetaFrameG
|
||||
int *bottom_right_radius)
|
||||
{
|
||||
|
||||
-#ifdef HAVE_MARCO_2_17_0
|
||||
+#ifdef HAVE_MARCO_1_2_0
|
||||
*top_left_radius = fgeom->top_left_corner_rounded_radius;
|
||||
*top_right_radius = fgeom->top_right_corner_rounded_radius;
|
||||
*bottom_left_radius = fgeom->bottom_left_corner_rounded_radius;
|
||||
*bottom_right_radius = fgeom->bottom_right_corner_rounded_radius;
|
||||
#else
|
||||
- *top_left_radius = fgeom->top_left_corner_rounded ? 5 : 0;
|
||||
- *top_right_radius = fgeom->top_right_corner_rounded ? 5 : 0;
|
||||
- *bottom_left_radius = fgeom->bottom_left_corner_rounded ? 5 : 0;
|
||||
- *bottom_right_radius = fgeom->bottom_right_corner_rounded ? 5 : 0;
|
||||
-#endif
|
||||
+ *top_left_radius = fgeom->top_left_corner_rounded_radius;
|
||||
+ *top_right_radius = fgeom->top_right_corner_rounded_radius;
|
||||
+ *bottom_left_radius = fgeom->bottom_left_corner_rounded_radius;
|
||||
+ *bottom_right_radius = fgeom->bottom_right_corner_rounded_radius;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
diff -up compiz-0ec3ec/plugins/cube.c~ compiz-0ec3ec/plugins/cube.c
|
||||
--- compiz-0ec3ec/plugins/cube.c~ 2007-07-23 16:20:42.000000000 -0400
|
||||
+++ compiz-0ec3ec/plugins/cube.c 2007-08-15 17:45:18.000000000 -0400
|
||||
@@ -1272,11 +1272,27 @@ cubePaintTop (CompScreen *s,
|
||||
|
||||
if (cs->invert == 1 && size == 4 && cs->texture.name)
|
||||
{
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
|
||||
+
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PRIMARY_COLOR);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE0);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
|
||||
+
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
|
||||
+
|
||||
enableTexture (s, &cs->texture, COMP_TEXTURE_FILTER_GOOD);
|
||||
glTexCoordPointer (2, GL_FLOAT, 0, cs->tc);
|
||||
glDrawArrays (GL_TRIANGLE_FAN, 0, cs->nVertices >> 1);
|
||||
disableTexture (s, &cs->texture);
|
||||
glDisableClientState (GL_TEXTURE_COORD_ARRAY);
|
||||
+
|
||||
+ glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1 +0,0 @@
|
|||
This package was retired on 2012-02-06 due to lack of a maintainer.
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
diff -upNr compiz-0.8.2.orign/metadata/cube.xml.in compiz-0.8.2/metadata/cube.xml.in
|
||||
--- compiz-0.8.2.orign/metadata/cube.xml.in 2009-02-15 10:10:23.000000000 +0100
|
||||
+++ compiz-0.8.2/metadata/cube.xml.in 2009-05-25 22:54:03.060114649 +0200
|
||||
@@ -92,9 +92,9 @@
|
||||
<_short>Cube Color</_short>
|
||||
<_long>Color of top and bottom sides of the cube</_long>
|
||||
<default>
|
||||
- <red>0xfefe</red>
|
||||
- <green>0xffff</green>
|
||||
- <blue>0xc7c7</blue>
|
||||
+ <red>0x0000</red>
|
||||
+ <green>0x1919</green>
|
||||
+ <blue>0x4a4a</blue>
|
||||
</default>
|
||||
</option>
|
||||
<subgroup>
|
||||
@@ -110,7 +110,7 @@
|
||||
<type>string</type>
|
||||
<hints>file;image;</hints>
|
||||
<default>
|
||||
- <value>freedesktop</value>
|
||||
+ <value>/usr/share/pixmaps/fedora-logo</value>
|
||||
</default>
|
||||
</option>
|
||||
<option name="adjust_image" type="bool">
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
diff -upNr compiz-0.8.6.orign/gtk/mate/Makefile.am compiz-0.8.6/gtk/mate/Makefile.am
|
||||
--- compiz-0.8.6.orign/gtk/mate/Makefile.am 2010-03-28 14:15:35.000000000 +0200
|
||||
+++ compiz-0.8.6/gtk/mate/Makefile.am 2010-07-15 20:51:40.241254711 +0200
|
||||
@@ -1,21 +1,9 @@
|
||||
moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
|
||||
|
||||
-if USE_MATE
|
||||
-libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
|
||||
-libcompiz_la_LIBADD = @MATE_WINDOW_SETTINGS_LIBS@
|
||||
-libcompiz_la_SOURCES = \
|
||||
- compiz-window-manager.c \
|
||||
- compiz-window-manager.h
|
||||
-libcompiz_module = libcompiz.la
|
||||
-
|
||||
desktopfilesdir = $(DESTDIR)$(datadir)/applications
|
||||
desktopfiles_in_files = compiz.desktop.in
|
||||
desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
|
||||
|
||||
-wmpropertiesdir = $(DESTDIR)$(windowsettingsdatadir)/mate/wm-properties
|
||||
-wmproperties_in_files = compiz-wm.desktop.in
|
||||
-wmproperties_files = $(wmproperties_in_files:.desktop.in=.desktop)
|
||||
-
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
if USE_MATE_KEYBINDINGS
|
||||
@@ -28,24 +16,12 @@ xml_files = $(xml_in_files:.xml.in=.x
|
||||
|
||||
endif
|
||||
|
||||
-install-exec-local:
|
||||
- if mkdir -p $(moduledir) && test -w $(moduledir); then ( \
|
||||
- $(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \
|
||||
- $(moduledir) \
|
||||
- ); \
|
||||
- fi
|
||||
-
|
||||
install-data-local:
|
||||
if mkdir -p $(desktopfilesdir) && test -w $(desktopfilesdir); then ( \
|
||||
$(INSTALL) -m 644 $(desktopfiles_files) \
|
||||
$(desktopfilesdir) \
|
||||
); \
|
||||
fi
|
||||
- if mkdir -p $(wmpropertiesdir) && test -w $(wmpropertiesdir); then ( \
|
||||
- $(INSTALL) -m 644 $(wmproperties_files) \
|
||||
- $(wmpropertiesdir) \
|
||||
- ); \
|
||||
- fi
|
||||
|
||||
if USE_MATE_KEYBINDINGS
|
||||
if mkdir -p $(xmldir) && test -w $(xmldir); then ( \
|
||||
@@ -74,23 +50,18 @@ if USE_MATE_KEYBINDINGS
|
||||
); \
|
||||
fi
|
||||
endif
|
||||
-endif
|
||||
|
||||
INCLUDES = @MATE_WINDOW_SETTINGS_CFLAGS@ \
|
||||
-DMARCO_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \
|
||||
-DLOCALEDIR="\"@datadir@/locale"\"
|
||||
|
||||
-noinst_LTLIBRARIES = \
|
||||
- $(libcompiz_module)
|
||||
|
||||
noinst_DATA = \
|
||||
$(desktopfiles_files) \
|
||||
- $(wmproperties_files) \
|
||||
$(xml_files)
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(desktopfiles_in_files) \
|
||||
- $(wmproperties_in_files) \
|
||||
$(xml_in_files)
|
||||
|
||||
DISTCLEANFILES = \
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
diff -upr compiz-0.8.8-orig/metadata/cube.xml.in compiz-0.8.8/metadata/cube.xml.in
|
||||
--- compiz-0.8.8-orig/metadata/cube.xml.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/cube.xml.in 2012-05-16 12:13:09.000000000 +0200
|
||||
@@ -92,9 +92,9 @@
|
||||
<_short>Cube Color</_short>
|
||||
<_long>Color of top and bottom sides of the cube</_long>
|
||||
<default>
|
||||
- <red>0xfefe</red>
|
||||
- <green>0xffff</green>
|
||||
- <blue>0xc7c7</blue>
|
||||
+ <red>0x8888</red>
|
||||
+ <green>0x0000</green>
|
||||
+ <blue>0x0000</blue>
|
||||
</default>
|
||||
</option>
|
||||
<subgroup>
|
||||
@@ -110,7 +110,7 @@
|
||||
<type>string</type>
|
||||
<hints>file;image;</hints>
|
||||
<default>
|
||||
- <value>freedesktop</value>
|
||||
+ <value>/usr/share/pixmaps/redhat/shadowman-transparent</value>
|
||||
</default>
|
||||
</option>
|
||||
<option name="adjust_image" type="bool">
|
||||
Loading…
Reference in New Issue