rpms/mutter-mbl/F-13 mutter-2.28.1-add-needed.patch, NONE, 1.1 mutter-fixKeySym.patch, NONE, 1.1 mutter-mbl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Peter Robinson
pbrobinson at fedoraproject.org
Sun Apr 18 11:45:58 UTC 2010
Author: pbrobinson
Update of /cvs/pkgs/rpms/mutter-mbl/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26092
Modified Files:
.cvsignore sources
Added Files:
mutter-2.28.1-add-needed.patch mutter-fixKeySym.patch
mutter-mbl.spec
Log Message:
-initial build
mutter-2.28.1-add-needed.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mutter-2.28.1-add-needed.patch ---
diff -up mutter-2.28.1/src/tools/Makefile.am.jx mutter-2.28.1/src/tools/Makefile.am
--- mutter-2.28.1/src/tools/Makefile.am.jx 2010-01-25 11:07:32.000000000 -0500
+++ mutter-2.28.1/src/tools/Makefile.am 2010-02-16 18:59:50.000000000 -0500
@@ -26,7 +26,7 @@ noinst_PROGRAMS=mutter-mag mutter-graysc
mutter_message_LDADD= @MUTTER_MESSAGE_LIBS@
mutter_window_demo_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
-mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
+mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@ -lm
mutter_grayscale_LDADD = @MUTTER_WINDOW_DEMO_LIBS@
EXTRA_DIST=$(icon_DATA)
mutter-fixKeySym.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mutter-fixKeySym.patch ---
>From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters at verbum.org>
Date: Wed, 03 Feb 2010 19:17:10 +0000
Subject: [introspection] Include xlib.gir
We need this for KeySym at least.
https://bugzilla.gnome.org/show_bug.cgi?id=607125
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f76835..a3d892d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -214,6 +214,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mu
--include=Clutter-1.0 \
--pkg=clutter-1.0 \
--pkg=gtk+-2.0 \
+ --include=xlib-2.0 \
--include=xfixes-4.0 \
--program=$$pwd/mutter \
$(filter %.c,$(mutter_SOURCES)) \
--
cgit v0.8.3.1
--- NEW FILE mutter-mbl.spec ---
# This is a short term solution until Intel puts their source repository back up at http://meego.gitorious.org/
# wget http://repo.moblin.org/updates/2.1/SRPMS/mutter-2.28.1_0.0-12.1.moblin2.src.rpm
# rpm -i mutter-2.28.1_0.0-12.1.moblin2.src.rpm
%define tarfile mutter-2.28.1_0.12.tar.bz2
Name: mutter-mbl
Version: 2.28.1_0.12
Release: 1%{?dist}
Summary: Window and compositing manager based on Clutter
Group: User Interface/Desktops
License: GPLv2+
URL: http://www.moblin.org/
Source0: %{tarfile}
Patch0: mutter-2.28.1-add-needed.patch
Patch1: mutter-fixKeySym.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: clutter-devel
BuildRequires: pango-devel
BuildRequires: startup-notification-devel
BuildRequires: gtk2-devel
BuildRequires: pkgconfig
BuildRequires: GConf2-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gir-repository-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXdamage-devel
BuildRequires: libXext-devel
BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXcursor-devel
BuildRequires: libXcomposite-devel
BuildRequires: zenity
BuildRequires: intltool
BuildRequires: gnome-doc-utils
BuildRequires: desktop-file-utils
#Temp while we're using git master
BuildRequires: libtool
BuildRequires: gnome-common
Requires: control-center-filesystem
Requires: startup-notification
Requires: GConf2
Requires: dbus-x11
Requires: zenity
# Initally we need to conflict with mutter. A patch is in progress so that they'll both be parallel installable
Conflicts: mutter
%description
Mutter-mbl is a fork of the mutter window and compositing manager that
displays and manages your desktop via OpenGL. Mutter combines a
sophisticated display engine using the Clutter toolkit with solid
window-management logic inherited from the Metacity window manager.
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: gtk-doc
# Initally we need to conflict with mutter. A patch is in progress so that they'll both be parallel installable
Conflicts: mutter-devel
%description devel
Header files and libraries for developing Mutter plugins. Also includes
utilities for testing Metacity/Mutter themes.
%prep
%setup -q -n mutter-%{version}
%patch0 -p1 -b .fixneeded
%patch1 -p1 -b .fixKeySym
# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh
# Remove exec perms from source files
chmod -x src/compositor/*.c
%build
%configure --with-clutter --disable-static
# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSION"
for I in $SHOULD_HAVE_DEFINED; do
if ! grep -q "define $I" config.h; then
echo "$I was not defined in config.h"
grep "$I" config.h
exit 1
else
echo "$I was defined as it should have been"
grep "$I" config.h
fi
done
make %{?_smp_mflags} V=1
%install
rm -rf %{buildroot}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=%{buildroot}
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
#Remove libtool archives.
rm -rf %{buildroot}/%{_libdir}/*.la
%find_lang mutter
# Mutter contains a .desktop file so we just need to validate it
desktop-file-validate %{buildroot}/%{_datadir}/applications/mutter.desktop
%clean
rm -rf %{buildroot}
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/mutter.schemas \
> /dev/null || :
fi
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/mutter.schemas \
> /dev/null || :
fi
%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/mutter.schemas \
> /dev/null || :
%postun -p /sbin/ldconfig
%files -f mutter.lang
%defattr(-,root,root,-)
%doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt
%doc %{_mandir}/man1/mutter.1.gz
%doc %{_mandir}/man1/mutter-message.1.gz
%{_bindir}/mutter
%{_bindir}/mutter-message
%{_datadir}/applications/*.desktop
%{_datadir}/gnome/wm-properties/mutter-wm.desktop
%{_sysconfdir}/gconf/schemas/mutter.schemas
%{_datadir}/mutter
%{_libdir}/lib*.so.*
%{_libdir}/mutter/
%files devel
%defattr(-,root,root,-)
%{_bindir}/mutter-theme-viewer
%{_bindir}/mutter-window-demo
%{_includedir}/*
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%doc %{_mandir}/man1/mutter-theme-viewer.1.gz
%doc %{_mandir}/man1/mutter-window-demo.1.gz
%changelog
* Thu Mar 25 2010 Peter Robinson <pbrobinson at gmail.com> 2.28.1_0.12-1
- Update to 2.28.1_0.12 release
* Thu Mar 25 2010 Peter Robinson <pbrobinson at gmail.com> 2.28.1_0.0-1
- Initial spec based on mutter
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-mbl/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 18 Apr 2010 01:51:12 -0000 1.1
+++ .cvsignore 18 Apr 2010 11:45:58 -0000 1.2
@@ -0,0 +1 @@
+mutter-2.28.1_0.12.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-mbl/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 18 Apr 2010 01:51:12 -0000 1.1
+++ sources 18 Apr 2010 11:45:58 -0000 1.2
@@ -0,0 +1 @@
+978e6eb3b0185b4b465dbe955e986622 mutter-2.28.1_0.12.tar.bz2
More information about the scm-commits
mailing list