- Introduce macro for gnome-pilot dependency, bumping from 2.0.6 to 2.0.13
- Add obsoletion of libgal2/libgal2-devel (dependency was removed in 2.3.6-1); based on the last EVR of the libgal2 package in CVS, 2:2.5.3-2
This commit is contained in:
parent
519aab5716
commit
ad7b2e31ee
@ -12,8 +12,10 @@ ExcludeArch: ppc64
|
|||||||
%define libgnomeprint22_version 2.8.0
|
%define libgnomeprint22_version 2.8.0
|
||||||
%define dbus_version 0.31
|
%define dbus_version 0.31
|
||||||
%define gnomevfs2_version 2.4
|
%define gnomevfs2_version 2.4
|
||||||
|
%define last_libgal2_version 2:2.5.3-2
|
||||||
|
|
||||||
%define pilot_link_version 0.12.0
|
%define pilot_link_version 0.12.0
|
||||||
|
%define gnome_pilot_version 2.0.13
|
||||||
|
|
||||||
%define ldap_support 1
|
%define ldap_support 1
|
||||||
%define krb5_support 1
|
%define krb5_support 1
|
||||||
@ -27,7 +29,7 @@ ExcludeArch: ppc64
|
|||||||
|
|
||||||
Name: evolution
|
Name: evolution
|
||||||
Version: 2.3.7
|
Version: 2.3.7
|
||||||
Release: 2
|
Release: 3
|
||||||
License: GPL
|
License: GPL
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||||
URL: http://www.ximian.com/
|
URL: http://www.ximian.com/
|
||||||
@ -100,6 +102,8 @@ Requires: dbus >= %{dbus_version}
|
|||||||
Requires: libgnomeprint22 >= %{libgnomeprint22_version}
|
Requires: libgnomeprint22 >= %{libgnomeprint22_version}
|
||||||
Requires: gnome-vfs2 >= %{gnomevfs2_version}
|
Requires: gnome-vfs2 >= %{gnomevfs2_version}
|
||||||
|
|
||||||
|
Obsoletes: libgal2 <= %{last_libgal2_version}
|
||||||
|
|
||||||
BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
|
BuildRequires: gtkhtml3-devel >= %{gtkhtml_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}
|
||||||
@ -135,11 +139,11 @@ BuildRequires: openldap-devel >= 2.0.11
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{pilot_support}
|
%if %{pilot_support}
|
||||||
BuildRequires: gnome-pilot-devel >= 2.0.6
|
BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
|
||||||
# bleah, gnome-pilot really sucks this in, but then I have to have an explicit
|
# bleah, gnome-pilot really sucks this in, but then I have to have an explicit
|
||||||
# versioning for gnome-pilot when it changes less than pilot-link itself
|
# versioning for gnome-pilot when it changes less than pilot-link itself
|
||||||
BuildRequires: pilot-link-devel >= %{pilot_link_version}
|
BuildRequires: pilot-link-devel >= %{pilot_link_version}
|
||||||
Requires: gnome-pilot >= 2.0.6
|
Requires: gnome-pilot >= %{gnome_pilot_version}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{krb5_support}
|
%if %{krb5_support}
|
||||||
@ -161,6 +165,7 @@ Group: Development/Libraries
|
|||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
Requires: gtkhtml3-devel >= %{gtkhtml_version}
|
Requires: gtkhtml3-devel >= %{gtkhtml_version}
|
||||||
Requires: libsoup-devel >= %{soup_version}
|
Requires: libsoup-devel >= %{soup_version}
|
||||||
|
Obsoletes: libgal2-devel <= %{last_libgal2_version}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Development files needed for building things which link against evolution.
|
Development files needed for building things which link against evolution.
|
||||||
@ -353,6 +358,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/evolution/%{evo_major}/*.so
|
%{_libdir}/evolution/%{evo_major}/*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 16 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.7-3
|
||||||
|
- Introduce macro for gnome-pilot dependency, bumping from 2.0.6 to 2.0.13
|
||||||
|
- Add obsoletion of libgal2/libgal2-devel (dependency was removed in 2.3.6-1);
|
||||||
|
based on the last EVR of the libgal2 package in CVS, 2:2.5.3-2
|
||||||
|
|
||||||
* Mon Aug 15 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.7-2
|
* Mon Aug 15 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.7-2
|
||||||
- rebuild
|
- rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user