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

- Update to 2.9.92.

Browse Source 
- Remove patch for GNOME bug #350253 (fixed upstream).
- Remove patch for GNOME bug #356177 (fixed upstream).
- Remove patch for GNOME bug #360946 (fixed upstream).
- Remove evolution-2.5.4-move-autosave-file.patch (fixed upstream).
- Add minimum version to intltool requirement (currently >= 0.35.5).
This commit is contained in:
Matthew Barnes 2007-02-26 21:28:52 +00:00
parent 537d207aa8
commit 90663583c7
3 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.cvsignore
View File

@ -1,6 +1 @@
evolution-2.9.91.tar.bz2
evolution.svg
evolution32.png
evolution24.png
evolution22.png
evolution16.png
evolution-2.9.92.tar.bz2

46
evolution.spec
View File

@ -7,6 +7,7 @@
%define gnome_pilot_version 2.0.13
%define gnomevfs2_version 2.4
%define gtkhtml_version 3.13.6
%define intltool_version 0.35.5
%define last_libgal2_version 2:2.5.3-2
%define libbonoboui_version 2.4.2
%define libgnomeprint22_version 2.8.0
@ -44,19 +45,14 @@
### Abstract ###
Name: evolution
Version: 2.9.91
Release: 3%{?dist}
Version: 2.9.92
Release: 1%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
URL: http://www.gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source: evolution-%{version}.tar.bz2
Source1: evolution16.png
Source2: evolution22.png
Source3: evolution24.png
Source4: evolution32.png
Source5: evolution.svg
### Patches ###
@ -66,9 +62,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
# Fix for RH bug #154360:
Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch
# Move autosave file
Patch12: evolution-2.5.4-move-autosave-file.patch
# Fix for RH bug 164957 (was for 145552):
Patch13: evolution-2.0.2-fix-145552.patch
@ -113,15 +106,9 @@ Patch25: evolution-2.7.92-fix-prgname.patch
# RH bug #161885 / GNOME bug #309166
Patch26: evolution-2.8.0-indic-cursor-movement.patch
# GNOME bug #356177
Patch27: evolution-2.8.0-kill-emutex.patch
# RH bug #202751 / GNOME bug #355766
Patch29: evolution-2.8.0-fix-indic-printing.patch
# GNOME bug #360946
Patch30: evolution-2.8.1-about-dialog.patch
# GNOME bug #362638
Patch31: evolution-2.8.1-kill-ethread.patch
@ -140,9 +127,6 @@ Patch35: evolution-2.9.2-gtk-font-button.patch
# RH bug #216537 / GNOME bug #383047
#Patch36: evolution-2.9.3-view-attachment-uri.patch
# GNOME bug #350253
Patch37: evolution-2.9.3-adopt-icons.patch
# RH bug #215478 / GNOME bug #383842
Patch38: evolution-2.9.3-source-path-entry.patch
@ -204,7 +188,7 @@ BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
BuildRequires: gnutls-devel
BuildRequires: gtk-doc
BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
BuildRequires: intltool >= 0.35
BuildRequires: intltool >= %{intltool_version}
BuildRequires: libbonobo-devel >= 2.0
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libgnomecanvas-devel >= 2.0
@ -276,7 +260,6 @@ Development files needed for building things which link against evolution.
%setup -q -n evolution-%{version}
%patch10 -p1 -b .ldaphack
%patch11 -p1 -b .commit-enter-on-calendar
%patch12 -p1 -b .move-autosave-file
%patch13 -p1 -b .fix-164957
%patch14 -p1 -b .hide-switcher-buttons-by-default
#patch15 -p1 -b .fix-conduits # leave commented
@ -291,16 +274,13 @@ Development files needed for building things which link against evolution.
%patch24 -p1 -b .deleting-preedit-buffer
%patch25 -p1 -b .fix-prgname
%patch26 -p1 -b .indic-cursor-movement
%patch27 -p1 -b .kill-emutex
%patch29 -p1 -b .fix-indic-printing
%patch30 -p1 -b .about-dialog
%patch31 -p1 -b .kill-ethread
%patch32 -p1 -b .kill-ememory
%patch33 -p1 -b .im-context-reset
%patch34 -p1 -b .first-ascii
%patch35 -p1 -b .gtk-font-button
#%patch36 -p1 -b .view-attachment-uri
%patch37 -p1 -b .adopt-icons
%patch38 -p1 -b .source-path-entry
%patch39 -p1 -b .unread-messages
%patch40 -p1 -b .meeting-list-view
@ -311,16 +291,6 @@ mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
mkdir -p krb5-fakeprefix/%{_lib}
# GNOME bug #350253
cd art
mkdir 16x16; cp %{SOURCE1} 16x16/evolution.png
mkdir 22x22; cp %{SOURCE2} 22x22/evolution.png
mkdir 24x24; cp %{SOURCE3} 24x24/evolution.png
mkdir 32x32; cp %{SOURCE4} 32x32/evolution.png
mkdir scalable; cp %{SOURCE5} scalable/evolution.svg
rm about-box.png bcg.png evolution.png monkey-16.png
cd -
%build
# define all of our flags, this is kind of ugly :(
%if %{ldap_support}
@ -725,6 +695,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
* Mon Feb 26 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.92-1.fc7
- Update to 2.9.92.
- Remove patch for GNOME bug #350253 (fixed upstream).
- Remove patch for GNOME bug #356177 (fixed upstream).
- Remove patch for GNOME bug #360946 (fixed upstream).
- Remove evolution-2.5.4-move-autosave-file.patch (fixed upstream).
- Add minimum version to intltool requirement (currently >= 0.35.5).
* Thu Feb 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.91-3.fc7
- Revise patch for GNOME bug #362638 to fix RH bug #220714
(certificate prompt causes crash).

7
sources
View File

@ -1,6 +1 @@
b019ce7645491f77f9b2d4492a77ae00 evolution-2.9.91.tar.bz2
e85874e8d480a9c82bc155da396a54e4 evolution.svg
2fa4ce12c94153aca9af465e1a1819c8 evolution32.png
d33896d33b5db2201e051664e96b1100 evolution24.png
de663fa442d61f53dc058dd20c77da8e evolution22.png
4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png
9f7af45a4f37d05a151d4573133bfd55 evolution-2.9.92.tar.bz2