From 0fa2f978ea0be563cfff3ffd3a23eb10498d3703 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:38:00 +0000 Subject: [PATCH] auto-import evolution-1.2.0-3 from evolution-1.2.0-3.src.rpm --- .cvsignore | 2 +- evolution.spec | 146 +++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 76 insertions(+), 74 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5e92af7..20b1c57 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ db-3.1.17.tar.bz2 -evolution-1.0.8.tar.bz2 +evolution-1.2.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index d8a3cd2..274e864 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,59 +1,41 @@ -ExcludeArch: ia64 alpha +ExcludeArch: ia64 alpha x86_64 -%define gal_version 0.19.2 -%define gtkhtml_version 1.0.2 +%define gal_version 0.21 +%define gtkhtml_version 1.1.5 +%define mozilla_version 1.0.1 %define ldap_support 1 +%ifarch s390 s390x +%define pilot_support 0 +%else %define pilot_support 1 +%endif # note that nntp and krb5 support are both non-functional in evo 1.0.x; defines # are only here for future convenience %define nntp_support 0 -%define krb5_support 0 +%define krb5_support 1 %define dbdir db-3.1.17 %define buildtopdir $RPM_BUILD_DIR/%{name}-%{version} Name: evolution -Version: 1.0.8 -Release: 11 +Version: 1.2.0 +Release: 3 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.0.3-non-attendee-acceptance.patch -Patch1: evolution-1.0.3-startupwizardcrash.patch -Patch2: evolution-1.0.3-useproperldapattribs.patch -Patch3: evolution-1.0.3-einprogress.patch -Patch4: evolution-1.0.3-fixcrash.patch -Patch5: evolution-1.0.3-unreadcount.patch +Patch0: evolution-1.2.0-imap-inbox-subscribe.patch # Red Hat Linux specific patches -Patch10: evolution-1.0.1-dborder.patch -Patch11: evolution-1.0.2-redhatify.patch -Patch12: evolution-1.0.8-killdeadsummary.patch -Patch13: evolution-1.0.8-nokdedesktopinstall.patch +Patch11: evolution-1.1.90-redhatify.patch +Patch12: evolution-1.0.8-nokdedesktopinstall.patch +Patch13: evolution-1.1.90-pisock.patch Patch20: evolution-ja-charset.patch -Patch30: evolution-1.0.5-mozilla10.patch - -# submitted upstream -Patch40: evolution-1.0.7-omffixes.patch -Patch50: evolution-1.0.8-ldapv3.diff - -# bugzilla.ximian.com 29784 -Patch51: evolution-1.0.8-stackcorrupt.patch - -# bug 82374 -- certiain mime text/plain messages cause evo to crash -Patch100: evolution-1.0.8-textcrash-82374.patch - -# security fixes backported from 1.2.2 for CORE-20030304 -Patch200: evolution-1.0.8-dont-use-bonobo-component.patch -Patch201: evolution-1.0.8-safer-contentid-parse.patch -Patch202: evolution-1.0.8-sanity-check-uue-header.patch - Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -61,15 +43,18 @@ Requires: scrollkeeper >= 0.1.4 # these are explicit because older versions cause unexpected component hangs Requires: bonobo >= 1.0.14 Requires: GConf >= 1.0.7 -Requires: oaf >= 0.6.7 -Requires: mozilla-nss >= 1.0.1 -Requires: mozilla-nspr >= 1.0.1 +Requires: oaf >= 0.6.10 +Requires: mozilla-nss >= 35:%{mozilla_version} +Requires: mozilla-nspr >= 35:%{mozilla_version} +Requires: soup >= 0.7.4 +Requires: bonobo-conf-devel >= 0.16 BuildRequires: gtkhtml-devel >= %{gtkhtml_version} BuildRequires: gal-devel >= %{gal_version} +BuildRequires: soup-devel >= 0.7.4 BuildRequires: bonobo-devel >= 1.0.3 -BuildRequires: bonobo-conf-devel >= 0.12 -BuildRequires: oaf-devel >= 0.6.2 +BuildRequires: bonobo-conf-devel >= 0.16 +BuildRequires: oaf-devel >= 0.6.10 BuildRequires: gdk-pixbuf-devel >= 0.9.0 BuildRequires: gnome-vfs-devel >= 1.0.0 BuildRequires: libglade-devel >= 0.14 @@ -81,8 +66,8 @@ BuildRequires: intltool >= 0.17 BuildRequires: gtk+-devel >= 1.2.9 BuildRequires: freetype-devel -BuildRequires: mozilla-nspr-devel >= 1.0.1 -BuildRequires: mozilla-nss-devel >= 1.0.1 +BuildRequires: mozilla-nspr-devel >= 35:%{mozilla_version} +BuildRequires: mozilla-nss-devel >= 35:%{mozilla_version} BuildRequires: pkgconfig BuildRequires: desktop-file-utils @@ -93,6 +78,9 @@ BuildRequires: openldap-devel >= 2.0.11 %if %{pilot_support} BuildRequires: gnome-pilot-devel +# bleah, gnome-pilot really sucks this in, but then I have to have an explicit +# versioning for gnome-pilot when it changes less than pilot-link itself +BuildRequires: pilot-link-devel >= 1:0.11.4 %endif %if %{krb5_support} @@ -107,36 +95,16 @@ 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 +# these are in CVS already on the 1-2-branch +%patch0 -p1 -b .inboxsub # Red Hat specific patches -%patch10 -p0 -b .dborder -%patch11 -p0 -b .rhatify -%patch12 -p0 -b .deadsites -%patch13 -p0 -b .nokde +%patch11 -p1 -b .rhatify +%patch12 -p0 -b .nokde +%patch13 -p1 -b .pisock %patch20 -p0 -b .jacharset -#patch30 -p0 -b .mozilla10 - -%patch40 -p1 -b .omf - -%patch50 -p0 -b .ldapv3 - -%patch51 -p1 -b .stackcorrupt - -%patch100 -p1 -b .textplain - -%patch200 -p1 -b .bonobocomponent -%patch201 -p1 -b .contentid -%patch202 -p1 -b .uueheader - %build ## build our db 3.1.17 @@ -180,7 +148,10 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS --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-1.0.1/nspr --with-nspr-libs=/usr/lib --with-nss-includes=/usr/include/mozilla-1.0.1/nss --with-nss-libs=/usr/lib + --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 cat /dev/null > default_user/local/Inbox/mbox @@ -192,6 +163,14 @@ cat /dev/null > default_user/local/Inbox/mbox find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; +rm -rf $RPM_BUILD_ROOT/%{_includedir} +rm -f $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Applications/* +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.sh +rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la + # vfolder desktop file install stuff mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ #desktop-file-install --vendor gnome --delete-original \ @@ -240,12 +219,35 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Wed Mar 19 2003 Jeremy Katz 1.0.8-11 -- backport security patches from upstream (originally against 1.2.2) - - sanity check UUEncoding header before decoding (CAN-2003-0128) - - don't decode doubly UUEncoded content (CAN-2003-0129) - - don't use a bonobo component to display things without registered - handlers (CAN-2003-0130) +* Wed Nov 20 2002 Florian La Roche +- disable pilot support for mainframe + +* Mon Nov 18 2002 Jeremy Katz 1.2.0-2 +- macro-ify the mozilla version to make it easier to build against + newer mozillas with headers in new locations +- buildrequire pilot-link-devel (#78077) +- drop uneeded ldapv3 patch (toshok says 1.2 already handles this) +- drop unneeded patch for ordering of the libdb checks +- add fejj's patch to always subscribe to the inbox from evolution-patches + +* Tue Nov 12 2002 Jeremy Katz 1.2.0-1 +- 1.2.0 + +* Sat Nov 2 2002 Jeremy Katz 1.1.90-2 +- reenable pilot support +- redhatify + +* Fri Nov 1 2002 Jeremy Katz 1.1.90-1 +- update to 1.1.90 + +* Thu Oct 31 2002 Jeremy Katz +- include mozilla epochs in requires (#74577) +- add build requires on newer oaf (#76801) + +* Thu Oct 24 2002 Jeremy Katz 1.1.2-1 +- update to 1.1.2 +- remove unpackaged files from the buildrooot +- disable pilot support for now * Tue Sep 3 2002 Jeremy Katz 1.0.8-10 - add freetype-devel to build requires (#73319) diff --git a/sources b/sources index 5001203..a03a607 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b237f4e38a650d096389ff54d564928d db-3.1.17.tar.bz2 -e8fceec57a66d15d0e8530661e6be490 evolution-1.0.8.tar.bz2 +949c31941e869606ab808ce42f3a8e98 evolution-1.2.0.tar.bz2