rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- 2.3.5.1

Browse Source 
- Update evo_major from 2.2 to 2.4
- Updated evo-calendar-print-with-pango- patch from version 4 to 5
- Removed Patch105: evolution-2.2.2-fix-new-mail-notify.patch as
    configure.in in this branch tests for existance for dbus-glib-1, rather
    than max-version.
- Removed Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch
    as this is now in upstream tarball.
- Removed evolution-calendar-importers and evolution-addressbook-importers
    directories.
- Updated evolution-2.2.2-no-gnome-common.patch to include a patch to
    rename mozilla-nspr to nspr
This commit is contained in:
dmalcolm 2005-07-26 02:11:39 +00:00
parent c58914c517
commit e84c196b9e
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-2.2.2.tar.bz2 evolution-2.3.5.1.tar.bz2

30
evolution.spec
View File

@ -6,7 +6,7 @@ ExcludeArch: ppc64
%define soup_version 2.2.2 %define soup_version 2.2.2
%define eds_version 1.2.2 %define eds_version 1.2.2
%define use_mozilla_nss 1 %define use_mozilla_nss 1
%define evo_major 2.2 %define evo_major 2.4
%define libbonoboui_version 2.4.2 %define libbonoboui_version 2.4.2
%define orbit2_version 2.9.8 %define orbit2_version 2.9.8
%define gnome_icon_theme_version 1.3.6 %define gnome_icon_theme_version 1.3.6
@ -27,8 +27,8 @@ ExcludeArch: ppc64
%define nntp_support 1 %define nntp_support 1
Name: evolution Name: evolution
Version: 2.2.2 Version: 2.3.5.1
Release: 11.fc5 Release: 1
License: GPL License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/ URL: http://www.ximian.com/
@ -46,12 +46,10 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
# patches sent upstream # patches sent upstream
Patch100: evo-addressbook-print-with-pango-2.patch Patch100: evo-addressbook-print-with-pango-2.patch
Patch101: evo-calendar-print-with-pango-4.patch Patch101: evo-calendar-print-with-pango-5.patch
#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch #Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
Patch105: evolution-2.2.2-fix-new-mail-notify.patch
# Fix for RH bug #154360: # Fix for RH bug #154360:
Patch106: evolution-2.2.2-commit-enter-on-calendar.patch Patch106: evolution-2.2.2-commit-enter-on-calendar.patch
@ -71,7 +69,6 @@ Patch107: evolution-2.2.2-move-autosave-file.patch
# Patches for conduits by Mark G. Adams: # Patches for conduits by Mark G. Adams:
Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff
Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch
# Move .conduit files from share to lib (for the sake of multilib) # Move .conduit files from share to lib (for the sake of multilib)
Patch802: evolution-2.2.2-fix-conduit-dir.patch Patch802: evolution-2.2.2-fix-conduit-dir.patch
@ -183,7 +180,6 @@ Development files needed for building things which link against evolution.
%patch100 -p0 -b .addressbook-print-with-pango %patch100 -p0 -b .addressbook-print-with-pango
%patch101 -p1 -b .calendar-print-with-pango %patch101 -p1 -b .calendar-print-with-pango
%patch105 -p1 -b .fix-new-mail-notify
%patch106 -p1 -b .commit-enter-on-calendar %patch106 -p1 -b .commit-enter-on-calendar
%patch107 -p1 -b .move-autosave-file %patch107 -p1 -b .move-autosave-file
@ -194,7 +190,6 @@ Development files needed for building things which link against evolution.
#patch700 -p1 -b .filechooser #patch700 -p1 -b .filechooser
%patch800 -p0 -b .fix-conduits %patch800 -p0 -b .fix-conduits
%patch801 -p0 -b .fix-evo-conduit-memleaks
%patch802 -p1 -b .fix-conduit-dir %patch802 -p1 -b .fix-conduit-dir
%patch803 -p1 -b .no-gnome-common %patch803 -p1 -b .no-gnome-common
@ -332,10 +327,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/evolution/%{evo_major} %dir %{_libdir}/evolution/%{evo_major}
%dir %{_libdir}/evolution/%{evo_major}/components %dir %{_libdir}/evolution/%{evo_major}/components
%dir %{_libdir}/evolution/%{evo_major}/components/*.so %dir %{_libdir}/evolution/%{evo_major}/components/*.so
%dir %{_libdir}/evolution/%{evo_major}/evolution-calendar-importers
%dir %{_libdir}/evolution/%{evo_major}/evolution-calendar-importers/*.so
%dir %{_libdir}/evolution/%{evo_major}/evolution-addressbook-importers/
%{_libdir}/evolution/%{evo_major}/evolution-addressbook-importers/*.so
%{_libdir}/evolution/%{evo_major}/*.so.* %{_libdir}/evolution/%{evo_major}/*.so.*
%{_libdir}/evolution/%{evo_major}/plugins/*.eplug %{_libdir}/evolution/%{evo_major}/plugins/*.eplug
%{_libdir}/evolution/%{evo_major}/plugins/*.so %{_libdir}/evolution/%{evo_major}/plugins/*.so
@ -356,6 +347,19 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/*.so %{_libdir}/evolution/%{evo_major}/*.so
%changelog %changelog
* Mon Jul 25 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.5.1-1
- 2.3.5.1
- Update evo_major from 2.2 to 2.4
- Updated evo-calendar-print-with-pango- patch from version 4 to 5
- Removed Patch105: evolution-2.2.2-fix-new-mail-notify.patch as configure.in
in this branch tests for existance for dbus-glib-1, rather than max-version.
- Removed Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch as
this is now in upstream tarball.
- Removed evolution-calendar-importers and evolution-addressbook-importers
directories.
- Updated evolution-2.2.2-no-gnome-common.patch to include a patch to rename
mozilla-nspr to nspr
* Tue Jun 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-11.fc5 * Tue Jun 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-11.fc5
- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803) - Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803)

2
sources
View File

@ -1 +1 @@
9b49942c8bdd1dc21f2d28792b12f400 evolution-2.2.2.tar.bz2 2271c695677a8bf8c3c96ec883a05d12 evolution-2.3.5.1.tar.bz2