rpms/evolution-zimbra/devel evolution-zimbra-0.1.1-fix-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 evolution-zimbra.spec, 1.4, 1.5 sources, 1.2, 1.3 evolution-zimbra-0.1.0-chain-up.patch, 1.1, NONE

Thu Jun 5 17:34:37 UTC 2008

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-zimbra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8319

Modified Files:
	.cvsignore evolution-zimbra.spec sources 
Added Files:
	evolution-zimbra-0.1.1-fix-build.patch 
Removed Files:
	evolution-zimbra-0.1.0-chain-up.patch 
Log Message:

* Thu Jun 05 2008 Matthew Barnes <mbarnes at redhat.com> - 0.1.1-1
- Update to 0.1.1
- Remove upstreamed patch.
- Require evo/eds >= 2.23.1.


evolution-zimbra-0.1.1-fix-build.patch:

--- NEW FILE evolution-zimbra-0.1.1-fix-build.patch ---
diff -up evolution-zimbra-0.1.1/addressbook/Makefile.am.fix-build evolution-zimbra-0.1.1/addressbook/Makefile.am
--- evolution-zimbra-0.1.1/addressbook/Makefile.am.fix-build	2008-06-05 13:27:52.000000000 -0400
+++ evolution-zimbra-0.1.1/addressbook/Makefile.am	2008-06-05 13:28:06.000000000 -0400
@@ -1,6 +1,6 @@
 INCLUDES = -DG_LOG_DOMAIN=\"zimbra-ebookbackend\" $(ZIMBRA_CFLAGS) $(DATABOOK_CFLAGS) $(LIBXML_CFLAGS)
 
-backenddir = $(prefix)$(EDS_BACKEND_DIR)
+backenddir = $(EDS_BACKEND_DIR)
 
 backend_LTLIBRARIES = libebookbackendzimbra.la
 
diff -up evolution-zimbra-0.1.1/addressbook/Makefile.in.fix-build evolution-zimbra-0.1.1/addressbook/Makefile.in
--- evolution-zimbra-0.1.1/addressbook/Makefile.in.fix-build	2008-06-05 13:27:59.000000000 -0400
+++ evolution-zimbra-0.1.1/addressbook/Makefile.in	2008-06-05 13:28:16.000000000 -0400
@@ -300,7 +300,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = -DG_LOG_DOMAIN=\"zimbra-ebookbackend\" $(ZIMBRA_CFLAGS) $(DATABOOK_CFLAGS) $(LIBXML_CFLAGS)
-backenddir = $(prefix)$(EDS_BACKEND_DIR)
+backenddir = $(EDS_BACKEND_DIR)
 backend_LTLIBRARIES = libebookbackendzimbra.la
 libebookbackendzimbra_la_SOURCES = e-book-backend-zimbra.c e-book-backend-zimbra.h e-book-backend-zimbra-factory.c
 libebookbackendzimbra_la_LIBADD = $(DATABOOK_LIBS) $(LIBXML_LIBS) $(CURL_LIBS) $(top_builddir)/libezimbra/libezimbra.la
diff -up evolution-zimbra-0.1.1/calendar/Makefile.am.fix-build evolution-zimbra-0.1.1/calendar/Makefile.am
--- evolution-zimbra-0.1.1/calendar/Makefile.am.fix-build	2008-06-05 13:28:24.000000000 -0400
+++ evolution-zimbra-0.1.1/calendar/Makefile.am	2008-06-05 13:28:39.000000000 -0400
@@ -1,6 +1,6 @@
 INCLUDES = -DG_LOG_DOMAIN=\"libecalbackendzimbra\" -I$(top_srcdir) $(EVOLUTION_CALENDAR_CFLAGS) $(DATACAL_CFLAGS) $(DEBUG_CFLAGS) $(GNOMEVFS_CFLAGS)
 
-backenddir = $(prefix)$(EDS_BACKEND_DIR)
+backenddir = $(EDS_BACKEND_DIR)
 
 backend_LTLIBRARIES = libecalbackendzimbra.la
 
diff -up evolution-zimbra-0.1.1/calendar/Makefile.in.fix-build evolution-zimbra-0.1.1/calendar/Makefile.in
--- evolution-zimbra-0.1.1/calendar/Makefile.in.fix-build	2008-06-05 13:28:30.000000000 -0400
+++ evolution-zimbra-0.1.1/calendar/Makefile.in	2008-06-05 13:28:52.000000000 -0400
@@ -312,7 +312,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = -DG_LOG_DOMAIN=\"libecalbackendzimbra\" -I$(top_srcdir) $(EVOLUTION_CALENDAR_CFLAGS) $(DATACAL_CFLAGS) $(DEBUG_CFLAGS) $(GNOMEVFS_CFLAGS)
-backenddir = $(prefix)$(EDS_BACKEND_DIR)
+backenddir = $(EDS_BACKEND_DIR)
 backend_LTLIBRARIES = libecalbackendzimbra.la
 libecalbackendzimbra_la_SOURCES = \
 	e-cal-backend-zimbra-factory.c	\
diff -up evolution-zimbra-0.1.1/camel/Makefile.am.fix-build evolution-zimbra-0.1.1/camel/Makefile.am
--- evolution-zimbra-0.1.1/camel/Makefile.am.fix-build	2008-06-05 11:58:58.000000000 -0400
+++ evolution-zimbra-0.1.1/camel/Makefile.am	2008-06-05 13:26:00.000000000 -0400
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelzimbra.la
 camel_provider_DATA = libcamelzimbra.urls
 
-camel_providerdir = $(prefix)$(CAMEL_PROVIDER_DIR)
+camel_providerdir = $(CAMEL_PROVIDER_DIR)
 
 INCLUDES = -I..  $(GLIB_CFLAGS)	$(CAMEL_PROVIDER_CFLAGS) $(GNOME_INCLUDEDIR) -DG_LOG_DOMAIN=\"camel-sx-provider\"
 
diff -up evolution-zimbra-0.1.1/camel/Makefile.in.fix-build evolution-zimbra-0.1.1/camel/Makefile.in
--- evolution-zimbra-0.1.1/camel/Makefile.in.fix-build	2008-06-05 12:38:04.000000000 -0400
+++ evolution-zimbra-0.1.1/camel/Makefile.in	2008-06-05 13:26:00.000000000 -0400
@@ -294,7 +294,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 camel_provider_LTLIBRARIES = libcamelzimbra.la
 camel_provider_DATA = libcamelzimbra.urls
-camel_providerdir = $(prefix)$(CAMEL_PROVIDER_DIR)
+camel_providerdir = $(CAMEL_PROVIDER_DIR)
 INCLUDES = -I..  $(GLIB_CFLAGS)	$(CAMEL_PROVIDER_CFLAGS) $(GNOME_INCLUDEDIR) -DG_LOG_DOMAIN=\"camel-sx-provider\"
 libcamelzimbra_la_SOURCES = camel-zimbra-provider.c
 libcamelzimbra_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
diff -up evolution-zimbra-0.1.1/eplugin/Makefile.am.fix-build evolution-zimbra-0.1.1/eplugin/Makefile.am
--- evolution-zimbra-0.1.1/eplugin/Makefile.am.fix-build	2008-06-05 10:54:17.000000000 -0400
+++ evolution-zimbra-0.1.1/eplugin/Makefile.am	2008-06-05 13:26:00.000000000 -0400
@@ -10,7 +10,7 @@ INCLUDES =							\
 	$(SOUP_CFLAGS)						\
 	$(CAMEL_CFLAGS)					
 
-eplugindir = $(prefix)$(EPLUGIN_DIR)
+eplugindir = $(EPLUGIN_DIR)
 
 @EPLUGIN_RULE@
 
diff -up evolution-zimbra-0.1.1/eplugin/Makefile.in.fix-build evolution-zimbra-0.1.1/eplugin/Makefile.in
--- evolution-zimbra-0.1.1/eplugin/Makefile.in.fix-build	2008-06-05 12:38:04.000000000 -0400
+++ evolution-zimbra-0.1.1/eplugin/Makefile.in	2008-06-05 13:26:00.000000000 -0400
@@ -308,7 +308,7 @@ INCLUDES = \
 	$(SOUP_CFLAGS)						\
 	$(CAMEL_CFLAGS)					
 
-eplugindir = $(prefix)$(EPLUGIN_DIR)
+eplugindir = $(EPLUGIN_DIR)
 eplugin_DATA = com-zimbra-account-setup.eplug
 eplugin_LTLIBRARIES = libcom-zimbra-account-setup.la
 libcom_zimbra_account_setup_la_SOURCES = zimbra-account-setup.c camel-zimbra-listener.h camel-zimbra-listener.c


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-zimbra/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 04:26:23 -0000	1.2
+++ .cvsignore	5 Jun 2008 17:33:54 -0000	1.3
@@ -1 +1 @@
-evolution-zimbra-0.1.0.tar.gz
+evolution-zimbra-0.1.1.tar.gz


Index: evolution-zimbra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-zimbra/devel/evolution-zimbra.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evolution-zimbra.spec	17 Mar 2008 17:22:26 -0000	1.4
+++ evolution-zimbra.spec	5 Jun 2008 17:33:54 -0000	1.5
@@ -1,26 +1,26 @@
-%define evo_version 2.21.1
-%define eds_version 2.21.1
+%define evo_version 2.23.1
+%define eds_version 2.23.1
 %define glib_version 2.8.1
 
-%define evo_api_version 2.22
+%define evo_api_version 2.24
 %define eds_api_version 1.2
 
 ### Abstract ###
 
 Name: evolution-zimbra
-Version: 0.1.0
-Release: 6%{?dist}
+Version: 0.1.1
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Summary: Zimbra Connector for Evolution
 URL: http://sourceforge.net/projects/zimbraevo/
-Source: http://downloads.sourceforge.net/zimbraevo/evolution-zimbra-0.1.0.tar.gz
+Source: http://downloads.sourceforge.net/zimbraevo/evolution-zimbra-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ### Patches ###
 
-# Chain up to GObject methods.
-Patch1: evolution-zimbra-0.1.0-chain-up.patch
+# Fix a boo boo in the released tarball.
+Patch0: evolution-zimbra-0.1.1-fix-build.patch
 
 ### Build Dependencies ###
 
@@ -36,7 +36,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .chain-up
+%patch -p1 -b .fix-build
 
 %build
 %configure
@@ -51,11 +51,17 @@
 
 %files
 %defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/libezimbra/*
 %{_libdir}/evolution/%{evo_api_version}/plugins/*
 %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*
 %{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*
 
 %changelog
+* Thu Jun 05 2008 Matthew Barnes <mbarnes at redhat.com> - 0.1.1-1
+- Update to 0.1.1
+- Remove upstreamed patch.
+- Require evo/eds >= 2.23.1.
+
 * Mon Mar 17 2008 Matthew Barnes <mbarnes at redhat.com> - 0.1.0-6.fc9
 - Chain up in dispose() and finalize() methods.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-zimbra/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Jan 2008 04:26:23 -0000	1.2
+++ sources	5 Jun 2008 17:33:54 -0000	1.3
@@ -1 +1 @@
-a50bdc88e6ed03bfb168d8f5cbffa9cc  evolution-zimbra-0.1.0.tar.gz
+3ef6194eab66e3a39d73290fcff42516  evolution-zimbra-0.1.1.tar.gz


--- evolution-zimbra-0.1.0-chain-up.patch DELETED ---


