rpms/anjal/devel anjal-fixdso.patch,NONE,1.1 anjal.spec,1.23,1.24

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31789

Modified Files:
	anjal.spec 
Added Files:
	anjal-fixdso.patch 
Log Message:
- Add patch to fix explicit dso linking. Fixes 564934

anjal-fixdso.patch:
 Makefile.am            |    1 +
 Makefile.in            |    2 +-
 src/Makefile.am        |    1 +
 src/Makefile.in        |    4 ++--
 src/module/Makefile.am |    2 +-
 src/module/Makefile.in |    2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE anjal-fixdso.patch ---
--- ../anjal-0.3.1.orig/Makefile.am	2010-01-06 12:51:43.000000000 +0530
+++ ../anjal-0.3.1.orig/Makefile.am	2010-02-19 21:10:11.741924839 +0530
@@ -1,4 +1,5 @@ 
 SUBDIRS = art src po
+AM_LDFLAGS= -lm -lemformat
 desktopdir = $(datadir)/applications
 desktop_in_files = anjal.desktop.in \
 		   anjal-settings.desktop.in
--- ../anjal-0.3.1.orig/Makefile.in	2010-01-25 17:50:07.000000000 +0530
+++ ../anjal-0.3.1.orig/Makefile.in	2010-02-19 21:10:01.364924279 +0530
@@ -137,7 +137,7 @@ 
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lm -lemformat
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
--- ../anjal-0.3.1.orig/src/Makefile.am	2010-01-25 18:54:07.000000000 +0530
+++ ../anjal-0.3.1.orig/src/Makefile.am	2010-02-19 21:11:08.182925889 +0530
@@ -87,6 +87,7 @@ 
 	mail-float-bar.c \
 	mail-float-bar.h
 
+AM_LDFLAGS= -lm -lemformat
 #	mail-search.c \
 #	mail-search.h \
 #	mail-component.c \
--- ../anjal-0.3.1.orig/src/Makefile.in	2010-01-25 18:54:10.000000000 +0530
+++ ../anjal-0.3.1.orig/src/Makefile.in	2010-02-19 21:11:26.719925203 +0530
@@ -37,7 +37,7 @@ 
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = anjal$(EXEEXT) anjal-settings$(EXEEXT)
-
+AM_LDFLAGS= -lm -lemformat
 #	mail-search.c \
 #	mail-search.h \
 #	mail-component.c \
@@ -221,7 +221,7 @@ 
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lm -lemformat
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
--- ../anjal-0.3.1.orig/src/module/Makefile.am	2010-01-25 18:21:03.000000000 +0530
+++ ../anjal-0.3.1.orig/src/module/Makefile.am	2010-02-19 21:12:02.067924838 +0530
@@ -1,5 +1,5 @@ 
 module_LTLIBRARIES = libeshell-module-anjal.la
-
+AM_LDFLAGS = -lm -lemformat
 libeshell_module_anjal_la_CPPFLAGS =					\
 	-I$(top_srcdir)							\
 	$(ANJAL_CFLAGS)
--- ../anjal-0.3.1.orig/src/module/Makefile.in	2010-01-25 18:21:06.000000000 +0530
+++ ../anjal-0.3.1.orig/src/module/Makefile.in	2010-02-19 21:11:54.142924452 +0530
@@ -145,7 +145,7 @@ 
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lm -lemformat
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- anjal.spec	27 Jan 2010 08:56:25 -0000	1.23
+++ anjal.spec	20 Feb 2010 05:49:13 -0000	1.24
@@ -1,6 +1,6 @@
 Name:          anjal
 Version:       0.3.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       An email client for small screen devices
 
 Group:         Applications/Productivity
@@ -8,6 +8,7 @@ License:       LGPLv2 or LGPLv3
 URL:           http://live.gnome.org/Anjal/
 Source0:       ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
 Patch0:        anjal-fix031.patch
+Patch1:        anjal-fixdso.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: anerley-devel
@@ -39,6 +40,7 @@ all the mail backends including POP3, IM
 %prep
 %setup -q
 %patch0 -p1 -b .fix031
+%patch1 -p1 -b .fixdso
 
 %build
 %configure --with-mozilla=no --with-anerley=no
@@ -92,6 +94,9 @@ rm -rf %{buildroot}
 %{_libdir}/evolution/2.30/anjal/libeshell-module-anjal.so
 
 %changelog
+* Sat Feb 20 2010 Peter Robinson <pbrobinson at gmail.com> 0.3.1-2
+- Add patch to fix explicit dso linking. Fixes 564934
+
 * Wed Jan 27 2010 Peter Robinson <pbrobinson at gmail.com> 0.3.1-1
 - Official upstream 0.3.1 release tarball