[evolution-sharp] Rebuild against newer evolution-data-server

Milan Crha mcrha at fedoraproject.org
Thu Jun 16 15:18:57 UTC 2011


commit cfdcb2d40872b7a6ffdbe25182338ff3533f7b4e
Author: Milan Crha <mcrha at redhat.com>
Date:   Thu Jun 16 17:18:23 2011 +0200

    Rebuild against newer evolution-data-server

 evolution-sharp-0.21.1-current-eds.patch |   20 ++++++++++++++++++++
 evolution-sharp.spec                     |   10 +++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/evolution-sharp-0.21.1-current-eds.patch b/evolution-sharp-0.21.1-current-eds.patch
new file mode 100644
index 0000000..ac991ca
--- /dev/null
+++ b/evolution-sharp-0.21.1-current-eds.patch
@@ -0,0 +1,20 @@
+diff -up evolution-sharp-0.21.1/configure.in.current-eds evolution-sharp-0.21.1/configure.in
+--- evolution-sharp-0.21.1/configure.in.current-eds	2011-06-16 17:16:47.492734376 +0200
++++ evolution-sharp-0.21.1/configure.in	2011-06-16 17:16:50.818773989 +0200
+@@ -33,11 +33,11 @@ elif test "x$edsver" = "x1.9" -o "x$edsv
+ 	EDATACAL_SOVERSION=6
+ elif test "x$edsver" = "x2.24"; then
+ 	EDS_VERSION=-1.2
+-	EDS_SOVERSION=11
+-	EBOOK_SOVERSION=9
+-	ECAL_SOVERSION=7
+-	EBACKEND_SOVERSION=0
+-	EDATACAL_SOVERSION=6
++	EDS_SOVERSION=14
++	EBOOK_SOVERSION=14
++	ECAL_SOVERSION=11
++	EBACKEND_SOVERSION=1
++	EDATACAL_SOVERSION=12
+ elif test "x$edsver" = "xunsupported"; then
+ 	AC_MSG_ERROR([
+ 
diff --git a/evolution-sharp.spec b/evolution-sharp.spec
index 7b30775..e58a0dd 100644
--- a/evolution-sharp.spec
+++ b/evolution-sharp.spec
@@ -2,7 +2,7 @@
 
 Name: evolution-sharp
 Version: 0.21.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Evolution Data Server Mono Bindings
@@ -24,6 +24,9 @@ Patch2: evolution-sharp-0.12.1-fix-assembly-dir.patch
 # Stop setting an upper limit on the evolution-data-server version.
 Patch3: evolution-sharp-0.21.1-fix-retarded-version-check.patch
 
+# Set current eds versions
+Patch4: evolution-sharp-0.21.1-current-eds.patch
+
 ### Dependencies ###
 
 Requires: evolution-data-server
@@ -54,6 +57,7 @@ This package contains development files for evolution-sharp.
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .fix-assembly-dir
 %patch3 -p1 -b .fix-retarded-version-check
+%patch4 -p1 -b .current-eds
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -90,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Thu Jun 16 2011 Milan Crha <mcrha at redhat.com> - 0.21.1-14
+- Rebuild against newer evolution-data-server
+- Add patch to correct EDS soname versions
+
 * Fri May 20 2011 Kalev Lember <kalev at smartlink.ee> - 0.21.1-13
 - Rebuilt for libcamel soname bump
 


More information about the scm-commits mailing list