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

- Update from upstream unstable 2.1.6 to 2.1.6

Browse Source 
- Added patches to fix calendar and addressbook printing for non-Roman
    scripts (#138075)
- Added explicit requirement on libgnomeprint22 >= 2.8.0
- Added BuildRequires: gtk-doc
- Updated requirements:
gtkhtml3 from 3.5.6 to 3.5.7
libgal2 from 2.3.4 to 2.3.5
eds from 1.1.5 to 1.1.6
This commit is contained in:
dmalcolm 2005-03-02 00:03:04 +00:00
parent 71eac6b70e
commit a56e79ae8a
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-2.1.5.tar.bz2 evolution-2.1.6.tar.bz2

32
evolution.spec
View File

@ -1,15 +1,16 @@
# no ppc64 mozilla # no ppc64 mozilla
ExcludeArch: ppc64 ExcludeArch: ppc64
%define gal_version 2:2.3.4 %define gal_version 2:2.3.5
%define gtkhtml_version 3.5.6 %define gtkhtml_version 3.5.7
%define soup_version 2.2.2 %define soup_version 2.2.2
%define eds_version 1.1.5 %define eds_version 1.1.6
%define use_mozilla_nss 1 %define use_mozilla_nss 1
%define evo_major 2.2 %define evo_major 2.2
%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
%define libgnomeprint22_version 2.8.0
%if %{use_mozilla_nss} %if %{use_mozilla_nss}
%define mozilla_version 1.7.5 %define mozilla_version 1.7.5
@ -27,7 +28,7 @@ ExcludeArch: ppc64
%define nntp_support 1 %define nntp_support 1
Name: evolution Name: evolution
Version: 2.1.5 Version: 2.1.6
Release: 1 Release: 1
License: GPL License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -45,6 +46,8 @@ Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.1/%{name}-%{ve
Patch98: evolution-1.4.4-ldap-x86_64-hack.patch Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
# patches sent upstream # patches sent upstream
Patch100: evo-addressbook-print-with-pango-2.patch
Patch101: evo-calendar-print-with-pango-4.patch
# not accepted, but proposed on a few occasions. fixes problems with # not accepted, but proposed on a few occasions. fixes problems with
# some cyrus servers # some cyrus servers
@ -80,11 +83,12 @@ Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
Requires: redhat-menus >= 1.13 Requires: redhat-menus >= 1.13
Requires: gnutls Requires: gnutls
Requires: dbus Requires: dbus
Requires: libgnomeprint22 >= %{libgnomeprint22_version}
#BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
#BuildRequires: libgal2-devel >= %{gal_version} BuildRequires: libgal2-devel >= %{gal_version}
BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libsoup-devel >= %{soup_version}
#BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: evolution-data-server-devel >= %{eds_version}
BuildRequires: libbonobo-devel >= 2.0 BuildRequires: libbonobo-devel >= 2.0
BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: gnome-vfs2-devel >= 2.0 BuildRequires: gnome-vfs2-devel >= 2.0
@ -99,6 +103,7 @@ BuildRequires: atk-devel
BuildRequires: flex bison byacc libtool gettext BuildRequires: flex bison byacc libtool gettext
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: dbus-devel BuildRequires: dbus-devel
BuildRequires: gtk-doc
%if %{use_mozilla_nss} %if %{use_mozilla_nss}
BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_version} BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_version}
@ -109,6 +114,7 @@ BuildRequires: openssl-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
%if %{ldap_support} %if %{ldap_support}
BuildRequires: openldap-devel >= 2.0.11 BuildRequires: openldap-devel >= 2.0.11
@ -160,6 +166,8 @@ Development files needed for building things which link against evolution.
%patch98 -p1 -b .ldaphack %patch98 -p1 -b .ldaphack
# patches sent upstream # patches sent upstream
%patch100 -p0 -b .addressbook-print-with-pango
%patch101 -p0 -b .calendar-print-with-pango
#patch200 -p1 -b .commandlength #patch200 -p1 -b .commandlength
@ -319,6 +327,16 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/*/*.a %{_libdir}/evolution/%{evo_major}/*/*.a
%changelog %changelog
* Tue Mar 1 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.6-1
- Update from upstream unstable 2.1.6 to 2.1.6
- Added patches to fix calendar and addressbook printing for non-Roman scripts (#138075)
- Added explicit requirement on libgnomeprint22 >= 2.8.0
- Added BuildRequires: gtk-doc
- Updated requirements:
* gtkhtml3 from 3.5.6 to 3.5.7
* libgal2 from 2.3.4 to 2.3.5
* eds from 1.1.5 to 1.1.6
* Wed Feb 9 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.5-1 * Wed Feb 9 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.5-1
- Update from upstream unstable 2.1.4 to 2.1.5 - Update from upstream unstable 2.1.4 to 2.1.5
- Updated requirements: - Updated requirements:

2
sources
View File

@ -1 +1 @@
66cac9d9a156660484408da4e6ec3d04 evolution-2.1.5.tar.bz2 94f0e9d4486c86107033cd9cf24ef7e4 evolution-2.1.6.tar.bz2