From 4b65a1b026d9151915da10844adff49a882594ec4ea6a37e64442c3db5c0010c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 24 Nov 2008 15:00:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=54 --- evolution.changes | 10 +++++ evolution.spec | 45 ++++++++++--------- ... => ximian-evolution-desktop-files.tar.bz2 | 0 3 files changed, 35 insertions(+), 20 deletions(-) rename evolution-desktop-files.tar.bz2 => ximian-evolution-desktop-files.tar.bz2 (100%) diff --git a/evolution.changes b/evolution.changes index 3289d09..0d3f019 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Nov 24 10:00:30 IST 2008 - msuman@suse.de + +- sp-tasks-setup.diff: Comment this patch for now as it breaks the + build. +- Restore the alphabetical order of the BuildRequires list +- Renamed evolution-desktop-files.tar.bz2 to + ximian-evolution-desktop-files.tar.bz2 to prevent the junk + evolution.desktopfiles package getting created after the build. + ------------------------------------------------------------------- Fri Nov 21 12:55:16 CET 2008 - pchenthill@suse.de diff --git a/evolution.spec b/evolution.spec index d66371d..0909d60 100644 --- a/evolution.spec +++ b/evolution.spec @@ -20,6 +20,7 @@ Name: evolution BuildRequires: bison +BuildRequires: dice-devel %if %suse_version > 1100 BuildRequires: evoldap2-devel %else @@ -34,13 +35,14 @@ BuildRequires: gnome-pilot-devel BuildRequires: gtk-doc BuildRequires: gtkhtml2-devel BuildRequires: intltool -BuildRequires: dice BuildRequires: libidl -BuildRequires: libnotify BuildRequires: libnotify-devel BuildRequires: libpisock-devel BuildRequires: libpisync-devel +BuildRequires: libpst-devel +BuildRequires: mono-devel BuildRequires: mozilla-nss-devel +BuildRequires: ndesk-dbus-glib-devel BuildRequires: notification-daemon BuildRequires: nss-shared-helper-devel BuildRequires: perl-XML-Parser @@ -49,22 +51,18 @@ BuildRequires: psmisc BuildRequires: python-devel BuildRequires: scrollkeeper BuildRequires: shared-mime-info -BuildRequires: update-desktop-files BuildRequires: sqlite3-devel -BuildRequires: libpst-devel -BuildRequires: dice-devel -BuildRequires: ndesk-dbus-glib-devel -BuildRequires: mono-devel -License: GPL v2 or later +BuildRequires: update-desktop-files +License: LGPL v2.0 only; LGPL v3 only Group: Productivity/Networking/Email/Clients # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 2.24 Version: 2.24.1.1 -Release: 3 +Release: 4 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: %{name}-%{version}.tar.bz2 Source1: summerdance-about2.png -Source2: evolution-desktop-files.tar.bz2 +Source2: ximian-evolution-desktop-files.tar.bz2 Source3: ximian-evolution-pixmaps.tar.bz2 Patch4: evolution-desktop.patch Patch6: remove-nm-dep.patch @@ -100,15 +98,15 @@ Patch25: bnc-433448-backup-restore-fails.patch Patch26: bnc-434320-mail-notify-fix.patch # PATCH-FIX-UPSTREAM bnc-440624-six-appts-timeslot.patch bnc440624 bgo246313 -- Fix has been submitted upstream. Patch27: bnc-440624-six-appts-timeslot.patch -# PATCH-FIX-UPSTREAM bnc-440646-set-color-proxy.patch bnc440646 msuman@suse.de -- Fix has been submitted upstream. +# PATCH-FIX-UPSTREAM bnc-440646-set-color-proxy.patch bnc440646 msuman@suse.de -- Fix is upstream since 2.24.2 Patch28: bnc-440646-set-color-proxy.patch -# PATCH-FIX-UPSTREAM bnc-440649-display-meeting-bold.patch bnc440649 bgo490503 -- Fix has been submitted upstream. +# PATCH-FIX-UPSTREAM bnc-440649-display-meeting-bold.patch bnc440649 bgo490503 -- Fix is upstream since 2.25.3 Patch29: bnc-440649-display-meeting-bold.patch -# PATCH-FIX-UPSTREAM bnc-443190-warning-before-editing-appt.patch bnc443190 msuman@suse.de -- Fix has been submitted upstream. +# PATCH-FIX-UPSTREAM bnc-443190-warning-before-editing-appt.patch bnc443190 msuman@suse.de -- Fix is upstream since 2.24.2 Patch30: bnc-443190-warning-before-editing-appt.patch # PATCH-FIX-UPSTREAM bnc-443851-calendar-tooltip-info.patch bnc443851 bgo559604 -- Fix has been submitted upstream. Patch31: bnc-443851-calendar-tooltip-info.patch -# PATCH-FIX-UPSTREAM bnc-446356-a11y-crash.diff bnc446356 bgo560329 -- Fix has been submitted upstream. +# PATCH-FIX-UPSTREAM bnc-446356-a11y-crash.diff bnc446356 bgo560329 -- Fix is upstream since 2.24.2 Patch32: bnc-446356-a11y-crash.diff # PATCH-FIX-UPSTREAM bnc-446390-corrupted-vfolders.patch bnc446390 bgo559604 sragavan@novell.com -- Fix has been submitted upstream. Patch33: bnc-446390-corrupted-vfolders.patch @@ -118,14 +116,14 @@ Patch34: bnc-446286-message-tracking-status.patch Patch35: bnc-210959-evo-accept-ics.patch # PATCH-FIX-UPSTREAM sp-tasks-setup.diff pchenthill@suse.de -- Patch needs to upstreamed. Patch36: sp-tasks-setup.diff -# PATCH-FIX-UPSTREAM evo-core-mapi-changes.diff msuman@suse.de -- This patch contains changes in the core code base for the MAPI provider. +# PATCH-FIX-UPSTREAM evo-core-mapi-changes.diff msuman@suse.de -- Fix is upstream since 2.25.3 Patch100: evo-core-mapi-changes.diff Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: yelp Recommends: bogofilter Requires: gtkhtml2 >= 3.10.0 -Requires: evolution-data-server >= 2.24.0 +Requires: evolution-data-server >= 2.24.1.1 Requires: gnome-icon-theme >= 2.10.0 Requires: %{name}-lang = %{version} %gconf_schemas_prereq @@ -224,13 +222,13 @@ Authors: Chris Toshok %package devel -License: GPL v2 or later +License: LGPL v2.0 only; LGPL v3 only Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: evolution = %{?epoch:}%{version}-%{release} Requires: evolution-data-server-devel -Requires: gtkhtml2-devel Requires: gail-devel +Requires: gtkhtml2-devel Requires: libbonoboui-devel Requires: libgnome-devel Requires: libgnomeui-devel @@ -375,7 +373,7 @@ Authors: %patch33 %patch34 %patch35 -%patch36 -p1 +#%patch36 -p1 %patch100 -p1 %build @@ -457,7 +455,7 @@ fi %files -f %{name}.lst %defattr(-,root,root) -%doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS NEWS-1.0 README +%doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README %{_bindir}/* %{_datadir}/applications/*.desktop %{_datadir}/evolution @@ -490,6 +488,13 @@ fi %{_libdir}/evolution/*/conduits %changelog +* Sun Nov 23 2008 msuman@suse.de +- sp-tasks-setup.diff: Comment this patch for now as it breaks the + build. +- Restore the alphabetical order of the BuildRequires list +- Renamed evolution-desktop-files.tar.bz2 to + ximian-evolution-desktop-files.tar.bz2 to prevent the junk + evolution.desktopfiles package getting created after the build. * Fri Nov 21 2008 pchenthill@suse.de - sp-tasks-setup.diff: Adds support for sharepoint tasks. FATE id: 304465 diff --git a/evolution-desktop-files.tar.bz2 b/ximian-evolution-desktop-files.tar.bz2 similarity index 100% rename from evolution-desktop-files.tar.bz2 rename to ximian-evolution-desktop-files.tar.bz2