rpms/planner/devel planner.spec,1.80,1.81

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28138

Modified Files:
	planner.spec 
Log Message:
Resolves: rhbz#557211 evolution is (currently) excluded from s390/s390x


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- planner.spec	14 Jan 2010 13:41:21 -0000	1.80
+++ planner.spec	21 Jan 2010 11:38:06 -0000	1.81
@@ -1,7 +1,13 @@
+%ifarch s390 s390x
+%define build_eds_backend 0
+%else
+%define build_eds_backend 1
+%endif
+
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   15%{?dist}
+Release:   16%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -11,9 +17,11 @@ BuildRequires: gtk2-devel >= 2.2.0, libg
 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, evolution-data-server
-BuildRequires: evolution-data-server-devel >= 1.9.1, evolution-devel >= 2.9.1
-BuildRequires: python-devel, intltool, autoconf, automake, libtool
+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
 Requires:  shared-mime-info
 Requires(post): %{_bindir}/scrollkeeper-update
 Requires(postun): %{_bindir}/scrollkeeper-update
@@ -77,7 +85,12 @@ This package provides a plugin to integr
 %build
 rm -rf libegg
 autoreconf -f -i
-%configure --enable-python --disable-gtk-doc --disable-dotnet --disable-update-mimedb --enable-eds --enable-eds-backend --disable-static
+%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
 make # %{?_smp_mflags} not parallel build safe
 
 %install
@@ -98,11 +111,13 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/*/plugins/*.la
 
+%if %{build_eds_backend}
 pushd $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions
 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
@@ -155,13 +170,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files eds
 %defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/libeds-plugin.so
-%dir %{_libdir}/evolution-data-server-1.2
-%dir %{_libdir}/evolution-data-server-1.2/extensions
+%if %{build_eds_backend}
 %{_libdir}/evolution-data-server-1.2/extensions/libecalbackendplanner.so
 %{_libdir}/evolution/*/plugins/liborg-gnome-planner-source.so
 %{_libdir}/evolution/*/plugins/org-gnome-planner-source.eplug
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -171,6 +185,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jan 21 2010 Caolán McNamara <caolanm at redhat.com> - 0.14.4-16
+- Resolves: rhbz#557211 evolution is (currently) excluded from 
+  s390/s390x (though evo can be built on s390/s390x, so this
+  can be reenabled if evo reappears)
+
 * Thu Jan 14 2010 Caolán McNamara <caolanm at redhat.com> - 0.14.4-15
 - rebuild for libedata-cal-1.2.so.6