rpms/evolution-sharp/devel evolution-sharp-0.10.2-evolibdir.patch, NONE, 1.1 evolution-sharp-evo26.patch, 1.1, 1.2 evolution-sharp.spec, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7386

Modified Files:
	evolution-sharp-evo26.patch evolution-sharp.spec 
Added Files:
	evolution-sharp-0.10.2-evolibdir.patch 
Log Message:
* Tue Jan 10 2006 Alexander Larsson <alexl at redhat.com> - 0.10.2-3
- Fix evo 2.6 patch
- Add evolibdir pkg-config variable patch from cvs (modified for evo 2.6)



evolution-sharp-0.10.2-evolibdir.patch:
 configure.in          |    3 +++
 evolution-sharp.pc.in |    2 ++
 2 files changed, 5 insertions(+)

--- NEW FILE evolution-sharp-0.10.2-evolibdir.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-sharp/configure.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- configure.in	12 Sep 2005 21:00:26 -0000	1.28
+++ configure.in	6 Dec 2005 20:36:00 -0000	1.29
@@ -111,6 +111,9 @@ PKG_CHECK_MODULES(EVO_SHELL, "evolution-
 AC_SUBST(EVO_SHELL_CFLAGS)
 AC_SUBST(EVO_SHELL_LIBS)
 
+EVO_SHELL_LIBDIR=`$PKG_CONFIG --variable=privlibdir evolution-shell-2.6`
+AC_SUBST(EVO_SHELL_LIBDIR)
+
 API_VERSION=2.0.0.0
 AC_SUBST(API_VERSION)
 
Index: evolution-sharp.pc.in
===================================================================
RCS file: /cvs/gnome/evolution-sharp/evolution-sharp.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- evolution-sharp.pc.in	2 Jun 2004 00:59:26 -0000	1.3
+++ evolution-sharp.pc.in	6 Dec 2005 20:36:00 -0000	1.4
@@ -1,6 +1,8 @@
 prefix=@prefix@
 libdir=${prefix}/lib
 
+evolibdir=@EVO_SHELL_LIBDIR@
+
 Name: Evolution#
 Description: Evolution# - Evolution .NET Binding
 Version: @VERSION@

evolution-sharp-evo26.patch:
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: evolution-sharp-evo26.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp-evo26.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-sharp-evo26.patch	9 Jan 2006 19:06:04 -0000	1.1
+++ evolution-sharp-evo26.patch	11 Jan 2006 08:51:39 -0000	1.2
@@ -1,5 +1,14 @@
 --- evolution-sharp-0.10.2/configure.in-	2005-09-12 16:55:58.000000000 -0400
 +++ evolution-sharp-0.10.2/configure.in	2005-10-29 15:10:16.000000000 -0400
+@@ -15,7 +15,7 @@
+ PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.3.5, eds13=yes, eds13=no)
+ if test "x$eds13" = "xyes"; then
+ 	EDS_VERSION=-1.2
+-	EDS_SOVERSION=4
++	EDS_SOVERSION=6
+ 	EBOOK_SOVERSION=5
+ 	ECAL_SOVERSION=3
+ else
 @@ -107,7 +107,7 @@
  AC_MSG_RESULT($IDL_INCLUDES)
  AC_SUBST(IDL_INCLUDES)


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evolution-sharp.spec	9 Jan 2006 19:06:04 -0000	1.6
+++ evolution-sharp.spec	11 Jan 2006 08:51:39 -0000	1.7
@@ -1,14 +1,15 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release: 	2
+Release: 	3
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/0.10/
 Source0:        evolution-sharp-%{version}.tar.bz2
-Patch1:          evolution-sharp-mono-lib.patch
+Patch1:         evolution-sharp-mono-lib.patch
 Patch2:		evolution-sharp-evo26.patch
+Patch3:		evolution-sharp-0.10.2-evolibdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  evolution-data-server-devel mono-devel gtk-sharp2-gapi
@@ -26,6 +27,7 @@
 %setup -q
 %patch1 -p0 -b .libs
 %patch2 -p1 -b .evo26
+%patch3 -p0 -b .evolibdir
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -55,6 +57,10 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Tue Jan 10 2006 Alexander Larsson <alexl at redhat.com> - 0.10.2-3
+- Fix evo 2.6 patch
+- Add evolibdir pkg-config variable patch from cvs (modified for evo 2.6)
+
 * Mon Jan  9 2006 Alexander Larsson <alexl at redhat.com> - 0.10.2-2
 - Add s390 arch
 - Build with evo 2.6