[planner] drop evolution integration

Caolán McNamara caolanm at fedoraproject.org
Fri Jul 27 13:39:31 UTC 2012


commit 2e2fe333c7967f724efa427c1358ab8d0412b730
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 27 14:38:10 2012 +0100

    drop evolution integration

 planner-0.14.4-edsapi.patch |  859 -------------------------------------------
 planner.spec                |   58 +---
 2 files changed, 10 insertions(+), 907 deletions(-)
---
diff --git a/planner.spec b/planner.spec
index b345fdc..4fa066d 100644
--- a/planner.spec
+++ b/planner.spec
@@ -1,13 +1,7 @@
-%ifarch s390 s390x
-%define build_eds_backend 0
-%else
-%define build_eds_backend 0
-%endif
-
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.6
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -18,13 +12,11 @@ BuildRequires: libglade2-devel >= 2.0.0, gnome-vfs2-devel >= 2.0.2
 BuildRequires: libgnomeprintui22-devel >= 2.2.0, libxml2-devel >= 2.5.4
 BuildRequires: libxslt-devel >= 1.0.27, libgsf-devel, gtk-doc, pygtk2-devel
 BuildRequires: scrollkeeper, glib2-devel, python-devel, intltool, autoconf
-BuildRequires: automake, libtool, evolution-data-server-devel >= 1.9.1
-%if %{build_eds_backend}
-BuildRequires: evolution-devel >= 2.9.1
-%endif
+BuildRequires: automake, libtool
 Requires:  shared-mime-info
 Requires(post): %{_bindir}/scrollkeeper-update
 Requires(postun): %{_bindir}/scrollkeeper-update
+Obsoletes: planner-eds < 0.14.6-6
  
 Patch1:  planner-gnome596173-xdg.patch
 Patch2:  planner-gnome596966-editoninsert.patch
@@ -37,8 +29,7 @@ Patch8:  planner-gnome581282-printpreview.patch
 Patch9:  planner-gnome606824-notecolumn.patch
 Patch10: planner-gnome341504-paste.tasks.patch
 Patch11: planner-gnome615641-multiselect.patch
-Patch12: planner-0.14.4-edsapi.patch
-Patch13: planner-gnome655803-bad-LC_TIME.patch
+Patch12: planner-gnome655803-bad-LC_TIME.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -58,14 +49,6 @@ Requires: pkgconfig, glib2-devel, libxml2-devel, libgsf-devel
 This package provides the necessary development libraries and include
 files to allow you to develop with planner.
 
-%package eds
-Summary: Planner integration with evolution
-Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}
-
-%description eds
-This package provides a plugin to integration planner and evolution.
-
 %prep
 %setup -q
 %patch1  -p1 -b .xdg
@@ -79,18 +62,12 @@ This package provides a plugin to integration planner and evolution.
 %patch9  -p1 -b .notecolumn
 %patch10 -p1 -b .copypaste
 %patch11 -p1 -b .multiselect
-%patch12 -p1 -b .edsapi.patch
-%patch13 -p1 -b .gnome655803
+%patch12 -p1 -b .gnome655803
 
 %build
 rm -rf libegg
 autoreconf -f -i
-%if %{build_eds_backend}
-%define eds_backend_flags --enable-eds-backend
-%else
-%define eds_backend_flags --disable-eds-backend
-%endif
-%configure --enable-python --disable-gtk-doc --disable-dotnet --disable-update-mimedb %{eds_backend_flags} --enable-eds --disable-static
+%configure --enable-python --disable-gtk-doc --disable-dotnet --disable-update-mimedb --disable-eds-backend --disable-eds --disable-static
 make # %{?_smp_mflags} not parallel build safe
 
 %install
@@ -108,16 +85,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/storage-modules/libstorage-sql*
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/libsql-plugin*
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/calendar-backends/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/*/plugins/*.la
-
-%if %{build_eds_backend}
-pushd $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/calendar-backends
-rm -f libecalbackendplanner.so
-rm -f libecalbackendplanner.so.0
-mv -f libecalbackendplanner.so.0.0.0 libecalbackendplanner.so
-popd
-%endif
 
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/XMLnamespaces
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/globs
@@ -166,15 +133,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 %{_mandir}/man1/planner.1.gz
 
-%files eds
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/libeds-plugin.so
-%if %{build_eds_backend}
-%{_libdir}/evolution-data-server/calendar-backends/libecalbackendplanner.so
-%{_libdir}/evolution/*/plugins/liborg-gnome-planner-source.so
-%{_libdir}/evolution/*/plugins/org-gnome-planner-source.eplug
-%endif
-
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}-1.0
@@ -183,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jul 27 2012 Caolán McNamara <caolanm at redhat.com> - 0.14.6-6
+- drop evolution integration, doesn't build, api migration
+  path unclear
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list