From 9b5658058b78ea91af388e159c7854d664305ee8 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:35:28 +0000 Subject: [PATCH] auto-import changelog data from evolution-1.0.8-0.7x.src.rpm Mon Jul 01 2002 Jeremy Katz 1.0.8-0.7x - 1.0.8 Thu Jun 27 2002 Jeremy Katz 1.0.7-2 - include patch to omf files from otaylor@redhat.com to fix scrollkeeper validation errors Sun Jun 23 2002 Jeremy Katz 1.0.7-1 - update to 1.0.7 - excludearch alpha while mozilla isn't being built there Sun May 26 2002 Tim Powers 1.0.5-2 - automated rebuild Mon May 13 2002 Jeremy Katz 1.0.5-1 - update to 1.0.5 --- .cvsignore | 2 +- evolution.spec | 72 +++++++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 53 insertions(+), 23 deletions(-) diff --git a/.cvsignore b/.cvsignore index f705176..4078d78 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ db-3.1.17.tar.gz -evolution-1.0.3.tar.gz +evolution-1.0.8.tar.gz diff --git a/evolution.spec b/evolution.spec index 3376310..5c9731e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ -ExcludeArch: ia64 +ExcludeArch: ia64 alpha -%define gal_version 0.19.1 +%define gal_version 0.19.2 %define gtkhtml_version 1.0.2 %define ldap_support 1 @@ -14,12 +14,12 @@ ExcludeArch: ia64 %define buildtopdir $RPM_BUILD_DIR/%{name}-%{version} Name: evolution -Version: 1.0.3 -Release: 6 +Version: 1.0.8 +Release: 0.7x License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ -Source0: %{name}-%{version}.tar.gz +Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/%{name}-%{version}.tar.gz Source1: db-3.1.17.tar.gz # patches pulled from upstream CVS Patch0: evolution-1.0.3-non-attendee-acceptance.patch @@ -34,6 +34,12 @@ Patch10: evolution-1.0.1-dborder.patch Patch11: evolution-1.0.2-redhatify.patch Patch20: evolution-ja-charset.patch + +Patch30: evolution-1.0.5-mozilla10.patch + +# submitted upstream +Patch40: evolution-1.0.7-omffixes.patch + Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -42,8 +48,8 @@ Requires: scrollkeeper >= 0.1.4 Requires: bonobo >= 1.0.14 Requires: GConf >= 1.0.7 Requires: oaf >= 0.6.7 -Requires: mozilla-nss -Requires: mozilla-nspr +Requires: mozilla-nss >= 1.0.1 +Requires: mozilla-nspr >= 1.0.1 BuildRequires: gtkhtml-devel >= %{gtkhtml_version} BuildRequires: gal-devel >= %{gal_version} @@ -60,8 +66,11 @@ BuildRequires: libxml-devel >= 1.8.16 BuildRequires: intltool >= 0.17 BuildRequires: gtk+-devel >= 1.2.9 -BuildRequires: mozilla-nspr-devel -BuildRequires: mozilla-nss-devel +BuildRequires: mozilla-nspr-devel >= 1.0.1 +BuildRequires: mozilla-nss-devel >= 1.0.1 +BuildRequires: pkgconfig + +BuildRequires: desktop-file-utils %if %{ldap_support} BuildRequires: openldap >= 2.0.11 @@ -84,12 +93,12 @@ personal information-management tool. %prep %setup -q -a 1 # these are in CVS already on the 1-0-branch -%patch0 -p0 -b .appointments -%patch1 -p0 -b .startupwizardcrash -%patch2 -p0 -b .ldapattribs -%patch3 -p0 -b .einprogress -%patch4 -p0 -b .fixcrash -%patch5 -p0 -b .unreadcount +#%patch0 -p0 -b .appointments +#%patch1 -p0 -b .startupwizardcrash +#%patch2 -p0 -b .ldapattribs +#%patch3 -p0 -b .einprogress +#%patch4 -p0 -b .fixcrash +#%patch5 -p0 -b .unreadcount # Red Hat specific patches %patch10 -p0 -b .dborder @@ -97,11 +106,15 @@ personal information-management tool. %patch20 -p0 -b .jacharset +#patch30 -p0 -b .mozilla10 + +%patch40 -p1 -b .omf + %build ## build our db 3.1.17 cd %{buildtopdir}/%{dbdir}/build_unix -CFLAGS="$RPM_OPT_FLAGS" ../dist/configure --prefix=%{_prefix} --enable-static +CFLAGS="$RPM_OPT_FLAGS -fPIC" ../dist/configure --prefix=%{_prefix} --enable-static make ## back to evolution @@ -132,15 +145,15 @@ cd %{buildtopdir} %define nntp_flags --enable-nntp=no %endif -%define nss_flags --with-nss-libs=/usr/lib --with-nss-includes=/usr/include/nss - -%configure --with-nspr-includes=/usr/include/nspr \ - --with-nspr-libs=/usr/lib --enable-gtk-doc=no \ +#autoconf-2.13 +CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS +%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 %nss_flags + %ldap_flags %pilot_flags %krb5_flags %nntp_flags \ + --with-nspr-includes=/usr/include/mozilla-1.0.1/nspr --with-nspr-libs=/usr/lib --with-nss-includes=/usr/include/mozilla-1.0.1/nss --with-nss-libs=/usr/lib make cat /dev/null > default_user/local/Inbox/mbox @@ -188,6 +201,23 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 1 2002 Jeremy Katz 1.0.8-0.7x +- 1.0.8 + +* Thu Jun 27 2002 Jeremy Katz 1.0.7-2 +- include patch to omf files from otaylor@redhat.com to fix + scrollkeeper validation errors + +* Sun Jun 23 2002 Jeremy Katz 1.0.7-1 +- update to 1.0.7 +- excludearch alpha while mozilla isn't being built there + +* Sun May 26 2002 Tim Powers 1.0.5-2 +- automated rebuild + +* Mon May 13 2002 Jeremy Katz 1.0.5-1 +- update to 1.0.5 + * Fri May 3 2002 Jeremy Katz 1.0.3-6 - add patch to fix spool unread counts (#64198) - build with the fix for the crasher mail sent to diff --git a/sources b/sources index e87b93e..f92b2ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz -28ffb3911f46a591466a78f5c805c0aa evolution-1.0.3.tar.gz +024e62b7cd37315d40b16d76b072e59d evolution-1.0.8.tar.gz