auto-import evolution-1.5.7-3 from evolution-1.5.7-3.src.rpm
This commit is contained in:
cvsdist
parent
d42e602fea
commit
d688328a62
@ -1,2 +1 @@
|
|||||||
db-3.1.17.tar.bz2
|
evolution-1.5.7.tar.bz2
|
||||||
evolution-1.4.6.tar.gz
|
|
||||||
|
|||||||
199
evolution.spec
199
evolution.spec
@ -1,10 +1,15 @@
|
|||||||
%define gal_version 2:1.99.11
|
# no ppc64 mozilla
|
||||||
%define gtkhtml_version 3.0.10
|
ExcludeArch: ppc64
|
||||||
%define soup_version 1.99.26
|
|
||||||
%define use_mozilla_nss 0
|
%define gal_version 2:2.1.8
|
||||||
|
%define gtkhtml_version 3.1.12
|
||||||
|
%define soup_version 2.1.9
|
||||||
|
%define eds_version 0.0.92
|
||||||
|
%define use_mozilla_nss 1
|
||||||
|
%define evo_major 1.5
|
||||||
|
|
||||||
%if %{use_mozilla_nss}
|
%if %{use_mozilla_nss}
|
||||||
%define mozilla_version 1.3
|
%define mozilla_version 1.6
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define ldap_support 1
|
%define ldap_support 1
|
||||||
@ -15,50 +20,40 @@
|
|||||||
%define pilot_support 1
|
%define pilot_support 1
|
||||||
%endif
|
%endif
|
||||||
# note that nntp is non-functional in evo 1.3.x
|
# note that nntp is non-functional in evo 1.3.x
|
||||||
%define nntp_support 0
|
%define nntp_support 1
|
||||||
|
|
||||||
%define dbdir db-3.1.17
|
|
||||||
%define buildtopdir $RPM_BUILD_DIR/%{name}-%{version}
|
|
||||||
|
|
||||||
Name: evolution
|
Name: evolution
|
||||||
Version: 1.4.6
|
Version: 1.5.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/
|
||||||
Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/1.3/%{name}-%{version}.tar.gz
|
Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/1.5/%{name}-%{version}.tar.bz2
|
||||||
Source1: db-3.1.17.tar.bz2
|
|
||||||
|
|
||||||
# patches pulled from upstream CVS
|
# patches pulled from upstream CVS
|
||||||
Patch0: evolution-1.4.5-gethostaddr.patch
|
Patch600: evolution-1.5.7-fix_emfv_signal.patch
|
||||||
Patch1: evolution-1.4.5-41610.patch
|
|
||||||
Patch2: evolution-1.4.5-33545.patch
|
|
||||||
Patch3: evolution-1.4.5-46006.patch
|
|
||||||
Patch4: evolution-1.4.5-46006-2.patch
|
|
||||||
Patch5: evolution-1.4.5-49357.patch
|
|
||||||
Patch6: evolution-1.4.5-reply-to-list-shortcut.patch
|
|
||||||
Patch7: evolution-1.4.5-composer-save-title.patch
|
|
||||||
Patch8: evolution-1.4.5-50535.patch
|
|
||||||
|
|
||||||
# Red Hat Linux specific patches
|
# Red Hat Linux specific patches
|
||||||
Patch11: evolution-1.3.2-redhatify.patch
|
#Patch11: evolution-1.3.2-redhatify.patch
|
||||||
|
|
||||||
# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/
|
# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/
|
||||||
Patch99: db3-dont-use-pthread.patch
|
#Patch99: db3-dont-use-pthread.patch
|
||||||
# bad hack
|
# bad hack
|
||||||
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: evolution-1.4.4-filters-gtype.patch
|
Patch601: evolution-1.5.7-fix_defaults_for_gcc34.patch
|
||||||
Patch101: evolution-1.4.5-addrconfig.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
|
||||||
Patch200: evolution-1.4.5-imap-command-length.patch
|
#Patch200: evolution-1.4.5-imap-command-length.patch
|
||||||
|
|
||||||
# this was rejected due to adding a dependency on DISPLAY for
|
# this was rejected due to adding a dependency on DISPLAY for
|
||||||
# evolution-wombat but it does work to fix the problem
|
# evolution-wombat but it does work to fix the problem
|
||||||
Patch500: evolution-wombat-sm.patch
|
#Patch500: evolution-wombat-sm.patch
|
||||||
|
|
||||||
|
# Patches to use GNOME 2.6
|
||||||
|
Patch700: evolution-1.5.7-filechooser.patch
|
||||||
|
|
||||||
Summary: GNOME's next-generation groupware suite
|
Summary: GNOME's next-generation groupware suite
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
@ -67,17 +62,20 @@ Requires: scrollkeeper >= 0.1.4
|
|||||||
Requires: ORBit2 >= 2.7.5
|
Requires: ORBit2 >= 2.7.5
|
||||||
|
|
||||||
%if %{use_mozilla_nss}
|
%if %{use_mozilla_nss}
|
||||||
Requires: mozilla-nss >= 35:%{mozilla_version}
|
Requires: mozilla-nss >= 37:%{mozilla_version}
|
||||||
Requires: mozilla-nspr >= 35:%{mozilla_version}
|
Requires: mozilla-nspr >= 37:%{mozilla_version}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Requires: libsoup >= %{soup_version}
|
Requires: libsoup >= %{soup_version}
|
||||||
Requires: libgal2 >= %{gal_version}
|
Requires: libgal2 >= %{gal_version}
|
||||||
|
Requires: evolution-data-server >= %{eds_version}
|
||||||
Requires: gnome-spell >= 1.0.2
|
Requires: gnome-spell >= 1.0.2
|
||||||
|
Requires: gtk2 >= 2.4.0
|
||||||
|
|
||||||
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: libbonobo-devel >= 2.0
|
BuildRequires: libbonobo-devel >= 2.0
|
||||||
BuildRequires: libbonoboui-devel >= 2.0
|
BuildRequires: libbonoboui-devel >= 2.0
|
||||||
BuildRequires: gnome-vfs2-devel >= 2.0
|
BuildRequires: gnome-vfs2-devel >= 2.0
|
||||||
@ -85,12 +83,13 @@ BuildRequires: libgnomeui-devel >= 2.0
|
|||||||
BuildRequires: libgnomecanvas-devel >= 2.0
|
BuildRequires: libgnomecanvas-devel >= 2.0
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: GConf2-devel
|
BuildRequires: GConf2-devel
|
||||||
|
BuildRequires: intltool
|
||||||
# kind of silly...
|
# kind of silly...
|
||||||
BuildRequires: flex bison byacc libtool gettext
|
BuildRequires: flex bison byacc libtool gettext
|
||||||
|
|
||||||
%if %{use_mozilla_nss}
|
%if %{use_mozilla_nss}
|
||||||
BuildRequires: mozilla-nspr-devel >= 35:%{mozilla_version}
|
BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_version}
|
||||||
BuildRequires: mozilla-nss-devel >= 35:%{mozilla_version}
|
BuildRequires: mozilla-nss-devel >= 37:%{mozilla_version}
|
||||||
%else
|
%else
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
%endif
|
%endif
|
||||||
@ -135,50 +134,33 @@ Requires: libsoup-devel >= %{soup_version}
|
|||||||
Development files needed for building things which link against evolution.
|
Development files needed for building things which link against evolution.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -a 1
|
%setup -q
|
||||||
# these are in CVS already on the 1-4-branch
|
# these are in CVS already on the 1-4-branch
|
||||||
#patch0 -p1 -b .gethostbyaddr
|
|
||||||
#patch1 -p0 -b .divbyzero
|
|
||||||
#patch2 -p0 -b .flushiconv
|
|
||||||
#patch3 -p0 -b .ipv6num
|
|
||||||
#patch4 -p0 -b .ipv6lookup
|
|
||||||
#patch5 -p0 -b .tz
|
|
||||||
#patch6 -p0 -b .list
|
|
||||||
#patch7 -p1 -b .title
|
|
||||||
#patch8 -p0 -b .esmtpehlo
|
|
||||||
|
|
||||||
# Red Hat specific patches
|
# Red Hat specific patches
|
||||||
%patch11 -p1 -b .rhatify
|
#patch11 -p1 -b .rhatify
|
||||||
|
|
||||||
%patch99 -p1 -b .db3pthread
|
#patch99 -p1 -b .db3pthread
|
||||||
|
|
||||||
%patch98 -p1 -b .ldaphack
|
%patch98 -p1 -b .ldaphack
|
||||||
|
|
||||||
# patches sent upstream
|
# patches sent upstream
|
||||||
#patch100 -p1 -b .filtergtype
|
%patch601 -p1 -b .fix_defaults_for_gcc34
|
||||||
#patch101 -p0 -b .addrconfig
|
|
||||||
|
|
||||||
%patch200 -p1 -b .commandlength
|
#patch200 -p1 -b .commandlength
|
||||||
|
|
||||||
#patch500 -p0 -b .wombatsm
|
#patch500 -p0 -b .wombatsm
|
||||||
|
|
||||||
|
# Already in CVS on 1-5-branch:
|
||||||
|
%patch600 -p1 -b .fix_emfv_signal
|
||||||
|
|
||||||
|
%patch700 -p1 -b .filechooser
|
||||||
|
|
||||||
mkdir -p krb5-fakeprefix/include
|
mkdir -p krb5-fakeprefix/include
|
||||||
mkdir -p krb5-fakeprefix/lib
|
mkdir -p krb5-fakeprefix/lib
|
||||||
mkdir -p krb5-fakeprefix/%{_lib}
|
mkdir -p krb5-fakeprefix/%{_lib}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# FIXME: remove this when patch1 goes away
|
|
||||||
autoheader
|
|
||||||
autoconf
|
|
||||||
|
|
||||||
## build our db 3.1.17
|
|
||||||
cd %{buildtopdir}/%{dbdir}/build_unix
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS -fPIC" ../dist/configure --prefix=%{_prefix} --enable-static --enable-posixmutexes=no
|
|
||||||
make
|
|
||||||
|
|
||||||
## back to evolution
|
|
||||||
cd %{buildtopdir}
|
|
||||||
|
|
||||||
# define all of our flags, this is kind of ugly :(
|
# define all of our flags, this is kind of ugly :(
|
||||||
%if %{ldap_support}
|
%if %{ldap_support}
|
||||||
%define ldap_flags --with-openldap=yes
|
%define ldap_flags --with-openldap=yes
|
||||||
@ -220,8 +202,6 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%configure --enable-gtk-doc=no --enable-ipv6 \
|
%configure --enable-gtk-doc=no --enable-ipv6 \
|
||||||
--with-db3-includes=%{buildtopdir}/%{dbdir}/build_unix \
|
|
||||||
--with-db3-libs=%{buildtopdir}/%{dbdir}/build_unix \
|
|
||||||
--enable-file-locking=fcntl --enable-dot-locking=no \
|
--enable-file-locking=fcntl --enable-dot-locking=no \
|
||||||
--with-sub-version=" (%{version}-%{release})" \
|
--with-sub-version=" (%{version}-%{release})" \
|
||||||
--with-kde-applnk-path=no \
|
--with-kde-applnk-path=no \
|
||||||
@ -229,7 +209,7 @@ fi
|
|||||||
export tagname=CC
|
export tagname=CC
|
||||||
make LIBTOOL=%{_bindir}/libtool
|
make LIBTOOL=%{_bindir}/libtool
|
||||||
|
|
||||||
cat /dev/null > default_user/local/Inbox/mbox
|
#cat /dev/null > default_user/local/Inbox/mbox
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -248,19 +228,21 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
|
|||||||
# scrollkeeper gets handled in %post
|
# scrollkeeper gets handled in %post
|
||||||
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
|
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
|
||||||
|
|
||||||
|
# evolution is the preferred email app
|
||||||
|
ln -sf ../desktop-menu-patches/redhat-email.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
|
||||||
# just keep our desktop file (#103826)
|
# just keep our desktop file (#103826)
|
||||||
rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop
|
rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop
|
||||||
|
|
||||||
# FC2 temporary hack: Use translations from redhat-menus
|
# evolution link
|
||||||
ln -sf ../desktop-menu-patches/evolution.desktop \
|
ln -sf ./evolution-1.5 $RPM_BUILD_ROOT/%{_bindir}/evolution
|
||||||
$RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop
|
|
||||||
|
|
||||||
%find_lang %name-1.4
|
|
||||||
|
%find_lang %name-%{evo_major}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||||
SCHEMAS="apps_evolution_addressbook.schemas apps_evolution_calendar.schemas apps_evolution_shell.schemas apps_evolution_summary.schemas evolution-mail.schemas"
|
SCHEMAS="apps_evolution_addressbook-1.5.schemas apps_evolution_calendar-1.5.schemas apps_evolution_shell-1.5.schemas evolution-mail-1.5.schemas"
|
||||||
for S in $SCHEMAS; do
|
for S in $SCHEMAS; do
|
||||||
gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
|
gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
|
||||||
done
|
done
|
||||||
@ -273,51 +255,90 @@ scrollkeeper-update
|
|||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%files -f %{name}-1.4.lang
|
%files -f %{name}-%{evo_major}.lang
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
|
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
|
||||||
%{_sysconfdir}/gconf/schemas/*
|
%{_sysconfdir}/gconf/schemas/*
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_datadir}/applications/*
|
%{_datadir}/applications/*
|
||||||
%{_datadir}/gnome/help/evolution-1.4
|
%{_datadir}/gnome/help/evolution-%{evo_major}
|
||||||
%{_datadir}/idl/evolution-1.4
|
%{_datadir}/idl/evolution-%{evo_major}
|
||||||
%{_datadir}/mime-info/*
|
%{_datadir}/mime-info/*
|
||||||
%dir %{_datadir}/evolution
|
%dir %{_datadir}/evolution
|
||||||
%{_datadir}/evolution/1.4
|
%{_datadir}/evolution/1.5
|
||||||
%{_datadir}/omf/evolution
|
%{_datadir}/omf/evolution
|
||||||
%{_datadir}/pixmaps/*
|
%{_datadir}/pixmaps/*
|
||||||
%{_libdir}/bonobo/servers/*
|
%{_libdir}/bonobo/servers/*
|
||||||
%dir %{_libdir}/evolution
|
%dir %{_libdir}/evolution
|
||||||
%dir %{_libdir}/evolution/1.4
|
%dir %{_libdir}/evolution/%{evo_major}
|
||||||
%dir %{_libdir}/evolution/1.4/camel-providers
|
%dir %{_libdir}/evolution/%{evo_major}/camel-providers
|
||||||
%dir %{_libdir}/evolution/1.4/components
|
%dir %{_libdir}/evolution/%{evo_major}/camel-providers/*.so
|
||||||
%dir %{_libdir}/evolution/1.4/evolution-calendar-importers
|
%dir %{_libdir}/evolution/%{evo_major}/components
|
||||||
%dir %{_libdir}/evolution/1.4/evolution-mail-importers
|
%dir %{_libdir}/evolution/%{evo_major}/components/*.so
|
||||||
%{_libdir}/evolution/1.4/*/*.so
|
%dir %{_libdir}/evolution/%{evo_major}/evolution-calendar-importers
|
||||||
%{_libdir}/evolution/1.4/*.so.*
|
%dir %{_libdir}/evolution/%{evo_major}/evolution-calendar-importers/*.so
|
||||||
%{_libdir}/evolution/1.4/camel-providers/*.urls
|
%dir %{_libdir}/evolution/1.5/evolution-addressbook-importers/
|
||||||
|
%{_libdir}/evolution/1.5/evolution-addressbook-importers/*.so
|
||||||
|
%{_libdir}/evolution/%{evo_major}/*.so.*
|
||||||
|
%{_libdir}/evolution/%{evo_major}/camel-providers/*.urls
|
||||||
%dir %{_libexecdir}/evolution
|
%dir %{_libexecdir}/evolution
|
||||||
%{_libexecdir}/evolution/1.4
|
%{_libexecdir}/evolution/%{evo_major}
|
||||||
|
|
||||||
%if %{pilot_support}
|
%if %{pilot_support}
|
||||||
%{_libdir}/gnome-pilot/conduits/*.so
|
%dir %{_libdir}/evolution/%{evo_major}/conduits
|
||||||
|
%{_libdir}/evolution/%{evo_major}/conduits/*.so
|
||||||
%{_datadir}/gnome-pilot/conduits/*
|
%{_datadir}/gnome-pilot/conduits/*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%{_includedir}/evolution-1.4
|
%{_includedir}/evolution-%{evo_major}
|
||||||
%{_libdir}/pkgconfig/*.pc
|
%{_libdir}/pkgconfig/*.pc
|
||||||
%{_libdir}/evolution/1.4/*.so
|
%{_libdir}/evolution/%{evo_major}/*.so
|
||||||
%{_libdir}/evolution/1.4/*.a
|
%{_libdir}/evolution/%{evo_major}/*.a
|
||||||
%{_libdir}/evolution/1.4/*/*.a
|
%{_libdir}/evolution/%{evo_major}/*/*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 05 2004 Warren Togami <wtogami@redhat.com> 1.4.6-2
|
* Tue May 4 2004 David Malcolm <dmalcolm@boston.redhat.com> - 1.5.7-3
|
||||||
- link to evolution.desktop in redhat-menus
|
- Added GtkFileChooser patch based on work by Carlos Garnacho Parro (http://lists.ximian.com/archives/public/evolution-patches/2004-March/004867.html); added requirement for GTK 2.4
|
||||||
|
|
||||||
* Wed Mar 10 2004 Jeremy Katz <katzj@redhat.com> 1.4.6-1
|
* Thu Apr 22 2004 David Malcolm <dmalcolm@boston.redhat.com> - 1.5.7-2
|
||||||
- 1.4.6
|
- added emfv signal fix patch and fix for defaults in switch statements on gcc3.4
|
||||||
|
|
||||||
|
* Wed Apr 21 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.7-1
|
||||||
|
- 1.5.7
|
||||||
|
|
||||||
|
* Wed Mar 10 2004 Jeremy Katz <katzj@redhat.com> - 1.5.5-1
|
||||||
|
- 1.5.5
|
||||||
|
|
||||||
|
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
|
||||||
|
- rebuilt
|
||||||
|
|
||||||
|
* Wed Feb 18 2004 Jeremy Katz <katzj@redhat.com> - 1.5.4-1
|
||||||
|
- 1.5.4
|
||||||
|
|
||||||
|
* Tue Feb 17 2004 Jeremy Katz <katzj@redhat.com>
|
||||||
|
- buildrequire e-d-s-devel instead of e-d-s (#114712)
|
||||||
|
- enable nntp support (#114802)
|
||||||
|
|
||||||
|
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
||||||
|
- rebuilt
|
||||||
|
|
||||||
|
* Tue Jan 27 2004 Jeremy Katz <katzj@redhat.com> 1.5.3-1
|
||||||
|
- 1.5.3
|
||||||
|
|
||||||
|
* Wed Jan 21 2004 Jeremy Katz <katzj@redhat.com> 1.5.2-2
|
||||||
|
- size_t/int mismatch compile fix for 64bit platforms
|
||||||
|
|
||||||
|
* Wed Jan 14 2004 Jeremy Katz <katzj@redhat.com> 1.5.2-0
|
||||||
|
- 1.5.2
|
||||||
|
- add patch to fix gconf warning with schema
|
||||||
|
|
||||||
|
* Sun Jan 4 2004 Jeremy Katz <katzj@redhat.com> 1.5.1-0
|
||||||
|
- 1.5.1
|
||||||
|
- temporarily disable redhatify patch
|
||||||
|
- use mozilla-nss for SSL
|
||||||
|
- fix schema names
|
||||||
|
|
||||||
* Thu Nov 6 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-8
|
* Thu Nov 6 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-8
|
||||||
- fall back to HELO for ESMTP (#108753)
|
- fall back to HELO for ESMTP (#108753)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user