- back to 1.4.5

Changed files:
    evolution.spec -> 1.110

diff --git a/evolution.spec b/evolution.spec
index 616b7c62b5824496cb7243323256883b4d18d381..1907b7a1100d479bc11e5ce06aae92c9cd0970a0 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,20 +1,38 @@
 
 %bcond_without ldap
 
-%define                mver            1.5
+%define                mver            1.4
 %define                subver  5
+%define                _db3ver 3.1.17
+%define                _dbdir  $RPM_BUILD_DIR/%{name}-%{version}/db-%{_db3ver}
 
 Summary:       The GNOME2 Email/Calendar/Addressbook Suite
 Summary(pl):   Klient poczty dla GNOME2/Kalendarz/Ksi±¿ka Adresowa
 Summary(pt_BR):        Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN):        Evolution - GNOME2¸öÈ˺͹¤×÷×éÐÅÏ¢¹ÜÀí¹¤¾ß(°üÀ¨µç×ÓÓʼþ£¬ÈÕÀúºÍµØÖ·±¡)
 Name:          evolution
-Version:       %{mver}
-Release:       1
+Version:       %{mver}.%{subver}
+Release:       6
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/%{mver}/%{name}-%{version}.tar.bz2
-# Source0-md5: cc820ffb5c9e91ad79d94e700262c418
+# Source0-md5: f16a86d6eaa9d9683f215586fcdac374
+Source1:       http://www.sleepycat.com/update/snapshot/db-%{_db3ver}.tar.gz
+# Source1-md5: 5baeb94fb934d0bf783ea42117c400be
+Patch0:                %{name}-nolibs.patch
+Patch1:                %{name}-configure_in.patch
+Patch2:                %{name}-desktop.patch
+Patch3:                %{name}-pldify.patch
+Patch4:                %{name}-iconv_flush.patch
+Patch5:                %{name}-div_by_zero.patch
+Patch6:                %{name}-ipv6.patch
+Patch7:                %{name}-ipv6_smtp.patch
+Patch8:                %{name}-timezone_offsets.patch
+Patch9:                %{name}-gethostbyaddr.patch
+Patch10:       %{name}-addrconfig.patch
+Patch11:       %{name}-libpcs_libpas.patch
+Patch12:       %{name}-no-static-in-shared.patch
+Patch13:       %{name}-attachment_require_terminal.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
 BuildRequires: GConf2-devel
 BuildRequires: ORBit2-devel >= 2.8.0
@@ -23,23 +41,22 @@ BuildRequires:      automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.5
-BuildRequires: gal-devel >= 2.1.1
+BuildRequires: gal-devel >= 1:1.99.9
 BuildRequires: gettext-devel
 BuildRequires: gnome-common
 BuildRequires: gnome-pilot-devel >= 2.0.0
 BuildRequires: gnome-vfs2-devel >= 2.4.0
 BuildRequires: gtk-doc >= 1.1
-BuildRequires: gtkhtml-devel >= 3.1.4
+BuildRequires: gtkhtml-devel >= 3.0.8
 BuildRequires: intltool >= 0.18
 BuildRequires: libglade2-devel
 BuildRequires: libgnomeprintui-devel >= 2.4.0
 BuildRequires: libgnomeui-devel >= 2.4.0
-BuildRequires: libsoup-devel >= 2.1.2
+BuildRequires: libsoup-devel >= 1.99.26-3
 BuildRequires: libtool
 BuildRequires: libxml2
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
-BuildRequires: evolution-data-server >= 0.0.3
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.0.0}
 BuildRequires: openssl-devel >= 0.9.7c
 BuildRequires: pilot-link-devel >= 0.11.4
@@ -52,8 +69,8 @@ Requires(post,postun):        /usr/bin/scrollkeeper-update
 Requires(post):                GConf2
 Requires:      GConf2
 Requires:      bonobo-activation
-Requires:      gal >= 2.1.1
-Requires:      gtkhtml >= 3.1.4
+Requires:      gal >= 1:1.99.9
+Requires:      gtkhtml >= 3.0.8
 Requires:      libglade2
 Requires:      psmisc
 Requires:      scrollkeeper >= 0.1.4
@@ -83,13 +100,13 @@ Group:             Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      cyrus-sasl-devel
 Requires:      freetype-devel
-Requires:      gal-devel >= 2.1.1
+Requires:      gal-devel >= 1:1.99.9
 Requires:      gnome-vfs2-devel >= 2.4.0
-Requires:      gtkhtml-devel >= 3.1.4
+Requires:      gtkhtml-devel >= 3.0.8
 Requires:      libglade2-devel >= 2.0.1
 Requires:      libgnomeprintui-devel >= 2.4.0
 Requires:      libgnomeui-devel >= 2.4.0
-Requires:      libsoup-devel >= 2.1.2
+Requires:      libsoup-devel >= 1.99.23
 Requires:      nspr-devel
 Requires:      nss-devel
 %{?with_ldap:Requires: openldap-devel >= 2.0.0}
@@ -143,8 +160,30 @@ Palmem.
 
 %prep
 %setup -q -a1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p1
+%patch10 -p0
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
+# first build db3 (only static, C interface)
+cd %{_dbdir}/build_unix
+CFLAGS="%{rpmcflags}" \
+../dist/configure \
+       --prefix=%{_prefix} \
+       --enable-static
+%{__make}
+cd $RPM_BUILD_DIR/%{name}-%{version}
 
 # build evolution
 glib-gettextize --copy --force
@@ -154,6 +193,14 @@ intltoolize --copy --force
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+cd libical
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+# don't use -f here
+automake -a -c --foreign
+cd ..
 %configure \
        --enable-gtk-doc \
        --enable-pilot-conduits=yes \
@@ -168,6 +215,8 @@ intltoolize --copy --force
        --with-nss-libs="%{_libdir}" \
        --enable-ipv6=yes \
        --with-html-dir=%{_gtkdocdir} \
+       --with-db3-includes=%{_dbdir}/build_unix \
+       --with-db3-libs=%{_dbdir}/build_unix \
        --with-kde-applnk-path=no
 
 # hack to rebuild *.c and *.h from *.idl (check if needed with new versions)
@@ -192,10 +241,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{mver}/*/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{mver}/libemiscwidgets.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.{a,la}
 
-%find_lang %{name} --all-name
+%find_lang evolution-1.4 --with-gnome
 
 %clean
-# rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
@@ -206,7 +255,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.{a,la}
 /sbin/ldconfig
 /usr/bin/scrollkeeper-update
 
-%files -f evolution.lang
+%files -f evolution-1.4.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS* README
 %attr(755,root,root) %{_bindir}/*
@@ -214,17 +263,26 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.{a,la}
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/*.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/camel/*
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-alarm-notify
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-ldif-importer
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-vcard-importer
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-wombat
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-addressbook-clean
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-addressbook-import
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/csv2vcard
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/killev
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/load-*
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{mver}
 %dir %{_libdir}/evolution/%{mver}/camel*
 %dir %{_libdir}/evolution/%{mver}/components
-%dir %{_libdir}/evolution-mbox-upgrade
+%dir %{_libdir}/evolution/%{mver}/evolution-mail-importers
 %{_libdir}/bonobo/servers/*
 %{_libdir}/evolution/%{mver}/camel-providers/*.urls
 %dir %{_datadir}/evolution
 %dir %{_datadir}/evolution/%{mver}
 %{_datadir}/evolution/%{mver}/*.xml
+%{_datadir}/evolution/%{mver}/*.schema
+%{_datadir}/evolution/%{mver}/Locations
 %{_datadir}/evolution/%{mver}/default_user
 %{_datadir}/evolution/%{mver}/ecps
 %{_datadir}/evolution/%{mver}/etspec
@@ -232,6 +290,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.{a,la}
 %{_datadir}/evolution/%{mver}/images
 %{_datadir}/evolution/%{mver}/ui
 %{_datadir}/evolution/%{mver}/views
+%{_datadir}/evolution/%{mver}/zoneinfo
 %{_datadir}/mime-info/*
 %{_datadir}/idl/*
 %{_desktopdir}/*
@@ -249,8 +308,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.{a,la}
 
 %files static
 %defattr(644,root,root,755)
+%{_libdir}/evolution/%{mver}/*.a
 
 %files pilot
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/conduits/*
+%attr(755,root,root) %{_libdir}/gnome-pilot/conduits/*
 %{_datadir}/gnome-pilot/conduits/*