diff --git a/.cvsignore b/.cvsignore index e9af921..746f3b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ db-3.1.17.tar.bz2 -evolution-1.2.2.tar.bz2 +evolution-1.4.5.tar.gz diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch new file mode 100644 index 0000000..47cafbd --- /dev/null +++ b/evolution-1.4.4-ldap-x86_64-hack.patch @@ -0,0 +1,11 @@ +--- evolution-1.4.4/configure.ldaphack 2003-08-05 02:06:26.000000000 -0400 ++++ evolution-1.4.4/configure 2003-08-05 02:06:45.000000000 -0400 +@@ -12135,7 +12135,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" ++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ diff --git a/evolution.spec b/evolution.spec index 7a433dd..217a011 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,100 +1,97 @@ -%define gal_version 0.23 -%define gtkhtml_version 1.1.8 -%define soup_version 0.7.10 +%define gal_version 2:1.99.10 +%define gtkhtml_version 3.0.9 +%define soup_version 1.99.26 %define use_mozilla_nss 0 %if %{use_mozilla_nss} -%define mozilla_version 1.0.1 +%define mozilla_version 1.3 %endif %define ldap_support 1 +%define krb5_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 +# note that nntp is non-functional in evo 1.3.x %define nntp_support 0 -%define krb5_support 1 %define dbdir db-3.1.17 %define buildtopdir $RPM_BUILD_DIR/%{name}-%{version} Name: evolution -Version: 1.2.2 +Version: 1.4.5 Release: 7 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 +Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/1.3/%{name}-%{version}.tar.gz Source1: db-3.1.17.tar.bz2 # patches pulled from upstream CVS -Patch0: evolution-1.2.2-mail-memleak.patch -Patch1: evolution-1.2.2-proxy-gnome2.patch -# security patches for CORE-20030304 -Patch2: evolution-1.2.2-dont-use-bonobo-component.patch -Patch3: evolution-1.2.2-safer-contentid-parse.patch -Patch4: evolution-1.2.2-sanity-check-uue-header.patch +Patch0: evolution-1.4.5-gethostaddr.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 # 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 +Patch11: evolution-1.3.2-redhatify.patch # db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/ Patch99: db3-dont-use-pthread.patch +# bad hack +Patch98: evolution-1.4.4-ldap-x86_64-hack.patch -# submitted upstream -Patch100: evolution-1.2.0-krb5lib64.patch -Patch101: evolution-1.2-64bit.patch +# patches sent upstream +Patch100: evolution-1.4.4-filters-gtype.patch +Patch101: evolution-1.4.5-addrconfig.patch + +# not accepted, but proposed on a few occasions. fixes problems with +# some cyrus servers +Patch200: evolution-1.4.5-imap-command-length.patch + +# this was rejected due to adding a dependency on DISPLAY for +# evolution-wombat but it does work to fix the problem +Patch500: evolution-wombat-sm.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity 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.10 +Requires: ORBit2 >= 2.7.5 %if %{use_mozilla_nss} Requires: mozilla-nss >= 35:%{mozilla_version} Requires: mozilla-nspr >= 35:%{mozilla_version} %endif -Requires: soup >= %{soup_version} -Requires: bonobo-conf >= 0.16 -Requires: gnome-spell >= 0.5 +Requires: libsoup >= %{soup_version} +Requires: libgal2 >= %{gal_version} +Requires: gnome-spell >= 1.0.2 -BuildRequires: gtkhtml-devel >= %{gtkhtml_version} -BuildRequires: gal-devel >= %{gal_version} -BuildRequires: soup-devel >= %{soup_version} -BuildRequires: bonobo-devel >= 1.0.3 -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 -BuildRequires: GConf-devel >= 0.6 -BuildRequires: ORBit-devel >= 0.5.10 -BuildRequires: gnome-print-devel >= 0.25 -BuildRequires: libxml-devel >= 1.8.16 -BuildRequires: intltool >= 0.17 -BuildRequires: gtk+-devel >= 1.2.9 -BuildRequires: freetype-devel - -# needed for Patch90, remove when that's gone -BuildRequires: autoconf213 +BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +BuildRequires: libgal2-devel >= %{gal_version} +BuildRequires: libsoup-devel >= %{soup_version} +BuildRequires: libbonobo-devel >= 2.0 +BuildRequires: libbonoboui-devel >= 2.0 +BuildRequires: gnome-vfs2-devel >= 2.0 +BuildRequires: libgnomeui-devel >= 2.0 +BuildRequires: libgnomecanvas-devel >= 2.0 +BuildRequires: libxml2-devel +BuildRequires: GConf2-devel +# kind of silly... +BuildRequires: flex bison byacc libtool gettext %if %{use_mozilla_nss} BuildRequires: mozilla-nspr-devel >= 35:%{mozilla_version} BuildRequires: mozilla-nss-devel >= 35:%{mozilla_version} +%else +BuildRequires: openssl-devel %endif BuildRequires: pkgconfig @@ -105,14 +102,18 @@ BuildRequires: openldap-devel >= 2.0.11 %endif %if %{pilot_support} -BuildRequires: gnome-pilot-devel +BuildRequires: gnome-pilot-devel >= 2.0.6 # 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 +Requires: gnome-pilot >= 2.0.6 %endif %if %{krb5_support} BuildRequires: krb5-devel +# tweak for krb5 1.2 vs 1.3 +%define krb5dir /usr/kerberos +#define krb5dir `pwd`/krb5-fakeprefix %endif %description @@ -121,27 +122,52 @@ communications tool. The tools which make up Evolution will 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 +Requires: %{name} = %{version} +Requires: gtkhtml3-devel >= %{gtkhtml_version} +Requires: libgal2-devel >= %{gal_version} +Requires: libsoup-devel >= %{soup_version} + +%description devel +Development files needed for building things which link against evolution. + %prep %setup -q -a 1 -# these are in CVS already on the 1-2-branch -%patch0 -p1 -b .memleak -%patch1 -p1 -b .proxysettings -%patch2 -p0 -b .bonobocomponent -%patch3 -p0 -b .contentid -%patch4 -p0 -b .uueheader +# 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 # Red Hat specific patches %patch11 -p1 -b .rhatify -%patch12 -p0 -b .nokde -%patch13 -p1 -b .pisock - -%patch20 -p0 -b .jacharset %patch99 -p1 -b .db3pthread -%patch100 -p1 -b .krb5lib64 -%patch101 -p0 -b .64bit + +%patch98 -p1 -b .ldaphack + +# patches sent upstream +%patch100 -p1 -b .filtergtype +%patch101 -p0 -b .addrconfig + +%patch200 -p1 -b .commandlength + +%patch500 -p0 -b .wombatsm + +mkdir -p krb5-fakeprefix/include +mkdir -p krb5-fakeprefix/lib +mkdir -p krb5-fakeprefix/%{_lib} %build +# FIXME: remove this when patch1 goes away +autoheader +autoconf ## build our db 3.1.17 cd %{buildtopdir}/%{dbdir}/build_unix @@ -165,7 +191,7 @@ cd %{buildtopdir} %endif %if %{krb5_support} -%define krb5_flags --with-krb5=/usr/kerberos +%define krb5_flags --with-krb5=%{krb5dir} %else %define krb5_flags --without-krb5 %endif @@ -182,96 +208,260 @@ cd %{buildtopdir} %define ssl_flags --enable-openssl=yes %endif -# needed for patch100 -autoconf-2.13 -patch -p1 -i %{PATCH13} - -CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS +CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS +CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/et"; 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 \ + +%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 \ --with-sub-version=" (%{version}-%{release})" \ + --with-kde-applnk-path=no \ %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags -make LIBTOOL=/usr/bin/libtool +export tagname=CC +make LIBTOOL=%{_bindir}/libtool cat /dev/null > default_user/local/Inbox/mbox %install -%makeinstall LIBTOOL=/usr/bin/libtool +rm -rf $RPM_BUILD_ROOT +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +export tagname=CC +make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -# remove static and libtool archives for importers and the like -find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; +# remove libtool archives for importers and the like 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 +# pilot conduits static and libtool bits should go away too 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 \ -# --dir $RPM_BUILD_ROOT%{_datadir}/applications \ -# --add-category X-Red-Hat-Extra \ -# --add-category Network \ -# --add-category Application \ -# $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/evolution.desktop +# scrollkeeper gets handled in %post +rm -rf $RPM_BUILD_ROOT/var/scrollkeeper # evolution is the preferred email app -ln -sf %{_datadir}/desktop-menu-patches/redhat-email.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ +ln -sf ../desktop-menu-patches/redhat-email.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ +# just keep our desktop file (#103826) +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop -%find_lang %name -%post -p /sbin/ldconfig +%find_lang %name-1.4 -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +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" +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null +done +scrollkeeper-update + +%postun +/sbin/ldconfig +scrollkeeper-update %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%files -f %{name}-1.4.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README +%{_sysconfdir}/gconf/schemas/* +%{_bindir}/* %{_datadir}/applications/* -%{_datadir}/gnome/help/evolution -%{_datadir}/gnome/ui/* -%{_datadir}/gnome/html/* -%{_datadir}/libical-evolution +%{_datadir}/gnome/help/evolution-1.4 +%{_datadir}/idl/evolution-1.4 %{_datadir}/mime-info/* -%{_datadir}/evolution -%{_datadir}/idl/*.idl -%{_datadir}/oaf/*.oaf +%dir %{_datadir}/evolution +%{_datadir}/evolution/1.4 %{_datadir}/omf/evolution %{_datadir}/pixmaps/* -%{_datadir}/images -%{_libdir}/*.so* -%{_libdir}/evolution -%{_bindir}/* -%{_sbindir}/* -%{_mandir}/man*/* +%{_libdir}/bonobo/servers/* +%dir %{_libdir}/evolution +%dir %{_libdir}/evolution/1.4 +%dir %{_libdir}/evolution/1.4/camel-providers +%dir %{_libdir}/evolution/1.4/components +%dir %{_libdir}/evolution/1.4/evolution-calendar-importers +%dir %{_libdir}/evolution/1.4/evolution-mail-importers +%{_libdir}/evolution/1.4/*/*.so +%{_libdir}/evolution/1.4/*.so.* +%{_libdir}/evolution/1.4/camel-providers/*.urls +%dir %{_libexecdir}/evolution +%{_libexecdir}/evolution/1.4 %if %{pilot_support} %{_libdir}/gnome-pilot/conduits/*.so %{_datadir}/gnome-pilot/conduits/* %endif +%files devel +%defattr(-, root, root) +%{_includedir}/evolution-1.4 +%{_libdir}/pkgconfig/*.pc +%{_libdir}/evolution/1.4/*.so +%{_libdir}/evolution/1.4/*.a +%{_libdir}/evolution/1.4/*/*.a + %changelog +* Tue Oct 28 2003 Jeremy Katz 1.4.5-7 +- fix title on composer save dialog (#108159) + +* Mon Oct 27 2003 Jeremy Katz 1.4.5-6 +- Make imap command length shorter to avoid choking some imap servers + (notably cyrus-imap). +- Make wombat session managed so that we don't hit weird bonobo activation + things. This adds a dependency on $DISPLAY for wombat. (#106826) + +* Sun Oct 19 2003 Jeremy Katz 1.4.5-5 +- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without + IPv6 support +- add patch from upstream with reply-to-list shortcut (Ctrl-l) + +* Wed Oct 15 2003 Jeremy Katz 1.4.5-4 +- really, really remove duplicate menu entry (#103826) + +* Tue Oct 14 2003 Jeremy Katz 1.4.5-3 +- Pull in some patches from upstream CVS + * Avoid division by zero with POP (X#41610) + * Don't mangle headers (X#33545) + * Prefix IPV6 numeric hosts properly (X#46006, #105028) + * Use proper function for IPV6 reverse lookups (X#46006) + * Allow timezone offset to be up to 14 hours (X#49357) + +* Mon Oct 13 2003 Jeremy Katz +- add patch from upstream CVS to fix SMTP syntax problems (#106630) +- really remove duplicate menu entry (#103826) + +* Mon Oct 6 2003 Jeremy Katz +- make redhat-email.desktop symlink relative (#104391) + +* Wed Sep 24 2003 Jeremy Katz +- add ipv6 support per dwmw2's request + +* Tue Sep 23 2003 Jeremy Katz 1.4.5-2 +- 1.4.5 + +* Wed Sep 17 2003 Jeremy Katz +- move static libs into -devel (#104399) + +* Tue Sep 16 2003 Jeremy Katz 1.4.4-7 +- filter types are gtypes, not ints (#103934) + +* Wed Sep 10 2003 Jeremy Katz 1.4.4-6 +- fix from upstream (will be in 1.4.5) to fix menu merging in the + composer with new libbonobo + +* Fri Sep 5 2003 Jeremy Katz +- remove the desktop file in Office (#103826) + +* Tue Sep 2 2003 Jeremy Katz 1.4.4-5 +- patch from upstream to fix display of some mails in + different charsets (#102899) +- add requires on newer version of ORBit2 (#103386) +- add patch from upstream (extracted by George Karabin) to use gnome-vfs + mime icon lookup where available (#102553) + +* Fri Aug 22 2003 Jeremy Katz 1.4.4-4 +- include static libs (#102834) + +* Wed Aug 6 2003 Jeremy Katz 1.4.4-3 +- add a -devel subpackage (#99376) + +* Mon Aug 4 2003 Jeremy Katz 1.4.4-1 +- 1.4.4 + +* Wed Jul 30 2003 Jeremy Katz +- buildrequires fixup from Ville Skytta (#101325) + +* Thu Jul 24 2003 Jeremy Katz 1.4.3-6 +- include tagoh's patch for printing cjk contacts (committed upstream, #99374) + +* Tue Jul 22 2003 Nalin Dahyabhai 1.4.3-5 +- rebuild + +* Tue Jul 15 2003 Jeremy Katz 1.4.3-4 +- build on all arches again + +* Mon Jul 14 2003 Jeremy Katz 1.4.3-3 +- rebuild + +* Thu Jul 10 2003 Jeremy Katz 1.4.3-1 +- 1.4.3 + +* Thu Jun 19 2003 Jeremy Katz +- make gal version dep more explicit + +* Fri Jun 13 2003 Jeremy Katz +- fix desktop file (#97162) + +* Tue Jun 10 2003 Jeremy Katz 1.4.0-2 +- rebuild +- excludearch ppc64 for now + +* Mon Jun 9 2003 Jeremy Katz 1.4.0-1 +- 1.4.0 + +* Wed Jun 5 2003 Elliot Lee +- rebuilt + +* Thu Jun 5 2003 Jeremy Katz 1.3.92-2 +- rebuild + +* Wed Jun 4 2003 Jeremy Katz +- buildrequires gettext (#92276) + +* Sun May 25 2003 Jeremy Katz 1.3.92-1 +- 1.3.92 + +* Wed May 7 2003 Jeremy Katz 1.3.3-2 +- fix default for /schemas/apps/evolution/mail/display/mime_types + +* Tue May 6 2003 Jeremy Katz 1.3.3-1 +- 1.3.3 + +* Sun May 4 2003 Jeremy Katz 1.3.2-2 +- enable pilot support +- add redhatify patch back + +* Tue Apr 22 2003 Jeremy Katz +- add a /usr/bin/evolution symlink + +* Mon Apr 21 2003 Jeremy Katz +- fix gnome-spell version requirement + +* Wed Apr 16 2003 Jeremy Katz 1.3.2-1 +- add trivial fix for evolution-mail schema key (ximian #41419) + +* Tue Apr 15 2003 Jeremy Katz +- update to 1.3 +- don't build with pilot support for now +- don't redhat-ify the summary prefs for now + +* Sun Apr 6 2003 Jeremy Katz 1.2.4-2 +- fix krb5 libdir for lib64 systems + +* Sun Apr 6 2003 Jeremy Katz 1.2.4-1 +- update to 1.2.4 + * Thu Apr 3 2003 Jeremy Katz 1.2.2-7 - oops, fix a tyop * Thu Apr 3 2003 Jeremy Katz 1.2.2-6 - add a few cleanups for 64bit cleanliness (#86347) +* Sun Mar 30 2003 Jeremy Katz +- add some buildrequires (#87612) + +* Mon Mar 24 2003 Jeremy Katz 1.2.3-1 +- update to 1.2.3 + * Wed Mar 19 2003 Jeremy Katz 1.2.2-5 - security patches from upstream - sanity check UUEncoding header before decoding (CAN-2003-0128) diff --git a/sources b/sources index 233fac3..33f898f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b237f4e38a650d096389ff54d564928d db-3.1.17.tar.bz2 -69805b56b0c6e44de26e9542554f4da3 evolution-1.2.2.tar.bz2 +5333b955839928530a1a9275f61e4d78 evolution-1.4.5.tar.gz