- Clean up spec file, renumber patches.
- Add BuildRequires for dbus-glib-devel. - Rebuild to pick up new D-Bus.
This commit is contained in:
Matthew Barnes
parent
e1b66c3780
commit
ace8928930
202
evolution.spec
202
evolution.spec
@ -7,7 +7,8 @@
|
|||||||
%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
|
%define libgnomeprint22_version 2.8.0
|
||||||
%define dbus_version 0.31
|
%define dbus_version 0.90
|
||||||
|
%define dbus_glib_version 0.70
|
||||||
%define gnomevfs2_version 2.4
|
%define gnomevfs2_version 2.4
|
||||||
%define last_libgal2_version 2:2.5.3-2
|
%define last_libgal2_version 2:2.5.3-2
|
||||||
|
|
||||||
@ -47,7 +48,7 @@
|
|||||||
|
|
||||||
Name: evolution
|
Name: evolution
|
||||||
Version: 2.7.4
|
Version: 2.7.4
|
||||||
Release: 2
|
Release: 3
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: GNOME's next-generation groupware suite
|
Summary: GNOME's next-generation groupware suite
|
||||||
@ -57,96 +58,74 @@ Source: %{name}-%{version}.tar.bz2
|
|||||||
|
|
||||||
### Patches ###
|
### Patches ###
|
||||||
|
|
||||||
# Red Hat Linux specific patches
|
|
||||||
#Patch11: evolution-1.3.2-redhatify.patch
|
|
||||||
|
|
||||||
# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/
|
|
||||||
#Patch99: db3-dont-use-pthread.patch
|
|
||||||
# bad hack
|
# bad hack
|
||||||
Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
|
Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
|
||||||
|
|
||||||
# patches sent upstream
|
|
||||||
Patch100: evo-addressbook-print-with-pango-2.patch
|
|
||||||
|
|
||||||
#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
|
|
||||||
|
|
||||||
# Fix for RH bug #154360:
|
# Fix for RH bug #154360:
|
||||||
Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch
|
Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch
|
||||||
|
|
||||||
# Move autosave file
|
# Move autosave file
|
||||||
Patch107: evolution-2.5.4-move-autosave-file.patch
|
Patch12: evolution-2.5.4-move-autosave-file.patch
|
||||||
|
|
||||||
# Fix for RH bug 164957 (was for 145552):
|
# Fix for RH bug 164957 (was for 145552):
|
||||||
Patch109: evolution-2.0.2-fix-145552.patch
|
Patch13: evolution-2.0.2-fix-145552.patch
|
||||||
|
|
||||||
# Part of RH bug 170799:
|
# Part of RH bug 170799:
|
||||||
Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch
|
Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch
|
||||||
|
|
||||||
# not accepted, but proposed on a few occasions. fixes problems with
|
# Patches for conduits, based upon
|
||||||
# some cyrus servers
|
# rh-161817-attach-116019-conduit_pilot_link_updates.diff
|
||||||
#Patch200: evolution-1.4.5-imap-command-length.patch
|
# (the latter patch was originally by Mark G. Adams):
|
||||||
|
# Patch15: evolution-2.5.4-fix-conduits.patch
|
||||||
# this was rejected due to adding a dependency on DISPLAY for
|
|
||||||
# evolution-wombat but it does work to fix the problem
|
|
||||||
#Patch500: evolution-wombat-sm.patch
|
|
||||||
|
|
||||||
# This was added upstream in 1.5.93, with configure-time detection
|
|
||||||
#Patch700: evolution-1.5.9.1-filechooser.patch
|
|
||||||
|
|
||||||
# Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams):
|
|
||||||
# Patch800: evolution-2.5.4-fix-conduits.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.5.4-fix-conduit-dir.patch
|
Patch16: evolution-2.5.4-fix-conduit-dir.patch
|
||||||
|
|
||||||
# Remove gnome-common macros from configure.in.
|
# Remove gnome-common macros from configure.in.
|
||||||
# We do not ship gnome-common (or at least we're not supposed to).
|
# We do not ship gnome-common (or at least we're not supposed to).
|
||||||
Patch803: evolution-2.7.1-no-gnome-common.patch
|
Patch17: evolution-2.7.1-no-gnome-common.patch
|
||||||
|
|
||||||
Patch804: evolution-2.4.1-fix-missing-declarations.patch
|
Patch18: evolution-2.4.1-fix-missing-declarations.patch
|
||||||
Patch805: evolution-2.5.4-fix-missing-declarations.patch
|
Patch19: evolution-2.5.4-fix-missing-declarations.patch
|
||||||
Patch806: evolution-2.7.1-notification-cleanups.patch
|
Patch20: evolution-2.7.1-notification-cleanups.patch
|
||||||
Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
|
Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
|
||||||
Patch809: evolution-2.6.0-prototypes.patch
|
Patch22: evolution-2.6.0-prototypes.patch
|
||||||
|
|
||||||
# Patch to remove preedit buffer replication problem -- removed after as it was added without being confirmed.
|
|
||||||
# Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch
|
|
||||||
|
|
||||||
# Gnome.org #343331
|
# Gnome.org #343331
|
||||||
Patch900: evolution-2.7.2.1-quit-resize-crash.patch
|
Patch23: evolution-2.7.2.1-quit-resize-crash.patch
|
||||||
|
|
||||||
# RH bug #157400 / Gnome.org bug #303877
|
# RH bug #157400 / Gnome.org bug #303877
|
||||||
Patch901: evolution-2.7.4-candidate-window-position-task.patch
|
Patch24: evolution-2.7.4-candidate-window-position-task.patch
|
||||||
|
|
||||||
# RH bug #157505 / Gnome.org bug #303878
|
# RH bug #157505 / Gnome.org bug #303878
|
||||||
Patch902: evolution-2.7.4-candidate-window-position-calendar.patch
|
Patch25: evolution-2.7.4-candidate-window-position-calendar.patch
|
||||||
|
|
||||||
# RH bug #190359 / Gnome.org bug #211058
|
# RH bug #190359 / Gnome.org bug #211058
|
||||||
Patch903: evolution-2.7.3-filter-datespec.patch
|
Patch26: evolution-2.7.3-filter-datespec.patch
|
||||||
|
|
||||||
# RH bug #166231 / Gnome.org bug #264485
|
# RH bug #166231 / Gnome.org bug #264485
|
||||||
Patch904: evolution-2.7.3-replicated-cjk-input.patch
|
Patch27: evolution-2.7.3-replicated-cjk-input.patch
|
||||||
|
|
||||||
# RH bug #197834 / Gnome.org bug #346797
|
# RH bug #197834 / Gnome.org bug #346797
|
||||||
Patch905: evolution-2.7.3-submit-bug-report.patch
|
Patch28: evolution-2.7.3-submit-bug-report.patch
|
||||||
|
|
||||||
### Dependencies ###
|
### Dependencies ###
|
||||||
|
|
||||||
Requires: scrollkeeper >= 0.1.4
|
Requires: ORBit2 >= %{orbit2_version}
|
||||||
Requires: ORBit2 >= 2.7.5
|
Requires: ORBit2 >= 2.7.5
|
||||||
Requires: libsoup >= %{soup_version}
|
Requires: dbus >= %{dbus_version}
|
||||||
Requires: evolution-data-server >= %{eds_version}
|
Requires: evolution-data-server >= %{eds_version}
|
||||||
|
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
||||||
Requires: gnome-spell >= 1.0.2
|
Requires: gnome-spell >= 1.0.2
|
||||||
|
Requires: gnome-vfs2 >= %{gnomevfs2_version}
|
||||||
|
Requires: gnutls
|
||||||
Requires: gtk2 >= 2.4.0
|
Requires: gtk2 >= 2.4.0
|
||||||
Requires: libbonoboui >= %{libbonoboui_version}
|
Requires: libbonoboui >= %{libbonoboui_version}
|
||||||
Requires: ORBit2 >= %{orbit2_version}
|
|
||||||
Requires: spamassassin
|
|
||||||
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
|
||||||
Requires: redhat-menus >= %{redhat_menus_version}
|
|
||||||
Requires: gnutls
|
|
||||||
Requires: dbus >= %{dbus_version}
|
|
||||||
Requires: libgnomeprint22 >= %{libgnomeprint22_version}
|
Requires: libgnomeprint22 >= %{libgnomeprint22_version}
|
||||||
Requires: gnome-vfs2 >= %{gnomevfs2_version}
|
Requires: libsoup >= %{soup_version}
|
||||||
|
Requires: redhat-menus >= %{redhat_menus_version}
|
||||||
|
Requires: scrollkeeper >= 0.1.4
|
||||||
|
Requires: spamassassin
|
||||||
|
|
||||||
%if %{libnotify_support}
|
%if %{libnotify_support}
|
||||||
Requires: libnotify >= 0.4
|
Requires: libnotify >= 0.4
|
||||||
@ -156,31 +135,33 @@ Obsoletes: libgal2 <= %{last_libgal2_version}
|
|||||||
|
|
||||||
### Build Dependencies ###
|
### Build Dependencies ###
|
||||||
|
|
||||||
# Require specific versions of GNU Autotools packages,
|
|
||||||
# since we rerun them during the build phase.
|
|
||||||
BuildRequires: autoconf >= 2.59
|
|
||||||
BuildRequires: automake >= 1.9
|
|
||||||
BuildRequires: intltool >= 0.35
|
|
||||||
BuildRequires: libtool >= 1.5
|
|
||||||
|
|
||||||
BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
|
|
||||||
BuildRequires: libsoup-devel >= %{soup_version}
|
|
||||||
BuildRequires: evolution-data-server-devel >= %{eds_version}
|
|
||||||
BuildRequires: libbonobo-devel >= 2.0
|
|
||||||
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
|
|
||||||
BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
|
|
||||||
BuildRequires: libgnomeui-devel >= 2.0
|
|
||||||
BuildRequires: libgnomecanvas-devel >= 2.0
|
|
||||||
BuildRequires: libxml2-devel
|
|
||||||
BuildRequires: GConf2-devel
|
BuildRequires: GConf2-devel
|
||||||
BuildRequires: intltool
|
|
||||||
BuildRequires: ORBit2-devel >= %{orbit2_version}
|
BuildRequires: ORBit2-devel >= %{orbit2_version}
|
||||||
BuildRequires: atk-devel
|
BuildRequires: atk-devel
|
||||||
# kind of silly...
|
BuildRequires: autoconf >= 2.59
|
||||||
BuildRequires: flex bison byacc libtool gettext
|
BuildRequires: automake >= 1.9
|
||||||
BuildRequires: gnutls-devel
|
BuildRequires: bison
|
||||||
|
BuildRequires: byacc
|
||||||
BuildRequires: dbus-devel >= %{dbus_version}
|
BuildRequires: dbus-devel >= %{dbus_version}
|
||||||
|
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
||||||
|
BuildRequires: desktop-file-utils
|
||||||
|
BuildRequires: evolution-data-server-devel >= %{eds_version}
|
||||||
|
BuildRequires: flex
|
||||||
|
BuildRequires: gettext
|
||||||
|
BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
|
||||||
|
BuildRequires: gnutls-devel
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
|
BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
|
||||||
|
BuildRequires: intltool >= 0.35
|
||||||
|
BuildRequires: libbonobo-devel >= 2.0
|
||||||
|
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
|
||||||
|
BuildRequires: libgnomecanvas-devel >= 2.0
|
||||||
|
BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
|
||||||
|
BuildRequires: libgnomeui-devel >= 2.0
|
||||||
|
BuildRequires: libsoup-devel >= %{soup_version}
|
||||||
|
BuildRequires: libtool >= 1.5
|
||||||
|
BuildRequires: libxml2-devel
|
||||||
|
BuildRequires: pkgconfig
|
||||||
|
|
||||||
%if %{use_mozilla_nss}
|
%if %{use_mozilla_nss}
|
||||||
BuildRequires: nspr-devel
|
BuildRequires: nspr-devel
|
||||||
@ -189,10 +170,6 @@ BuildRequires: nss-devel
|
|||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRequires: pkgconfig
|
|
||||||
BuildRequires: desktop-file-utils
|
|
||||||
BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
|
|
||||||
|
|
||||||
%if %{inline_audio_support}
|
%if %{inline_audio_support}
|
||||||
# audio-inline plugin requires gstreamer to build:
|
# audio-inline plugin requires gstreamer to build:
|
||||||
BuildRequires: gstreamer08-devel
|
BuildRequires: gstreamer08-devel
|
||||||
@ -244,49 +221,25 @@ Development files needed for building things which link against evolution.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
# these are in CVS already on the 1-4-branch
|
%patch10 -p1 -b .ldaphack
|
||||||
|
%patch11 -p1 -b .commit-enter-on-calendar
|
||||||
# these are in CVS already on the gnome-2-8 branch
|
%patch12 -p1 -b .move-autosave-file
|
||||||
|
%patch13 -p1 -b .fix-164957
|
||||||
# Red Hat specific patches
|
%patch14 -p1 -b .hide-switcher-buttons-by-default
|
||||||
#patch11 -p1 -b .rhatify
|
#patch15 -p1 -b .fix-conduits
|
||||||
|
%patch16 -p1 -b .fix-conduit-dir
|
||||||
#patch99 -p1 -b .db3pthread
|
%patch17 -p1 -b .no-gnome-common
|
||||||
|
%patch18 -p1 -b .fix-missing-declarations
|
||||||
%patch98 -p1 -b .ldaphack
|
%patch19 -p1 -b .fix-missing-declarations-2-5-4
|
||||||
|
%patch20 -p1 -b .notification-cleanups
|
||||||
# patches sent upstream
|
%patch21 -p1 -b .fix-missing-declarations-2.5.5.1
|
||||||
#%patch100 -p0 -b .addressbook-print-with-pango
|
%patch22 -p1 -b .prototypes
|
||||||
#%patch101 -p1 -b .calendar-print-with-pango
|
%patch23 -p1 -b .quit-resize-crash
|
||||||
|
%patch24 -p1 -b .candidate-window-position-task
|
||||||
%patch106 -p1 -b .commit-enter-on-calendar
|
%patch25 -p1 -b .candidate-window-position-calendar
|
||||||
%patch107 -p1 -b .move-autosave-file
|
%patch26 -p1 -b .filter-datespec
|
||||||
%patch109 -p1 -b .fix-164957
|
%patch27 -p1 -b .replicated-cjk-input
|
||||||
|
%patch28 -p1 -b .submit-bug-report
|
||||||
%patch110 -p1 -b .hide-switcher-buttons-by-default
|
|
||||||
|
|
||||||
#patch200 -p1 -b .commandlength
|
|
||||||
|
|
||||||
#patch500 -p0 -b .wombatsm
|
|
||||||
|
|
||||||
#patch700 -p1 -b .filechooser
|
|
||||||
|
|
||||||
# %patch800 -p1 -b .fix-conduits
|
|
||||||
%patch802 -p1 -b .fix-conduit-dir
|
|
||||||
%patch803 -p1 -b .no-gnome-common
|
|
||||||
%patch804 -p1 -b .fix-missing-declarations
|
|
||||||
%patch805 -p1 -b .fix-missing-declarations-2-5-4
|
|
||||||
%patch806 -p1 -b .notification-cleanups
|
|
||||||
%patch808 -p1 -b .fix-missing-declarations-2.5.5.1
|
|
||||||
%patch809 -p1 -b .prototypes
|
|
||||||
# %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain@redhat.com
|
|
||||||
|
|
||||||
%patch900 -p1 -b .quit-resize-crash
|
|
||||||
%patch901 -p1 -b .candidate-window-position-task
|
|
||||||
%patch902 -p1 -b .candidate-window-position-calendar
|
|
||||||
%patch903 -p1 -b .filter-datespec
|
|
||||||
%patch904 -p1 -b .replicated-cjk-input
|
|
||||||
%patch905 -p1 -b .submit-bug-report
|
|
||||||
|
|
||||||
mkdir -p krb5-fakeprefix/include
|
mkdir -p krb5-fakeprefix/include
|
||||||
mkdir -p krb5-fakeprefix/lib
|
mkdir -p krb5-fakeprefix/lib
|
||||||
@ -677,6 +630,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/evolution/%{evo_major}/libmenus.so
|
%{_libdir}/evolution/%{evo_major}/libmenus.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 18 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.4-3
|
||||||
|
- Clean up spec file, renumber patches.
|
||||||
|
- Add BuildRequires for dbus-glib-devel.
|
||||||
|
- Rebuild to pick up new D-Bus.
|
||||||
|
|
||||||
* Thu Jul 13 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.4-2
|
* Thu Jul 13 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.4-2
|
||||||
- Update patch for RH bug #157400.
|
- Update patch for RH bug #157400.
|
||||||
- Update patch for RH bug #157505.
|
- Update patch for RH bug #157505.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user