From 745bfa78bb2a43f8563f1af019485ae2ba0d13fa1290c04990580c8351d75e27 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sun, 27 Dec 2009 17:12:11 +0000
Subject: [PATCH] Accepting request 27688 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/evolution via accept of submit request 27688 revision 4.
Request was accepted with message:
accept

OBS-URL: https://build.opensuse.org/request/show/27688
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=57
---
 evolution.changes | 11 +++++++++++
 evolution.spec    | 33 ++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/evolution.changes b/evolution.changes
index 44ff6ea..a842574 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Dec 27 15:50:12 CET 2009 - vuntz@opensuse.org
+
+- Rework packaging to make it easy to switch between using evoldap
+  and not using it, with a USE_EVOLDAP define.
+- Do not use evoldap right now: the evoldap package doesn't seem to
+  be well-maintained.
+- Call suse_update_desktop_file on evolution-alarm-notify.
+- Add libgnomecanvas-devel Requires to devel package.
+- Remove scrollkeeper BuildRequires.
+
 -------------------------------------------------------------------
 Thu Dec 24 21:15:16 CET 2009 - vuntz@opensuse.org
 
diff --git a/evolution.spec b/evolution.spec
index c1cb756..05c8327 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -15,13 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
+%define USE_EVOLDAP 0
 
 Name:           evolution
 BuildRequires:  NetworkManager-devel
 BuildRequires:  bison
-%if %suse_version > 1100
+%if %USE_EVOLDAP
 BuildRequires:  evoldap2-devel
 %else
 BuildRequires:  openldap2-devel
@@ -52,7 +51,6 @@ BuildRequires:  nss-shared-helper-devel
 BuildRequires:  pilot-link
 BuildRequires:  psmisc
 BuildRequires:  python-devel
-BuildRequires:  scrollkeeper
 BuildRequires:  shared-mime-info
 BuildRequires:  sqlite3-devel
 BuildRequires:  translation-update-upstream
@@ -117,6 +115,7 @@ Requires:       gconf2-devel
 Requires:       gnome-desktop-devel
 Requires:       gtk2-devel
 Requires:       gtkhtml2-devel
+Requires:       libgnomecanvas-devel
 Requires:       libunique-devel
 Requires:       libxml2-devel
 Provides:       evolution2-devel = %{version}
@@ -179,7 +178,9 @@ Evolution or embed the existing ones in other applications.
 translation-update-upstream
 #gnome-patch-translation-prepare
 # %patch7
+%if %USE_EVOLDAP
 %patch15 -p1
+%endif
 %patch16 -p1
 %patch18
 %patch19
@@ -205,7 +206,7 @@ autoreconf -f -i
 %{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
 %{configure} \
     --disable-scrollkeeper \
-%if %suse_version > 1100
+%if %USE_EVOLDAP
     --with-openldap=%{_libdir}/evoldap \
 %else
     --with-openldap=yes \
@@ -233,24 +234,22 @@ popd
 %if 0%{?suse_version} <= 1120
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
-# Remove the libtool archive files
-%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.la
-%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.la
+find %{buildroot} -name '*.la' -type f -delete -print
 %suse_update_desktop_file -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution Core-Office
+%suse_update_desktop_file evolution-alarm-notify
 %find_lang evolution-%evolution_base_version
 %find_lang evolution evolution-%evolution_base_version.lang
 %find_gconf_schemas
-%{__cat} %{name}.schemas_list >%{name}.lst
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mime-info
-%fdupes $RPM_BUILD_ROOT
-%if %suse_version > 1100
-%{__mv} $RPM_BUILD_ROOT/%{_bindir}/evolution $RPM_BUILD_ROOT/%{_bindir}/evolution.bin
-echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > $RPM_BUILD_ROOT/%{_bindir}/evolution
-%{__chmod} +x $RPM_BUILD_ROOT/%{_bindir}/evolution
+%{__rm} -r %{buildroot}%{_datadir}/mime-info
+%if %USE_EVOLDAP
+  %{__mv} %{buildroot}%{_bindir}/evolution %{buildroot}%{_bindir}/evolution.bin
+  echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > %{buildroot}%{_bindir}/evolution
+  %{__chmod} +x %{buildroot}%{_bindir}/evolution
 %endif
+%fdupes %{buildroot}
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %pre -f %{name}.schemas_pre
 
@@ -268,7 +267,7 @@ if test -x usr/bin/update-mime-database ; then
   usr/bin/update-mime-database usr/share/mime >/dev/null
 fi
 
-%files -f %{name}.lst
+%files -f %{name}.schemas_list
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README
 %{_bindir}/*