diff --git a/evolution.spec b/evolution.spec index fee22aa..f2d3e99 100644 --- a/evolution.spec +++ b/evolution.spec @@ -15,14 +15,20 @@ ExcludeArch: ia64 Name: evolution Version: 1.0.3 -Release: 0.1 +Release: 3 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ Source0: %{name}-%{version}.tar.gz Source1: db-3.1.17.tar.gz -Patch0: evolution-1.0.1-dborder.patch -Patch1: evolution-1.0.2-redhatifysummary.patch +# patches pulled from upstream CVS +Patch0: evolution-1.0.3-non-attendee-acceptance.patch +Patch1: evolution-1.0.3-startupwizardcrash.patch +Patch2: evolution-1.0.3-useproperldapattribs.patch + +# Red Hat Linux specific patches +Patch10: evolution-1.0.1-dborder.patch +Patch11: evolution-1.0.2-redhatify.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -72,8 +78,14 @@ personal information-management tool. %prep %setup -q -a 1 -%patch0 -p0 -b .dborder -%patch1 -p0 -b .rhatify +# these are in CVS already on the 1-0-branch +%patch0 -p0 -b .appointments +%patch1 -p0 -b .startupwizardcrash +%patch2 -p0 -b .ldapattribs + +# Red Hat specific patches +%patch10 -p0 -b .dborder +%patch11 -p0 -b .rhatify %build @@ -121,9 +133,15 @@ cd %{buildtopdir} %ldap_flags %pilot_flags %krb5_flags %nntp_flags %nss_flags make +cat /dev/null > default_user/local/Inbox/mbox + %install make DESTDIR=$RPM_BUILD_ROOT install +# move desktop file to applink location per #62399 +mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications +mv $RPM_BUILD_ROOT/usr/share/gnome/apps/Applications/evolution.desktop $RPM_BUILD_ROOT/etc/X11/applnk/Applications/evolution.desktop + %find_lang %name %post -p /sbin/ldconfig @@ -136,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README -%{_datadir}/gnome/apps/Applications/evolution.desktop +%{_sysconfdir}/X11/applnk/Applications/evolution.desktop %{_datadir}/gnome/help/evolution %{_datadir}/gnome/ui/* %{_datadir}/gnome/html/* @@ -160,10 +178,17 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Sun Mar 24 2002 Jeremy Katz 1.0.3-0.1 -- rev to new 1.0.3 tarball +* Wed Apr 10 2002 Jeremy Katz 1.0.3-3 +- minor tweaks to the redhatify patch +- make accepting appointments sent to mailing lists work +- use the RFC specified LDAP attribs for freebusy and calendarURI + in addressbook +- fix a crash in the startup wizard -* Wed Mar 20 2002 Jeremy Katz 1.0.3-0 +* Sun Mar 31 2002 Jeremy Katz 1.0.3-2 +- move desktop file to /etc/X11/applnk (#62399) + +* Sun Mar 24 2002 Jeremy Katz 1.0.3-1 - update to evolution 1.0.3 - change summary view to show a recent errata list by default