rpms/evolution-data-server/devel .cvsignore, 1.115, 1.116 evolution-data-server.spec, 1.277, 1.278 sources, 1.115, 1.116 evolution-data-server-1.10.1-camel-folder-summary-crash.patch, 1.2, NONE

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16643

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.10.1-camel-folder-summary-crash.patch 
Log Message:

* Tue Oct 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.fc13
- Update to 2.29.1
- Bump eds_base_version to 2.30.
- Add dbus-glib build requirement.
- Drop Bonobo + ORBit dependency (yay!).
- Remove option to use OpenSSL instead of NSS.
- Drop eds_api_version definition since it will never change.
- Remove patch for GNOME bug #373146 (deviates from upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- .cvsignore	21 Sep 2009 12:25:16 -0000	1.115
+++ .cvsignore	27 Oct 2009 16:02:52 -0000	1.116
@@ -1 +1 @@
-evolution-data-server-2.28.0.tar.bz2
+evolution-data-server-2.29.1.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- evolution-data-server.spec	21 Sep 2009 12:25:16 -0000	1.277
+++ evolution-data-server.spec	27 Oct 2009 16:02:52 -0000	1.278
@@ -1,33 +1,30 @@
-%define use_nss 1
 %define ldap_support 1
 %define static_ldap 1
 %define krb5_support 1
 %define nntp_support 1
 
+%define dbus_glib_version 0.6
 %define glib2_version 2.16.1
 %define gtk2_version 2.14.0
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
-%define libbonobo_version 2.20.3
 %define libgweather_version 2.25.4
 %define libical_version 0.43
-%define orbit2_version 2.9.8
 %define soup_version 2.3.0
 %define sqlite_version 3.5
 
-%define eds_base_version 2.28
-%define eds_api_version 1.2
+%define eds_base_version 2.30
 
 %define use_gnome_keyring 1
 %define support_imap4_provider 0
 
-%define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
-%define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
+%define camel_provider_dir %{_libdir}/evolution-data-server-1.2/camel-providers
+%define eds_extensions_dir %{_libdir}/evolution-data-server-1.2/extensions
 
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.28.0
+Version: 2.29.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -44,18 +41,15 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #215702 / GNOME bug #487988
 Patch10: evolution-data-server-1.8.0-fix-ldap-query.patch
 
-# GNOME bug #373146
-Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
-
 # RH bug #243296
-Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
+Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
-BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: bison
 BuildRequires: db4-devel
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -64,7 +58,6 @@ BuildRequires: gnutls-devel
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: intltool >= %{intltool_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libglade2-devel
 BuildRequires: libgnome-devel
 BuildRequires: libgnomeui-devel
@@ -72,14 +65,9 @@ BuildRequires: libgweather-devel >= %{li
 BuildRequires: libical-devel >= %{libical_version}
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool
-BuildRequires: sqlite-devel >= %{sqlite_version}
-
-%if %{use_nss}
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
-%else
-BuildRequires: openssl-devel
-%endif
+BuildRequires: sqlite-devel >= %{sqlite_version}
 
 %if %{ldap_support}
 %if %{static_ldap}
@@ -109,7 +97,7 @@ Summary: Development files for building 
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-doc = %{version}-%{release}
-Requires: libbonobo-devel
+Requires: dbus-glib-devel
 Requires: libgnome-devel
 Requires: libgweather-devel
 Requires: libical-devel
@@ -131,8 +119,7 @@ This package contains developer document
 %setup -q
 
 %patch10 -p1 -b .fix-ldap-query
-%patch11 -p1 -b .camel-folder-summary-crash
-%patch12 -p1 -b .fix-64bit-acinclude
+%patch11 -p1 -b .fix-64bit-acinclude
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -170,23 +157,17 @@ fi
 %define nntp_flags --enable-nntp=no
 %endif
 
-%if %{use_nss}
 %define ssl_flags --enable-nss=yes --enable-smime=yes
-%else
-%define ssl_flags --enable-openssl=yes
-%endif
 
-%if %{use_nss}
 if ! pkg-config --exists nss; then 
   echo "Unable to find suitable version of nss to use!"
   exit 1
 fi
-%endif
 
 %if %{use_gnome_keyring}
 %define keyring_flags --enable-gnome-keyring
 %else
-%define keyring flags --disable-gnome-keyring
+%define keyring_flags --disable-gnome-keyring
 %endif
 
 %if %{support_imap4_provider}
@@ -197,12 +178,6 @@ fi
 
 export CPPFLAGS="-I%{_includedir}/et"
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
-%if ! %{use_nss}
-if pkg-config openssl ; then
-	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
-	LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
-fi
-%endif
 
 # Regenerate configure to pick up configure.in and acinclude.m4 changes.
 aclocal -I m4
@@ -233,8 +208,8 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/us
 # remove libtool archives for importers and the like
 find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/camel-providers/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/*.a
 
 # give the libraries some executable bits 
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
@@ -251,28 +226,30 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}-%{eds_base_version}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS AUTHORS
-%{_libdir}/bonobo/servers/GNOME_Evolution_DataServer_%{eds_api_version}.server
-%{_libdir}/libcamel-%{eds_api_version}.so.*
-%{_libdir}/libcamel-provider-%{eds_api_version}.so.*
-%{_libdir}/libebackend-%{eds_api_version}.so.*
-%{_libdir}/libebook-%{eds_api_version}.so.*
-%{_libdir}/libecal-%{eds_api_version}.so.*
-%{_libdir}/libedata-book-%{eds_api_version}.so.*
-%{_libdir}/libedata-cal-%{eds_api_version}.so.*
-%{_libdir}/libedataserver-%{eds_api_version}.so.*
-%{_libdir}/libedataserverui-%{eds_api_version}.so.*
-%{_libdir}/libegroupwise-%{eds_api_version}.so.*
-%{_libdir}/libexchange-storage-%{eds_api_version}.so.*
-%{_libdir}/libgdata-%{eds_api_version}.so.*
-%{_libdir}/libgdata-google-%{eds_api_version}.so.*
-
-%{_libexecdir}/evolution-data-server-%{eds_base_version}
-%{_libexecdir}/camel-index-control-%{eds_api_version}
-%{_libexecdir}/camel-lock-helper-%{eds_api_version}
+%{_libdir}/libcamel-1.2.so.*
+%{_libdir}/libcamel-provider-1.2.so.*
+%{_libdir}/libebackend-1.2.so.*
+%{_libdir}/libebook-1.2.so.*
+%{_libdir}/libecal-1.2.so.*
+%{_libdir}/libedata-book-1.2.so.*
+%{_libdir}/libedata-cal-1.2.so.*
+%{_libdir}/libedataserver-1.2.so.*
+%{_libdir}/libedataserverui-1.2.so.*
+%{_libdir}/libegroupwise-1.2.so.*
+%{_libdir}/libgdata-1.2.so.*
+%{_libdir}/libgdata-google-1.2.so.*
+
+%{_libexecdir}/camel-index-control-1.2
+%{_libexecdir}/camel-lock-helper-1.2
+%{_libexecdir}/e-addressbook-factory
+%{_libexecdir}/e-calendar-factory
+
 %{_datadir}/evolution-data-server-%{eds_base_version}
-%{_datadir}/idl/evolution-data-server-%{eds_api_version}
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
 %{_datadir}/pixmaps/evolution-data-server
-%dir %{_libdir}/evolution-data-server-%{eds_api_version}
+
+%dir %{_libdir}/evolution-data-server-1.2
 %dir %{camel_provider_dir}
 %dir %{eds_extensions_dir}
 
@@ -321,33 +298,31 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/evolution-data-server-%{eds_base_version}
-%{_libdir}/libcamel-%{eds_api_version}.so
-%{_libdir}/libcamel-provider-%{eds_api_version}.so
-%{_libdir}/libebackend-%{eds_api_version}.so
-%{_libdir}/libebook-%{eds_api_version}.so
-%{_libdir}/libecal-%{eds_api_version}.so
-%{_libdir}/libedata-book-%{eds_api_version}.so
-%{_libdir}/libedata-cal-%{eds_api_version}.so
-%{_libdir}/libedataserver-%{eds_api_version}.so
-%{_libdir}/libedataserverui-%{eds_api_version}.so
-%{_libdir}/libegroupwise-%{eds_api_version}.so
-%{_libdir}/libexchange-storage-%{eds_api_version}.so
-%{_libdir}/libgdata-%{eds_api_version}.so
-%{_libdir}/libgdata-google-%{eds_api_version}.so
-%{_libdir}/pkgconfig/camel-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/camel-provider-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/evolution-data-server-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libebackend-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libebook-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libecal-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libedata-book-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libedata-cal-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libedataserver-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libedataserverui-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libgdata-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libgdata-google-%{eds_api_version}.pc
+%{_libdir}/libcamel-1.2.so
+%{_libdir}/libcamel-provider-1.2.so
+%{_libdir}/libebackend-1.2.so
+%{_libdir}/libebook-1.2.so
+%{_libdir}/libecal-1.2.so
+%{_libdir}/libedata-book-1.2.so
+%{_libdir}/libedata-cal-1.2.so
+%{_libdir}/libedataserver-1.2.so
+%{_libdir}/libedataserverui-1.2.so
+%{_libdir}/libegroupwise-1.2.so
+%{_libdir}/libgdata-1.2.so
+%{_libdir}/libgdata-google-1.2.so
+%{_libdir}/pkgconfig/camel-1.2.pc
+%{_libdir}/pkgconfig/camel-provider-1.2.pc
+%{_libdir}/pkgconfig/evolution-data-server-1.2.pc
+%{_libdir}/pkgconfig/libebackend-1.2.pc
+%{_libdir}/pkgconfig/libebook-1.2.pc
+%{_libdir}/pkgconfig/libecal-1.2.pc
+%{_libdir}/pkgconfig/libedata-book-1.2.pc
+%{_libdir}/pkgconfig/libedata-cal-1.2.pc
+%{_libdir}/pkgconfig/libedataserver-1.2.pc
+%{_libdir}/pkgconfig/libedataserverui-1.2.pc
+%{_libdir}/pkgconfig/libegroupwise-1.2.pc
+%{_libdir}/pkgconfig/libgdata-1.2.pc
+%{_libdir}/pkgconfig/libgdata-google-1.2.pc
 
 %files doc
 %defattr(-,root,root,-)
@@ -361,6 +336,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Tue Oct 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.fc13
+- Update to 2.29.1
+- Bump eds_base_version to 2.30.
+- Add dbus-glib build requirement.
+- Drop Bonobo + ORBit dependency (yay!).
+- Remove option to use OpenSSL instead of NSS.
+- Drop eds_api_version definition since it will never change.
+- Remove patch for GNOME bug #373146 (deviates from upstream).
+
 * Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	21 Sep 2009 12:25:16 -0000	1.115
+++ sources	27 Oct 2009 16:02:52 -0000	1.116
@@ -1 +1 @@
-015a9692904c349034982c69d90b1b37  evolution-data-server-2.28.0.tar.bz2
+e75903b1c938796ad7f54524492fa0d2  evolution-data-server-2.29.1.tar.bz2


--- evolution-data-server-1.10.1-camel-folder-summary-crash.patch DELETED ---