From 2dc2c624113cfbaa848faad90f2639e4ef1daf35 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:35:36 +0000 Subject: [PATCH] auto-import changelog data from evolution-1.0.8-5.src.rpm Tue Aug 06 2002 Than Ngo 1.0.8-5 - rebuild against new pilot-link-0.11.2 Thu Jul 18 2002 Jeremy Katz 1.0.8-4 - rebuild against new gnome-pilot Tue Jul 09 2002 Jeremy Katz 1.0.8-3 - remove static and libtool archives for importers and camel-providers (#68222) - do desktop-file-install magic - remove dead sites from summary list (#64522) - support openldap protocol version 3 based off of Nalin's autofs changes Mon Jul 08 2002 Jeremy Katz 1.0.8-2 - fix openldap-devel buildrequire --- evolution.spec | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/evolution.spec b/evolution.spec index 5c9731e..40e7de4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -15,7 +15,7 @@ ExcludeArch: ia64 alpha Name: evolution Version: 1.0.8 -Release: 0.7x +Release: 5 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -32,6 +32,8 @@ Patch5: evolution-1.0.3-unreadcount.patch # Red Hat Linux specific patches Patch10: evolution-1.0.1-dborder.patch Patch11: evolution-1.0.2-redhatify.patch +Patch12: evolution-1.0.8-killdeadsummary.patch +Patch13: evolution-1.0.8-nokdedesktopinstall.patch Patch20: evolution-ja-charset.patch @@ -39,6 +41,7 @@ Patch30: evolution-1.0.5-mozilla10.patch # submitted upstream Patch40: evolution-1.0.7-omffixes.patch +Patch50: evolution-1.0.8-ldapv3.diff Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -73,7 +76,7 @@ BuildRequires: pkgconfig BuildRequires: desktop-file-utils %if %{ldap_support} -BuildRequires: openldap >= 2.0.11 +BuildRequires: openldap-devel >= 2.0.11 %endif %if %{pilot_support} @@ -103,6 +106,8 @@ personal information-management tool. # Red Hat specific patches %patch10 -p0 -b .dborder %patch11 -p0 -b .rhatify +%patch12 -p0 -b .deadsites +%patch13 -p0 -b .nokde %patch20 -p0 -b .jacharset @@ -110,6 +115,8 @@ personal information-management tool. %patch40 -p1 -b .omf +%patch50 -p0 -b .ldapv3 + %build ## build our db 3.1.17 @@ -159,11 +166,23 @@ make cat /dev/null > default_user/local/Inbox/mbox %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall -# 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 +# remove static and libtool archives for importers and the like +find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; +find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; + +# vfolder desktop file install stuff +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ +desktop-file-install --vendor gnome --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Red-Hat-Extra \ + --add-category Network \ + --add-category Application \ + $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/evolution.desktop + +# evolution is the preferred email app +ln -sf ../desktop-menu-patches/redhat-email.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ %find_lang %name @@ -177,7 +196,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README -%{_sysconfdir}/X11/applnk/Applications/evolution.desktop +%{_datadir}/applications/* %{_datadir}/gnome/help/evolution %{_datadir}/gnome/ui/* %{_datadir}/gnome/html/* @@ -201,7 +220,22 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Jul 1 2002 Jeremy Katz 1.0.8-0.7x +* Tue Aug 6 2002 Than Ngo 1.0.8-5 +- rebuild against new pilot-link-0.11.2 + +* Thu Jul 18 2002 Jeremy Katz 1.0.8-4 +- rebuild against new gnome-pilot + +* Tue Jul 9 2002 Jeremy Katz 1.0.8-3 +- remove static and libtool archives for importers and camel-providers (#68222) +- do desktop-file-install magic +- remove dead sites from summary list (#64522) +- support openldap protocol version 3 based off of Nalin's autofs changes + +* Mon Jul 8 2002 Jeremy Katz 1.0.8-2 +- fix openldap-devel buildrequire + +* Mon Jul 1 2002 Jeremy Katz 1.0.8-1 - 1.0.8 * Thu Jun 27 2002 Jeremy Katz 1.0.7-2