From 22d025c849e281812e2b14dd17e52bc6e1d5c66f Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Mon, 25 Jul 2005 21:50:20 +0000
Subject: [PATCH] - 1.3.5 - Split eds_major (was 1.2) into eds_base_version
 (1.4) and eds_api_version     (1.2) to correspond to BASE_VERSION and
 API_VERSION in configure.in;     updated rest of specfile accordingly. -
 Removed upstreamed patch:    
 evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch

---
 .cvsignore                 |  2 +-
 evolution-data-server.spec | 37 ++++++++++++++++++++++---------------
 sources                    |  2 +-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 286c5ff..8bbfd85 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-1.2.2.tar.bz2
+evolution-data-server-1.3.5.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 4b72fb2..fd471c3 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -12,7 +12,8 @@ ExcludeArch: ppc64
 %define orbit2_version 2.9.8
 %define libbonobo_version 2.4.2
 
-%define eds_major 1.2
+%define eds_base_version 1.4
+%define eds_api_version 1.2
 
 %ifarch s390x ia64
 %define use_gtk_doc 0
@@ -22,8 +23,8 @@ ExcludeArch: ppc64
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.2.2
-Release: 4.fc5
+Version: 1.3.5
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -36,7 +37,6 @@ Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
 #Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch
 
 Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
-Patch100: evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch
 Patch101: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
 
 # Leak fixes by Mark G. Adams
@@ -107,7 +107,6 @@ evolution-data-server.
 #%patch6 -p0 -b .calendar-optimisation-XB70267
 
 %patch98 -p1 -b .ldaphack
-%patch100 -p1 -b .cope-with-a-macro-called-read
 %patch101 -p1 -b .fix_open_calendar_declaration
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
@@ -179,7 +178,7 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
 find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 
-%find_lang %{name}-%{eds_major}
+%find_lang %{name}-%{eds_base_version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -188,28 +187,36 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-%files -f %{name}-%{eds_major}.lang
+%files -f %{name}-%{eds_base_version}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS AUTHORS
 %{_libdir}/bonobo/servers/*
 %{_libdir}/*.so.*
-%{_libexecdir}/evolution-data-server-%{eds_major}
-%{_libexecdir}/camel-index-control-%{eds_major}
-%{_libexecdir}/camel-lock-helper-%{eds_major}
-%{_datadir}/evolution-data-server-%{eds_major}
-%{_datadir}/idl/evolution-data-server-%{eds_major}
-%{_datadir}/pixmaps/evolution-data-server-%{eds_major}
-%{_libdir}/evolution-data-server-%{eds_major}
+%{_libexecdir}/evolution-data-server-%{eds_base_version}
+%{_libexecdir}/camel-index-control-%{eds_api_version}
+%{_libexecdir}/camel-lock-helper-%{eds_api_version}
+%{_datadir}/evolution-data-server-%{eds_base_version}
+%{_datadir}/idl/evolution-data-server-%{eds_api_version}
+%{_datadir}/pixmaps/evolution-data-server-%{eds_base_version}
+%{_libdir}/evolution-data-server-%{eds_api_version}
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/evolution-data-server-%{eds_major}
+%{_includedir}/evolution-data-server-%{eds_base_version}
 %{_datadir}/gtk-doc/html/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Mon Jul 25 2005 David Malcolm <dmalcolm@redhat.com> - 1.3.5-1
+- 1.3.5
+- Split eds_major (was 1.2) into eds_base_version (1.4) and eds_api_version
+  (1.2) to correspond to BASE_VERSION and API_VERSION in configure.in; updated
+  rest of specfile accordingly.
+- Removed upstreamed patch: 
+  evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch
+
 * Wed Jun 27 2005 David Malcolm <dmalcolm@redhat.com> - 1.2.2-4.fc5
 - Added leak fixes for GNOME bug 309079 provided by Mark G. Adams
 
diff --git a/sources b/sources
index f9d8345..26bfbd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b15cba799e4594926472dca3e1747bb  evolution-data-server-1.2.2.tar.bz2
+bb8ee85dbe096f7c00bff181a9a3c264  evolution-data-server-1.3.5.tar.bz2