auto-import evolution-1.2.2-4 from evolution-1.2.2-4.src.rpm
This commit is contained in:
cvsdist
parent
0fa2f978ea
commit
de9dcd6844
@ -1,2 +1,2 @@
|
||||
db-3.1.17.tar.bz2
|
||||
evolution-1.2.0.tar.bz2
|
||||
evolution-1.2.2.tar.bz2
|
||||
|
||||
134
evolution.spec
134
evolution.spec
@ -1,8 +1,11 @@
|
||||
ExcludeArch: ia64 alpha x86_64
|
||||
%define gal_version 0.23
|
||||
%define gtkhtml_version 1.1.8
|
||||
%define soup_version 0.7.10
|
||||
%define use_mozilla_nss 0
|
||||
|
||||
%define gal_version 0.21
|
||||
%define gtkhtml_version 1.1.5
|
||||
%if %{use_mozilla_nss}
|
||||
%define mozilla_version 1.0.1
|
||||
%endif
|
||||
|
||||
%define ldap_support 1
|
||||
%ifarch s390 s390x
|
||||
@ -19,23 +22,33 @@ ExcludeArch: ia64 alpha x86_64
|
||||
%define buildtopdir $RPM_BUILD_DIR/%{name}-%{version}
|
||||
|
||||
Name: evolution
|
||||
Version: 1.2.0
|
||||
Release: 3
|
||||
Version: 1.2.2
|
||||
Release: 4
|
||||
License: GPL
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
URL: http://www.ximian.com/
|
||||
Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/%{name}-%{version}.tar.bz2
|
||||
Source1: db-3.1.17.tar.bz2
|
||||
|
||||
# patches pulled from upstream CVS
|
||||
Patch0: evolution-1.2.0-imap-inbox-subscribe.patch
|
||||
Patch0: evolution-1.2.2-mail-memleak.patch
|
||||
Patch1: evolution-1.2.2-proxy-gnome2.patch
|
||||
|
||||
# Red Hat Linux specific patches
|
||||
Patch11: evolution-1.1.90-redhatify.patch
|
||||
Patch12: evolution-1.0.8-nokdedesktopinstall.patch
|
||||
# this one can go away once an evolution tarball is built against a fixed
|
||||
# gnome-pilot.m4 (for -lpisock -lpisync quoting)
|
||||
Patch13: evolution-1.1.90-pisock.patch
|
||||
|
||||
Patch20: evolution-ja-charset.patch
|
||||
|
||||
# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/
|
||||
Patch99: db3-dont-use-pthread.patch
|
||||
|
||||
# submitted upstream
|
||||
Patch100: evolution-1.2.0-krb5lib64.patch
|
||||
|
||||
Summary: GNOME's next-generation groupware suite
|
||||
Group: Applications/Productivity
|
||||
|
||||
@ -44,14 +57,19 @@ Requires: scrollkeeper >= 0.1.4
|
||||
Requires: bonobo >= 1.0.14
|
||||
Requires: GConf >= 1.0.7
|
||||
Requires: oaf >= 0.6.10
|
||||
|
||||
%if %{use_mozilla_nss}
|
||||
Requires: mozilla-nss >= 35:%{mozilla_version}
|
||||
Requires: mozilla-nspr >= 35:%{mozilla_version}
|
||||
Requires: soup >= 0.7.4
|
||||
Requires: bonobo-conf-devel >= 0.16
|
||||
%endif
|
||||
|
||||
Requires: soup >= %{soup_version}
|
||||
Requires: bonobo-conf >= 0.16
|
||||
Requires: gnome-spell >= 0.5
|
||||
|
||||
BuildRequires: gtkhtml-devel >= %{gtkhtml_version}
|
||||
BuildRequires: gal-devel >= %{gal_version}
|
||||
BuildRequires: soup-devel >= 0.7.4
|
||||
BuildRequires: soup-devel >= %{soup_version}
|
||||
BuildRequires: bonobo-devel >= 1.0.3
|
||||
BuildRequires: bonobo-conf-devel >= 0.16
|
||||
BuildRequires: oaf-devel >= 0.6.10
|
||||
@ -66,10 +84,15 @@ BuildRequires: intltool >= 0.17
|
||||
BuildRequires: gtk+-devel >= 1.2.9
|
||||
BuildRequires: freetype-devel
|
||||
|
||||
# needed for Patch90, remove when that's gone
|
||||
BuildRequires: autoconf213
|
||||
|
||||
%if %{use_mozilla_nss}
|
||||
BuildRequires: mozilla-nspr-devel >= 35:%{mozilla_version}
|
||||
BuildRequires: mozilla-nss-devel >= 35:%{mozilla_version}
|
||||
BuildRequires: pkgconfig
|
||||
%endif
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
%if %{ldap_support}
|
||||
@ -96,7 +119,8 @@ personal information-management tool.
|
||||
%prep
|
||||
%setup -q -a 1
|
||||
# these are in CVS already on the 1-2-branch
|
||||
%patch0 -p1 -b .inboxsub
|
||||
%patch0 -p1 -b .memleak
|
||||
%patch1 -p1 -b .proxysettings
|
||||
|
||||
# Red Hat specific patches
|
||||
%patch11 -p1 -b .rhatify
|
||||
@ -105,11 +129,14 @@ personal information-management tool.
|
||||
|
||||
%patch20 -p0 -b .jacharset
|
||||
|
||||
%patch99 -p1 -b .db3pthread
|
||||
%patch100 -p1 -b .krb5lib64
|
||||
|
||||
%build
|
||||
|
||||
## build our db 3.1.17
|
||||
cd %{buildtopdir}/%{dbdir}/build_unix
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC" ../dist/configure --prefix=%{_prefix} --enable-static
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC" ../dist/configure --prefix=%{_prefix} --enable-static --enable-posixmutexes=no
|
||||
make
|
||||
|
||||
## back to evolution
|
||||
@ -140,24 +167,35 @@ cd %{buildtopdir}
|
||||
%define nntp_flags --enable-nntp=no
|
||||
%endif
|
||||
|
||||
#autoconf-2.13
|
||||
%if %{use_mozilla_nss}
|
||||
%define ssl_flags --with-nspr-includes=/usr/include/mozilla-%{mozilla_version}/nspr --with-nspr-libs=/usr/lib --with-nss-includes=/usr/include/mozilla-%{mozilla_version}/nss --with-nss-libs=/usr/lib
|
||||
%else
|
||||
%define ssl_flags --enable-openssl=yes
|
||||
%endif
|
||||
|
||||
# needed for patch100
|
||||
autoconf-2.13
|
||||
patch -p1 -i %{PATCH13}
|
||||
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
|
||||
%if ! %{use_mozilla_nss}
|
||||
if pkg-config openssl ; then
|
||||
CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
|
||||
LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
|
||||
fi
|
||||
%endif
|
||||
%configure --enable-gtk-doc=no \
|
||||
--with-db3-includes=%{buildtopdir}/%{dbdir}/build_unix \
|
||||
--with-db3-libs=%{buildtopdir}/%{dbdir}/build_unix \
|
||||
--enable-file-locking=fcntl --enable-dot-locking=no \
|
||||
--with-sub-version=" (%{version}-%{release})" \
|
||||
%ldap_flags %pilot_flags %krb5_flags %nntp_flags \
|
||||
--with-nspr-includes=/usr/include/mozilla-%{mozilla_version}/nspr \
|
||||
--with-nspr-libs=/usr/lib \
|
||||
--with-nss-includes=/usr/include/mozilla-%{mozilla_version}/nss \
|
||||
--with-nss-libs=/usr/lib
|
||||
make
|
||||
%ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags
|
||||
make LIBTOOL=/usr/bin/libtool
|
||||
|
||||
cat /dev/null > default_user/local/Inbox/mbox
|
||||
|
||||
%install
|
||||
%makeinstall
|
||||
%makeinstall LIBTOOL=/usr/bin/libtool
|
||||
|
||||
# remove static and libtool archives for importers and the like
|
||||
find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
|
||||
@ -219,7 +257,61 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Nov 20 2002 Florian La Roche <Florian.LaRoche@redhat.de>
|
||||
* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
|
||||
- debuginfo rebuild
|
||||
|
||||
* Thu Feb 20 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-3
|
||||
- memleak patch had some bits that weren't supposed to be there. update
|
||||
to newer from upstream.
|
||||
- fix directory checking in proxy patch
|
||||
|
||||
* Thu Feb 20 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-2
|
||||
- add missing build dep (#84388)
|
||||
- add patch from upstream for evolution-mail memleak
|
||||
- add patch from upstream to use the gnome2 proxy settings by default
|
||||
|
||||
* Fri Feb 7 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-1
|
||||
- 1.2.2
|
||||
- build on x86_64
|
||||
|
||||
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Tue Jan 7 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.1-4
|
||||
- rebuild
|
||||
|
||||
* Fri Jan 3 2003 Nalin Dahyabhai <nalin@redhat.com>
|
||||
- if building with OpenSSL, attempt to get cflags and ldflags from pkgconfig
|
||||
|
||||
* Thu Jan 2 2003 Jeremy Katz <katzj@redhat.com> 1.2.1-3
|
||||
- we don't want to use native POSIX threads for mutexes in db3, override them
|
||||
|
||||
* Mon Dec 16 2002 Tim Powers <timp@redhat.com> 1.2.1-2
|
||||
- rebuild
|
||||
|
||||
* Fri Dec 13 2002 Jeremy Katz <katzj@redhat.com> 1.2.1-1
|
||||
- update to 1.2.1
|
||||
|
||||
* Thu Dec 12 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-6
|
||||
- require a newer soup, the old one Has Bugs (tm)
|
||||
- excludearch x86_64; getting a R_X86_64_32S relocation in libical
|
||||
although everything appears to be built with -fPIC correctly
|
||||
|
||||
* Tue Dec 10 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-5
|
||||
- patch for multilib krb5
|
||||
|
||||
* Mon Dec 2 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-4
|
||||
- add upstream patch to handle LDAPv3 better
|
||||
- add upstream patch to fix shell memory leaks
|
||||
- add upstream patch to fix ldap scope selection
|
||||
- build with openssl instead of mozilla-nss since it's available on
|
||||
more platforms
|
||||
- build on all arches
|
||||
|
||||
* Fri Nov 22 2002 Jeremy Katz <katzj@redhat.com>
|
||||
- require bonobo-conf, not -devel (#78398)
|
||||
|
||||
* Wed Nov 20 2002 Florian La Roche <Florian.LaRoche@redhat.de> 1.2.0-3
|
||||
- disable pilot support for mainframe
|
||||
|
||||
* Mon Nov 18 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user