rpms/anjal/devel anjal-fixdso.patch, 1.2, 1.3 anjal.spec, 1.25, 1.26 anjal-fix031.patch, 1.1, NONE

[Peter Robinson]

Author: pbrobinson

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

Modified Files:
	anjal-fixdso.patch anjal.spec 
Removed Files:
	anjal-fix031.patch 
Log Message:
- Official upstream 0.3.2 release tarball, add patch to fix dso linking

anjal-fixdso.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: anjal-fixdso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal-fixdso.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- anjal-fixdso.patch	22 Feb 2010 00:15:46 -0000	1.2
+++ anjal-fixdso.patch	5 Mar 2010 06:58:17 -0000	1.3
@@ -1,64 +1,6 @@
---- anjal-0.3.1/Makefile.am.orig	2010-01-06 12:51:43.000000000 +0530
-+++ anjal-0.3.1/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/Makefile.in.orig	2010-01-25 17:50:07.000000000 +0530
-+++ anjal-0.3.1/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/src/Makefile.am.orig	2010-01-25 18:54:07.000000000 +0530
-+++ anjal-0.3.1/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/src/Makefile.in.orig	2010-01-25 18:54:10.000000000 +0530
-+++ anjal-0.3.1/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/src/module/Makefile.am.orig	2010-01-25 18:21:03.000000000 +0530
-+++ anjal-0.3.1/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/src/module/Makefile.in.orig	2010-01-25 18:21:06.000000000 +0530
-+++ anjal-0.3.1/src/module/Makefile.in	2010-02-19 21:11:54.142924452 +0530
-@@ -145,7 +145,7 @@ 
+--- anjal-0.3.2/src/Makefile.in.orig	2010-03-05 06:35:53.000000000 +0000
++++ anjal-0.3.2/src/Makefile.in	2010-03-05 06:36:10.000000000 +0000
+@@ -223,7 +223,7 @@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LD = @LD@


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- anjal.spec	22 Feb 2010 00:15:46 -0000	1.25
+++ anjal.spec	5 Mar 2010 06:58:17 -0000	1.26
@@ -1,14 +1,13 @@
 Name:          anjal
-Version:       0.3.1
-Release:       3%{?dist}
+Version:       0.3.2
+Release:       1%{?dist}
 Summary:       An email client for small screen devices
 
 Group:         Applications/Productivity
 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
+Patch0:        anjal-fixdso.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: anerley-devel
@@ -39,8 +38,7 @@ all the mail backends including POP3, IM
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix031
-%patch1 -p1 -b .fixdso
+%patch0 -p1 -b .fixdso
 
 %build
 %configure --with-mozilla=no --with-anerley=no
@@ -94,10 +92,8 @@ rm -rf %{buildroot}
 %{_libdir}/evolution/2.30/anjal/libeshell-module-anjal.so
 
 %changelog
-* Mon Feb 22 2010 Peter Robinson <pbrobinson at gmail.com> 0.3.1-3
-- Fix patch so it applies properly
-
-* Sat Feb 20 2010 Peter Robinson <pbrobinson at gmail.com> 0.3.1-2
+* Fri Mar  5 2010 Peter Robinson <pbrobinson at gmail.com> 0.3.2-1
+- Official upstream 0.3.2 release tarball
 - Add patch to fix explicit dso linking. Fixes 564934
 
 * Wed Jan 27 2010 Peter Robinson <pbrobinson at gmail.com> 0.3.1-1


--- anjal-fix031.patch DELETED ---