rpms/mutter-moblin/devel mutter-moblin-fixdso.patch, NONE, 1.1 mutter-moblin.spec, 1.25, 1.26 mutter-moblin-ver.patch, 1.1, NONE

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22175

Modified Files:
	mutter-moblin.spec 
Added Files:
	mutter-moblin-fixdso.patch 
Removed Files:
	mutter-moblin-ver.patch 
Log Message:
- Fix build with dso linking

mutter-moblin-fixdso.patch:
 Makefile.in                       |    2 +-
 configure.ac                      |    1 -
 libmoblin-panel/Makefile.am       |    2 +-
 libmoblin-panel/Makefile.in       |    4 ++--
 libmoblin-panel/tests/Makefile.am |    2 +-
 libmoblin-panel/tests/Makefile.in |    2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE mutter-moblin-fixdso.patch ---
--- mutter-moblin-0.43.8/libmoblin-panel/tests/Makefile.in.orig	2009-12-01 11:40:37.000000000 +0000
+++ mutter-moblin-0.43.8/libmoblin-panel/tests/Makefile.in	2010-04-18 10:39:43.000000000 +0100
@@ -140,7 +140,7 @@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lclutter-glx-1.0
 LIBMPL_CFLAGS = @LIBMPL_CFLAGS@
 LIBMPL_LIBS = @LIBMPL_LIBS@
 LIBOBJS = @LIBOBJS@
--- mutter-moblin-0.43.8/Makefile.in.orig	2010-04-18 10:48:01.000000000 +0100
+++ mutter-moblin-0.43.8/Makefile.in	2010-04-18 10:48:40.000000000 +0100
@@ -157,7 +157,7 @@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lclutter-glx-1.0
 LIBMPL_CFLAGS = @LIBMPL_CFLAGS@
 LIBMPL_LIBS = @LIBMPL_LIBS@
 LIBOBJS = @LIBOBJS@
--- mutter-moblin-0.43.8/libmoblin-panel/Makefile.in.orig	2010-04-18 10:55:59.000000000 +0100
+++ mutter-moblin-0.43.8/libmoblin-panel/Makefile.in	2010-04-18 10:56:30.000000000 +0100
@@ -166,7 +166,7 @@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lclutter-glx-1.0
 LIBMPL_CFLAGS = @LIBMPL_CFLAGS@
 LIBMPL_LIBS = @LIBMPL_LIBS@
 LIBOBJS = @LIBOBJS@
--- mutter-moblin-0.43.8/libmoblin-panel/tests/Makefile.am.orig	2010-04-18 11:37:13.000000000 +0100
+++ mutter-moblin-0.43.8/libmoblin-panel/tests/Makefile.am	2010-04-18 11:37:18.000000000 +0100
@@ -7,7 +7,7 @@
 	-DDATADIR=\"$(datadir)\" \
   -DCSS_DIR=\"$(abs_builddir)\"
 
-LDADD = $(LIBMPL_LIBS)
+LDADD = $(LIBMPL_LIBS) -lclutter-glx-1.0
 
 noinst_PROGRAMS = \
 	test-entry \
--- mutter-moblin-0.43.8/configure.ac.orig	2010-04-18 11:56:41.000000000 +0100
+++ mutter-moblin-0.43.8/configure.ac	2010-04-18 11:56:48.000000000 +0100
@@ -146,7 +146,6 @@
 libmoblin-panel/moblin-panel.pc
 libmoblin-panel/moblin-panel/Makefile
 libmoblin-panel/theme/Makefile
-libmoblin-panel/tests/Makefile
 ])
 
 echo "
--- mutter-moblin-0.43.8/libmoblin-panel/Makefile.am.orig	2010-04-18 12:00:43.000000000 +0100
+++ mutter-moblin-0.43.8/libmoblin-panel/Makefile.am	2010-04-18 12:01:18.000000000 +0100
@@ -1,7 +1,7 @@
 
 QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
 
-SUBDIRS = moblin-panel theme tests
+SUBDIRS = moblin-panel theme
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = moblin-panel.pc
--- mutter-moblin-0.43.8/libmoblin-panel/Makefile.in.orig	2010-04-18 12:00:56.000000000 +0100
+++ mutter-moblin-0.43.8/libmoblin-panel/Makefile.in	2010-04-18 12:01:37.000000000 +0100
@@ -272,7 +272,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
-SUBDIRS = moblin-panel theme tests
+SUBDIRS = moblin-panel theme
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = moblin-panel.pc
 CLEANFILES = moblin-panel-clutter.pc


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mutter-moblin.spec	18 Apr 2010 08:24:38 -0000	1.25
+++ mutter-moblin.spec	18 Apr 2010 11:12:22 -0000	1.26
@@ -1,13 +1,14 @@
-Name:           mutter-moblin
-Version:        0.43.8
-Release:        2%{?dist}
-Summary:        Moblin Netbook plugin for Mutter
-
-Group:          User Interface/Desktops
-License:        GPLv2+
-URL:            http://www.moblin.org/
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:          mutter-moblin
+Version:       0.43.8
+Release:       3%{?dist}
+Summary:       Moblin Netbook plugin for Mutter
+
+Group:         User Interface/Desktops
+License:       GPLv2+
+URL:           http://www.moblin.org/
+Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:        mutter-moblin-fixdso.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
 BuildRequires: GConf2-devel
@@ -18,6 +19,10 @@ BuildRequires: mutter-mbl-devel
 BuildRequires: startup-notification-devel
 BuildRequires: intltool
 
+# Require these because of the fixdso
+BuildRequires: libtool
+BuildRequires: gnome-common
+
 Requires: redhat-menus
 Requires: mutter-mbl
 
@@ -35,6 +40,9 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixdso
+
+autoreconf
 
 %build
 %configure --disable-static --enable-scaled-background
@@ -71,6 +79,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Sun Apr 18 2010 Peter Robinson <pbrobinson at gmail.com> 0.43.8-3
+- Fix build with dso linking
+
 * Sun Apr 18 2010 Peter Robinson <pbrobinson at gmail.com> 0.43.8-2
 - Add missing dep
 


--- mutter-moblin-ver.patch DELETED ---