- Require specific versions of GNU Autotools packages for building.

- Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain).
- Various spec file cleanups.
- Pick up new libnotify.
This commit is contained in:
Matthew Barnes 2006-05-23 17:42:15 +00:00
parent 645f42f9df
commit 2ec93646eb

View File

@ -37,15 +37,19 @@
%define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
### Description ###
Name: evolution
Version: 2.7.2.1
Release: 1
Release: 2
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
URL: http://www.gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source: %{name}-%{version}.tar.bz2
# patches pulled from upstream CVS
### Patches ###
# Red Hat Linux specific patches
#Patch11: evolution-1.3.2-redhatify.patch
@ -93,7 +97,8 @@ Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch
# Move .conduit files from share to lib (for the sake of multilib)
Patch802: evolution-2.5.4-fix-conduit-dir.patch
# Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools):
# Remove gnome-common macros from configure.in.
# We do not ship gnome-common (or at least we're not supposed to).
Patch803: evolution-2.7.1-no-gnome-common.patch
Patch804: evolution-2.4.1-fix-missing-declarations.patch
@ -105,8 +110,7 @@ Patch809: evolution-2.6.0-prototypes.patch
# Patch to remove preedit buffer replication problem
Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch
Summary: GNOME's next-generation groupware suite
Group: Applications/Productivity
### Dependencies ###
Requires: scrollkeeper >= 0.1.4
Requires: ORBit2 >= 2.7.5
@ -130,6 +134,15 @@ Requires: libnotify
Obsoletes: libgal2 <= %{last_libgal2_version}
### 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}
@ -199,8 +212,8 @@ be tightly integrated with one another and act as a seamless
personal information-management tool.
%package devel
Summary: Development files for building against evolution
Group: Development/Libraries
Summary: Development files for building against evolution
Requires: %{name} = %{version}
Requires: gtkhtml3-devel >= %{gtkhtml_version}
Requires: libsoup-devel >= %{soup_version}
@ -249,6 +262,7 @@ cd ../..
%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
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -308,7 +322,7 @@ if pkg-config openssl ; then
fi
%endif
# Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths):
# Rerun the GNU Autotools since we patched some of the input files.
aclocal
autoheader
automake
@ -316,9 +330,8 @@ libtoolize
intltoolize --force
autoconf
# Configuration:
%configure \
--enable-gtk-doc=yes \
--enable-gtk-doc \
--enable-ipv6 \
--enable-file-locking=fcntl --enable-dot-locking=no \
--with-sub-version=" (%{version}-%{release})" \
@ -335,8 +348,6 @@ make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit
make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED"
%endif
#cat /dev/null > default_user/local/Inbox/mbox
%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@ -364,10 +375,14 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
# evolution is the preferred email app
ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop \
$RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop \
$RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop \
$RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop \
$RPM_BUILD_ROOT/%{_datadir}/applications/
# remove upstream desktop file; use the symlinks from above (#103826)
rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop
@ -638,6 +653,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
* Fri May 19 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.2.1-2
- Require specific versions of GNU Autotools packages for building.
- Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain).
- Various spec file cleanups.
- Pick up new libnotify.
* Wed May 17 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.2.1-1
- Update to 2.7.2.1
- Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch