rpm/evolution
SHA256
1
0
Fork 0
forked from pool/evolution
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=50

Browse Source
This commit is contained in:
OBS User unknown 2008-11-03 11:03:56 +00:00 committed by Git OBS Bridge
parent f668a06c53
commit 071221ee00
15 changed files with 66 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
evolution-2.0.1-de-po.patch
View File

@ -1,22 +0,0 @@
=== modified file 'po/de.po'
--- po/de.po 2007-12-18 20:23:31 +0000
+++ po/de.po 2007-12-18 20:25:01 +0000
@@ -1007,7 +1007,7 @@
#: ../addressbook/gui/component/ldap-config.glade.h:18
msgid "Distinguished name"
-msgstr "Eindeutiger Name"
+msgstr "\"Distinguished\" Name"
#: ../addressbook/gui/component/ldap-config.glade.h:19
msgid "Email address"
@@ -1187,7 +1187,7 @@
#: ../addressbook/gui/component/ldap-config.glade.h:46
msgid "Using distinguished name (DN)"
-msgstr "Eindeutigen Namen (EN) verwenden"
+msgstr "\"Distinguished\" Namen (DN) verwenden"
#: ../addressbook/gui/component/ldap-config.glade.h:47
msgid "Using email address"

277
evolution-2.2.0-port-to-pilot-link-0.12.patch
View File

@ -1,277 +0,0 @@
--- evolution-2.2.2/addressbook/conduit/address-conduit.c.port-to-pilot-link-0.12 2004-09-23 14:50:17.000000000 -0400
+++ evolution-2.2.2/addressbook/conduit/address-conduit.c 2005-04-30 02:22:44.000000000 -0400
@@ -789,7 +789,7 @@
EAddrConduitContext *ctxt)
{
GnomePilotRecord p;
- static char record[0xffff];
+ static unsigned char record[0xffff];
g_assert (local->addr != NULL );
@@ -832,16 +832,16 @@
*/
if (local->local.ID != 0) {
struct Address addr;
- char record[0xffff];
+ pi_buffer_t *buffer = pi_buffer_new (0xffff);
int cat = 0;
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
ctxt->dbi->db_handle,
- local->local.ID, &record,
- NULL, NULL, NULL, &cat) > 0) {
+ local->local.ID, buffer,
+ NULL, NULL, &cat) > 0) {
local->local.category = cat;
memset (&addr, 0, sizeof (struct Address));
- unpack_Address (&addr, record, 0xffff);
+ unpack_Address (&addr, buffer->data, 0xffff);
for (i = 0; i < 5; i++) {
if (addr.entry[entryPhone1 + i])
local->addr->entry[entryPhone1 + i] =
@@ -856,6 +856,8 @@
}
free_Address (&addr);
}
+
+ pi_buffer_free (buffer);
}
local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
@@ -1161,7 +1163,7 @@
EBookQuery *query;
GList *l;
int len;
- unsigned char *buf;
+ pi_buffer_t *buffer;
char *filename;
char *change_id;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
@@ -1244,9 +1246,9 @@
gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
- buf = (unsigned char*)g_malloc (0xffff);
+ buffer = pi_buffer_new (0xffff);
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
- (unsigned char *)buf, 0xffff);
+ 0xffff, buffer);
if (len < 0) {
WARN (_("Could not read pilot's Address application block"));
@@ -1255,8 +1257,8 @@
_("Could not read pilot's Address application block"));
return -1;
}
- unpack_AddressAppInfo (&(ctxt->ai), buf, len);
- g_free (buf);
+ unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len);
+ pi_buffer_free (buffer);
check_for_slow_setting (conduit, ctxt);
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
--- evolution-2.2.2/calendar/conduits/calendar/calendar-conduit.c.port-to-pilot-link-0.12 2005-04-30 01:51:32.000000000 -0400
+++ evolution-2.2.2/calendar/conduits/calendar/calendar-conduit.c 2005-04-30 02:15:02.000000000 -0400
@@ -751,7 +751,7 @@
ECalConduitContext *ctxt)
{
GnomePilotRecord p;
- static char record[0xffff];
+ static unsigned char record[0xffff];
g_assert (local->comp != NULL);
g_assert (local->appt != NULL );
@@ -800,22 +800,24 @@
* we don't overwrite them
*/
if (local->local.ID != 0) {
- struct Appointment appt;
- char record[0xffff];
+ struct Appointment appt;
+ pi_buffer_t *buffer = pi_buffer_new (0xffff);
int cat = 0;
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
ctxt->dbi->db_handle,
- local->local.ID, &record,
- NULL, NULL, NULL, &cat) > 0) {
+ local->local.ID, buffer,
+ NULL, NULL, &cat) > 0) {
local->local.category = cat;
memset (&appt, 0, sizeof (struct Appointment));
- unpack_Appointment (&appt, record, 0xffff);
+ unpack_Appointment (&appt, buffer->data, 0xffff);
local->appt->alarm = appt.alarm;
local->appt->advance = appt.advance;
local->appt->advanceUnits = appt.advanceUnits;
free_Appointment (&appt);
}
+
+ pi_buffer_free (buffer);
}
/* STOP: don't replace these with g_strdup, since free_Appointment
@@ -1342,7 +1344,7 @@
GnomePilotConduitSyncAbs *abs_conduit;
GList *removed = NULL, *added = NULL, *l;
int len;
- unsigned char *buf;
+ pi_buffer_t *buffer;
char *filename, *change_id;
icalcomponent *icalcomp;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
@@ -1460,9 +1462,9 @@
gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
- buf = (unsigned char*)g_malloc (0xffff);
+ buffer = pi_buffer_new (0xffff);
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
- (unsigned char *)buf, 0xffff);
+ 0xffff, buffer);
if (len < 0) {
WARN (_("Could not read pilot's Calendar application block"));
@@ -1471,8 +1473,8 @@
_("Could not read pilot's Calendar application block"));
return -1;
}
- unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
- g_free (buf);
+ unpack_AppointmentAppInfo (&(ctxt->ai), buffer->data, len);
+ pi_buffer_free (buffer);
check_for_slow_setting (conduit, ctxt);
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
--- evolution-2.2.2/calendar/conduits/todo/todo-conduit.c.port-to-pilot-link-0.12 2005-04-30 02:13:27.000000000 -0400
+++ evolution-2.2.2/calendar/conduits/todo/todo-conduit.c 2005-04-30 02:18:11.000000000 -0400
@@ -594,7 +594,7 @@ local_record_to_pilot_record (EToDoLocal
EToDoConduitContext *ctxt)
{
GnomePilotRecord p;
- static char record[0xffff];
+ static unsigned char record[0xffff];
g_assert (local->comp != NULL);
g_assert (local->todo != NULL );
@@ -696,15 +696,17 @@ local_record_from_comp (EToDoLocalRecord
/* Don't overwrite the category */
if (local->local.ID != 0) {
- char record[0xffff];
+ pi_buffer_t *buffer = pi_buffer_new (0xffff);
int cat = 0;
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
ctxt->dbi->db_handle,
- local->local.ID, &record,
- NULL, NULL, NULL, &cat) > 0) {
+ local->local.ID, buffer,
+ NULL, NULL, &cat) > 0) {
local->local.category = cat;
}
+
+ pi_buffer_free (buffer);
}
/*
@@ -1014,7 +1016,7 @@ pre_sync (GnomePilotConduit *conduit,
GnomePilotConduitSyncAbs *abs_conduit;
GList *l;
int len;
- unsigned char *buf;
+ pi_buffer_t *buffer;
char *filename, *change_id;
icalcomponent *icalcomp;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
@@ -1104,9 +1106,9 @@ pre_sync (GnomePilotConduit *conduit,
g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
num_records, add_records, mod_records, del_records);
- buf = (unsigned char*)g_malloc (0xffff);
+ buffer = pi_buffer_new (0xffff);
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
- (unsigned char *)buf, 0xffff);
+ 0xffff, buffer);
if (len < 0) {
WARN (_("Could not read pilot's ToDo application block"));
@@ -1115,9 +1117,9 @@ pre_sync (GnomePilotConduit *conduit,
_("Could not read pilot's ToDo application block"));
return -1;
}
- unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
- g_free (buf);
-
+ unpack_ToDoAppInfo (&(ctxt->ai), buffer->data, len);
+ pi_buffer_free (buffer);
+
lastDesktopUniqueID = 128;
check_for_slow_setting (conduit, ctxt);
--- evolution/calendar/conduits/memo/memo-conduit.c 2005-10-19 17:09:35.000000000 +0530
+++ evolution-2.5.5.1/calendar/conduits/memo/memo-conduit.c 2006-01-20 02:31:15.000000000 +0530
@@ -451,7 +451,7 @@ local_record_to_pilot_record (EMemoLocal
EMemoConduitContext *ctxt)
{
GnomePilotRecord p;
- static char record[0xffff];
+ static unsigned char record[0xffff];
g_assert (local->comp != NULL);
g_assert (local->memo != NULL );
@@ -568,17 +568,18 @@ local_record_from_comp (EMemoLocalRecord
/* Don't overwrite the category */
if (local->local.ID != 0) {
- char record[0xffff];
+ pi_buffer_t *buffer = pi_buffer_new (0xffff);
int cat = 0;
LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
ctxt->dbi->db_handle,
- local->local.ID, &record,
- NULL, NULL, NULL, &cat) > 0) {
+ local->local.ID, buffer,
+ NULL, NULL, &cat) > 0) {
local->local.category = cat;
}
LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
+ pi_buffer_free (buffer);
}
/*
@@ -836,7 +837,7 @@ pre_sync (GnomePilotConduit *conduit,
GnomePilotConduitSyncAbs *abs_conduit;
GList *l;
int len;
- unsigned char *buf;
+ pi_buffer_t *buffer;
char *filename, *change_id;
icalcomponent *icalcomp;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
@@ -929,9 +930,9 @@ pre_sync (GnomePilotConduit *conduit,
g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
num_records, add_records, mod_records, del_records);
- buf = (unsigned char*)g_malloc (0xffff);
+ buffer = pi_buffer_new (0xffff);
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
- (unsigned char *)buf, 0xffff);
+ 0xffff, buffer);
if (len < 0) {
WARN (_("Could not read pilot's Memo application block"));
@@ -940,8 +941,8 @@ pre_sync (GnomePilotConduit *conduit,
_("Could not read pilot's Memo application block"));
return -1;
}
- unpack_MemoAppInfo (&(ctxt->ai), buf, len);
- g_free (buf);
+ unpack_MemoAppInfo (&(ctxt->ai), buffer->data, len);
+ pi_buffer_free (buffer);
lastDesktopUniqueID = 128;

9
evolution-addressbook.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Evolution Address Book
Comment=Manage your contacts
TryExec=evolution
Exec=evolution -c contacts
Icon=ximian-evolution-addressbook
Terminal=false
Type=Application
Categories=GNOME;Office;ContactManagement;

9
evolution-calendar.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Evolution Calendar
Comment=Manage your schedule
TryExec=evolution
Exec=evolution -c calendar
Icon=ximian-evolution-calendar
Terminal=false
Type=Application
Categories=GNOME;Calendar;

3
evolution-desktop-files.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ca63f93f210f28de69546a03e6b6d7ca4c089a6848d1557ac769db63c22d8f0
size 489

9
evolution-email.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Evolution Email
Comment=Manage your electronic mail
TryExec=evolution
Exec=evolution -c mail
Icon=ximian-evolution-email.png
Terminal=false
Type=Application
Categories=GNOME;Network;Email;

24
evolution-morewarnings.patch
View File

@ -1,24 +0,0 @@
=== modified file 'calendar/gui/e-calendar-view.c'
--- calendar/gui/e-calendar-view.c 2007-12-18 20:23:31 +0000
+++ calendar/gui/e-calendar-view.c 2007-12-18 20:28:29 +0000
@@ -42,6 +42,7 @@
#include <e-util/e-error.h>
#include <e-util/e-dialog-utils.h>
#include <e-util/e-icon-factory.h>
+#include <e-util/e-error.h>
#include "e-calendar-marshal.h"
#include <libecal/e-cal-time-util.h>
#include <libecal/e-cal-component.h>
=== modified file 'calendar/gui/e-meeting-list-view.c'
--- calendar/gui/e-meeting-list-view.c 2007-12-18 20:23:31 +0000
+++ calendar/gui/e-meeting-list-view.c 2007-12-18 20:28:29 +0000
@@ -46,6 +46,7 @@
#include <misc/e-cell-renderer-combo.h>
#include <libebook/e-destination.h>
#include "e-select-names-renderer.h"
+#include "itip-utils.h"
struct _EMeetingListViewPrivate {
EMeetingStore *store;

9
evolution-tasklist.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Evolution Task List
Comment=Manage your current tasks
TryExec=evolution
Exec=evolution -c tasks
Icon=ximian-evolution-tasks
Terminal=false
Type=Application
Categories=GNOME;Calendar;

12
evolution.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Nov 3 10:18:56 IST 2008 - msuman@suse.de
- Clean up the spec file to use proper RPM macros.
- Archive the SUSE specific desktop and pixmap files, unclutter the
source list.
- Do not use a custom libexec directory. It serves no purpose.
- Removed the following patches:
+ evolution-2.0.1-de-po.patch - fixed upstream
+ evolution-2.2.0-port-to-pilot-link-0.12.patch - fixed upstream
+ evolution-morewarnings.patch - not required
-------------------------------------------------------------------
Fri Oct 31 15:54:05 CET 2008 - msuman@suse.de

110
evolution.spec
View File

@ -53,35 +53,23 @@ BuildRequires: sqlite3-devel
BuildRequires: libpst-devel
License: GPL v2 or later
Group: Productivity/Networking/Email/Clients
#This should be updated upon major version changes; it should match
# BASE_VERSION as defined in configure.in.
# 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
Release: 2
Release: 3
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Source0: %{name}-%{version}.tar.bz2
Source1: summerdance-about2.png
Source2: evolution-email.desktop
Source3: evolution-addressbook.desktop
Source4: evolution-calendar.desktop
Source5: evolution-tasklist.desktop
Source6: ximian-evolution-email.png
Source7: ximian-evolution-addressbook.png
Source8: ximian-evolution-calendar.png
Source9: ximian-evolution-tasks.png
# PATCH-NEEDS-REBASE evolution-2.0.1-de-po.patch -- Somebody who speaks German well should comment on this.
Patch1: evolution-2.0.1-de-po.patch
# PATCH-FIX-UPSTREAM evolution-2.2.0-port-to-pilot-link-0.12.patch -- Upstream has the patch already.
Patch3: evolution-2.2.0-port-to-pilot-link-0.12.patch
Source2: evolution-desktop-files.tar.bz2
Source3: ximian-evolution-pixmaps.tar.bz2
Patch4: evolution-desktop.patch
Patch5: evolution-morewarnings.patch
Patch6: remove-nm-dep.patch
# PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number
Patch7: calendar-sendbutton.patch
Patch8: fix-exchange-menuitem.diff
Patch9: fix-sendrecv.diff
Patch13: pst-import.patch
# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in /usr/lib/evoldap/include
# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
Patch15: evolution-custom-openldap-includes.patch
# PATCH-FEATURE-OPENSUSE evolution-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.
Patch16: evolution-shared-nss-db.patch
@ -195,7 +183,15 @@ License: GPL v2 or later
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: evolution = %{?epoch:}%{version}-%{release}
Requires: evolution-data-server-devel gtkhtml2-devel gail-devel libgnome-devel libgnomeui-devel libbonoboui-devel libnotify-devel libxml2-devel libopenssl-devel
Requires: evolution-data-server-devel
Requires: gtkhtml2-devel
Requires: gail-devel
Requires: libbonoboui-devel
Requires: libgnome-devel
Requires: libgnomeui-devel
Requires: libnotify-devel
Requires: libopenssl-devel
Requires: libxml2-devel
Provides: evolution2-devel
Obsoletes: evolution2-devel
@ -307,13 +303,7 @@ Authors:
%lang_package
%prep
%setup -q
# %patch1 -p0
%if %suse_version > 1000
# FIXME: somebody with time should fix this patch up and make it apply once more
# %patch3 -p1
%endif
%patch4
%patch5
%patch6
# %patch7
%patch8
@ -325,20 +315,11 @@ Authors:
%build
autoreconf -f -i
# FIXME: Build as root modifies system!
# evolution-2.8.2: --disable-scrollkeeper does not work properly.
# needed for evolution-2.8.2:
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%if %suse_version > 1000
export CFLAGS="$CFLAGS -fstack-protector"
export CXXFLAGS="$CXXFLAGS -fstack-protector"
export FFLAGS="$FFLAGS -fstack-protector"
%endif
sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
%configure \
--libexecdir=%{_prefix}/lib \
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
%{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
%{configure} \
--disable-scrollkeeper \
%if %suse_version > 1100
--with-openldap=%{_libdir}/evoldap \
@ -352,35 +333,36 @@ sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
--enable-nss=yes \
--enable-ipv6=yes \
--enable-default-binary=yes
# Processing the files in help uses _lots_ of memory, so running that part
# in parallel is bad.
# Processing the files in help uses _lots_ of memory, so running that part in parallel is bad.
pushd help
make
%{__make}
popd
make %{?jobs:-j%jobs}
%{__make} %{?jobs:-j%jobs}
%install
make install DESTDIR=$RPM_BUILD_ROOT
cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/%evolution_base_version/images/about-box.png
%{__make} DESTDIR=$RPM_BUILD_ROOT install
%{__cp} %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/%evolution_base_version/images/about-box.png
%suse_update_desktop_file -G "Mail and Calendar" evolution Core-Office
for xml in $RPM_BUILD_ROOT/%{_datadir}/gnome/help/evolution-*/*/evolution-*.xml; do
meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
done
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/applications/
# Install and update the SUSE desktop files.
%{__tar} --bzip2 -xf %{SOURCE2} -C $RPM_BUILD_ROOT/%{_datadir}/applications/
%suse_update_desktop_file -G "Mail" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-mail" evolution-email
%suse_update_desktop_file -G "Address Book" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-contact" evolution-addressbook
%suse_update_desktop_file -G "Schedule Manager" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-calendar" evolution-calendar
%suse_update_desktop_file -G "Task List" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-calendar-todo" evolution-tasklist
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
# Install the Ximian pixmaps.
%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/pixmaps
%{__tar} --bzip2 -xf %{SOURCE3} -C $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
%find_lang evolution-%evolution_base_version
%find_lang evolution evolution-%evolution_base_version.lang
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
#rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
rm $RPM_BUILD_ROOT//%{_libdir}/evolution/*/*.*a
rm $RPM_BUILD_ROOT//%{_libdir}/evolution/*/*/*.*a
rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
%{__cat} %{name}.schemas_list >%{name}.lst
#%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*.*a
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.*a
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.*a
%{__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
@ -389,7 +371,7 @@ echo -e "#!/bin/sh\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%{__rm} -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
@ -422,15 +404,10 @@ fi
%dir %{_libdir}/evolution/*
%{_libdir}/evolution/*/*.so.*
%{_libdir}/evolution/*/components
%dir %{_libdir}/evolution/*/conduits
%{_libdir}/evolution/*/plugins
%if "%{_libdir}" != "%{_prefix}/lib"
%dir %{_prefix}/lib/evolution
%dir %{_prefix}/lib/evolution/*
%endif
%{_prefix}/lib/evolution/*/csv2vcard
%{_prefix}/lib/evolution/*/evolution-*
%{_prefix}/lib/evolution/*/killev
%{_libdir}/evolution/*/csv2vcard
%{_libdir}/evolution/*/evolution-*
%{_libdir}/evolution/*/killev
%files lang -f evolution-%evolution_base_version.lang
@ -443,9 +420,18 @@ fi
%files pilot
%defattr(-,root,root)
%{_datadir}/gnome-pilot/conduits/*.conduit
%{_libdir}/evolution/*/conduits/*.so
%{_libdir}/evolution/*/conduits
%changelog
* Mon Nov 03 2008 msuman@suse.de
- Clean up the spec file to use proper RPM macros.
- Archive the SUSE specific desktop and pixmap files, unclutter the
source list.
- Do not use a custom libexec directory. It serves no purpose.
- Removed the following patches:
+ evolution-2.0.1-de-po.patch - fixed upstream
+ evolution-2.2.0-port-to-pilot-link-0.12.patch - fixed upstream
+ evolution-morewarnings.patch - not required
* Fri Oct 31 2008 msuman@suse.de
- Invoke the binaries from a script which sets the library path
for picking the LDAP libraries.

3
ximian-evolution-addressbook.png
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1291b1b79c2718a29d0463f12e5a3b525adda72a665c05d51a3da3ecd6a22904
size 2762

3
ximian-evolution-calendar.png
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:895cb456ae7bddb99821e08486dc2fb328fceccc4445f0fce001f4c9f4628a6e
size 2733

3
ximian-evolution-email.png
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ecaee9a5b1a539a2df3065baa106b90bdeb1490fd948464446577e2c3133c82
size 2937

3
ximian-evolution-pixmaps.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13e80f0f8258e09c9869c95b4ca3fef1fe97f8b6b42a2583a5ad9707de8c4094
size 12549

3
ximian-evolution-tasks.png
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f61b4f3dfafccdcbade28b4ccc5873f2c679370daa11acb26fd1adee07e665a
size 3601