rpms/evolution-exchange/devel .cvsignore, 1.56, 1.57 evolution-exchange.spec, 1.90, 1.91 sources, 1.56, 1.57

Mon May 3 17:58:03 UTC 2010

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13247

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:
- Update to 2.31.1
- Bump evo_base_version to 3.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57

--- .cvsignore	8 Feb 2010 11:45:40 -0000	1.56
+++ .cvsignore	3 May 2010 17:58:03 -0000	1.57
@@ -1 +1 @@
-evolution-exchange-2.29.90.tar.bz2
+evolution-exchange-2.31.1.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- evolution-exchange.spec	8 Feb 2010 11:45:41 -0000	1.90
+++ evolution-exchange.spec	3 May 2010 17:58:03 -0000	1.91
@@ -1,7 +1,7 @@
 %define intltool_version 0.35.5
 %define libsoup_version 2.3.0
 
-%define evo_major 2.30
+%define evo_base_version 3.0
 
 # Make sure the evolution package is upgraded first, or else this variable
 # will come up empty and lead to the following libtool error.
@@ -16,14 +16,14 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.29.90
+Version: 2.31.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 License: GPLv2+
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
 
 Provides: evolution-connector = %{version}-%{release}
 Obsoletes: evolution-connector < %{version}-%{release}
@@ -31,6 +31,7 @@ Obsoletes: evolution-connector < %{versi
 ### Patches ###
 
 Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.patch
+
 ### Dependencies ###
 
 Requires: gnutls
@@ -52,10 +53,7 @@ BuildRequires: libsoup-devel >= %{libsou
 BuildRequires: libtool >= 1.5
 BuildRequires: openldap-evolution-devel
 BuildRequires: openssl-devel
-BuildRequires: krb5-devel 
-# tweak for krb5 1.2 vs 1.3
-%define krb5dir /usr/kerberos
-#define krb5dir `pwd`/krb5-fakeprefix
+BuildRequires: krb5-devel
 
 %description
 This package enables added functionality to Evolution when used with a 
@@ -66,10 +64,6 @@ Microsoft Exchange Server.
 
 %patch11 -p1 -b .fix-64bit-acinclude
 
-mkdir -p krb5-fakeprefix/include
-mkdir -p krb5-fakeprefix/lib
-mkdir -p krb5-fakeprefix/%{_lib}
-
 %build
 export CPPFLAGS="-I%{_includedir}/et"
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC"
@@ -89,7 +83,7 @@ autoreconf --force --install
   --enable-gtk-doc \
   --with-openldap=%{_libdir}/evolution-openldap \
   --with-static-ldap \
-  --with-krb5=%{krb5dir}
+  --with-krb5=%{_prefix}
 
 make %{?_smp_mflags} LDFLAGS="-R %{plibdir}"
 
@@ -100,41 +94,45 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/evoluti
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.la
 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/camel-providers/libcamelexchange.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/%{evo_major}/plugins/liborg-gnome-exchange-operations.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/%{evo_base_version}/plugins/liborg-gnome-exchange-operations.la
 
-%find_lang evolution-exchange-%{evo_major}
+%find_lang evolution-exchange-%{evo_base_version}
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_base_version}.schemas > /dev/null
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-%files -f evolution-exchange-%{evo_major}.lang
+%files -f evolution-exchange-%{evo_base_version}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING INSTALL NEWS docs/active-directory
 %doc docs/autoconfig docs/debug docs/forms
 %doc docs/http
-%{_bindir}/exchange-connector-setup-%{evo_major}
+%{_bindir}/exchange-connector-setup-%{evo_base_version}
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.so
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.urls
 %{_libdir}/evolution-data-server-1.2/extensions/libebookbackendexchange.so
 %{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.so
-%{_libdir}/evolution/%{evo_major}/plugins/liborg-gnome-exchange-operations.so
-%{_libdir}/evolution/%{evo_major}/plugins/org-gnome-exchange-operations.eplug
-%{_datadir}/evolution/%{evo_major}/errors/org-gnome-exchange-operations.error
+%{_libdir}/evolution/%{evo_base_version}/plugins/liborg-gnome-exchange-operations.so
+%{_libdir}/evolution/%{evo_base_version}/plugins/org-gnome-exchange-operations.eplug
+%{_datadir}/evolution/%{evo_base_version}/errors/org-gnome-exchange-operations.error
 
 %{_datadir}/gtk-doc/html/evolution-exchange
 %dir %{_datadir}/evolution-exchange
-%dir %{_datadir}/evolution-exchange/%{evo_major}
-%dir %{_datadir}/evolution-exchange/%{evo_major}/images
-%dir %{_datadir}/evolution-exchange/%{evo_major}/ui
-%{_datadir}/evolution-exchange/%{evo_major}/images/*
-%{_datadir}/evolution-exchange/%{evo_major}/ui/*
-%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
+%dir %{_datadir}/evolution-exchange/%{evo_base_version}
+%dir %{_datadir}/evolution-exchange/%{evo_base_version}/images
+%dir %{_datadir}/evolution-exchange/%{evo_base_version}/ui
+%{_datadir}/evolution-exchange/%{evo_base_version}/images/*
+%{_datadir}/evolution-exchange/%{evo_base_version}/ui/*
+%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_base_version}.schemas
 
 %changelog
+* Mon May 03 2010 Milan Crha <mcrha at redhat.com> - 2.31.1-1.fc14
+- Update to 2.31.1
+- Bump evo_base_version to 3.0.
+
 * Mon Feb 08 2010 Milan Crha <mcrha at redhat.com> - 2.29.90-1.fc13
 - Update to 2.29.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	8 Feb 2010 11:45:41 -0000	1.56
+++ sources	3 May 2010 17:58:03 -0000	1.57
@@ -1 +1 @@
-5a6e0472fb6e1801a11ca999a7c1733a  evolution-exchange-2.29.90.tar.bz2
+02272e3888e37e3f7d12db50763fde8e  evolution-exchange-2.31.1.tar.bz2

