Author: freetz                       Date: Mon Jul  4 18:41:18 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 2.3.4

---- Files affected:
SPECS:
   evolution.spec (1.171 -> 1.171.2.1) 

---- Diffs:

================================================================
Index: SPECS/evolution.spec
diff -u SPECS/evolution.spec:1.171 SPECS/evolution.spec:1.171.2.1
--- SPECS/evolution.spec:1.171  Sun Jun  5 23:10:34 2005
+++ SPECS/evolution.spec        Mon Jul  4 20:41:12 2005
@@ -16,35 +16,35 @@
 Summary(pt_BR):        Cliente de email integrado com calendário e catálogo de 
endereços
 Summary(zh_CN):        Evolution - 
GNOME2¸öČ˺͚¤×÷×éĐĹϢšÜŔ횤žß(°üŔ¨ľç×ÓÓĘźţŁŹČŐŔúşÍľŘÖˇąĄ)
 Name:          evolution
-Version:       2.2.3
-Release:       1.1
+Version:       2.3.4
+Release:       1
 License:       GPL v2
 Group:         Applications/Mail
-Source0:       
http://ftp.gnome.org/pub/gnome/sources/evolution/2.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 1e01511c78b2dd0dcb8cf83521c167af
+Source0:       
http://ftp.gnome.org/pub/gnome/sources/evolution/2.3/%{name}-%{version}.tar.bz2
+# Source0-md5: 0f1a008691ba134b4b3379681965c83a
 Source1:       %{name}-gg16.png
 Source2:       %{name}-gg48.png
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-gnome-icon-theme.patch
 Patch2:                %{name}-GG-IM.patch
 Patch3:                %{name}-desktop.patch
-Patch4:                %{name}-dbus.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
 BuildRequires: GConf2-devel >= 2.10.0
 BuildRequires: ORBit2-devel >= 1:2.12.1
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: bison
-BuildRequires: evolution-data-server-devel >= 1.2.2
+BuildRequires: dbus-glib-devel
+BuildRequires: evolution-data-server-devel >= 1.3.4
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.5
-BuildRequires: gal-devel >= 1:2.4.3
+BuildRequires: gal-devel >= 1:2.5.3
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.8.0
 %{?with_pilot:BuildRequires:   gnome-pilot-devel >= 2.0.13}
 BuildRequires: gnome-vfs2-devel >= 2.10.0-2
 BuildRequires: gtk-doc >= 1.3
-BuildRequires: gtkhtml-devel >= 3.6.2
+BuildRequires: gtkhtml-devel >= 3.7.3
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: intltool >= 0.33
 BuildRequires: libglade2-devel >= 1:2.5.1
@@ -69,9 +69,9 @@
 Requires:      %{name}-component = %{version}-%{release}
 Requires:      GConf2 >= 2.10.0
 Requires:      bonobo-activation
-Requires:      evolution-data-server >= 1.2.3
-Requires:      gal >= 1:2.4.3
-Requires:      gtkhtml >= 3.6.2
+Requires:      evolution-data-server >= 1.3.4
+Requires:      gal >= 1:2.5.3
+Requires:      gtkhtml >= 3.7.3
 Requires:      hicolor-icon-theme
 Requires:      libglade2 >= 1:2.5.1
 Requires:      psmisc
@@ -212,7 +212,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__glib_gettextize}
@@ -277,7 +276,7 @@
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
 
-ln -sf evolution-2.2 $RPM_BUILD_ROOT%{_bindir}/evolution
+ln -sf evolution-2.4 $RPM_BUILD_ROOT%{_bindir}/evolution
 
 %find_lang %{name} --all-name --with-gnome
 
@@ -286,11 +285,11 @@
 
 %post
 /sbin/ldconfig
-%gconf_schema_install apps_evolution_shell-2.2.schemas
+%gconf_schema_install apps_evolution_shell-2.4.schemas
 %scrollkeeper_update_post
 
 %preun
-%gconf_schema_uninstall apps_evolution_shell-2.2.schemas
+%gconf_schema_uninstall apps_evolution_shell-2.4.schemas
 
 %postun
 /sbin/ldconfig
@@ -298,28 +297,30 @@
 
 %post mail
 /sbin/ldconfig
-%gconf_schema_install evolution-mail-2.2.schemas
+%gconf_schema_install apps-evolution-mail-prompts-checkdefault-2.4.schemas
+%gconf_schema_install evolution-mail-2.4.schemas
 
 %preun mail
-%gconf_schema_uninstall evolution-mail-2.2.schemas
+%gconf_schema_uninstall apps-evolution-mail-prompts-checkdefault-2.4.schemas
+%gconf_schema_uninstall evolution-mail-2.4.schemas
 
 %postun mail -p /sbin/ldconfig
 
 %post addressbook
 /sbin/ldconfig
-%gconf_schema_install apps_evolution_addressbook-2.2.schemas
+%gconf_schema_install apps_evolution_addressbook-2.4.schemas
 
 %preun addressbook
-%gconf_schema_uninstall apps_evolution_addressbook-2.2.schemas
+%gconf_schema_uninstall apps_evolution_addressbook-2.4.schemas
 
 %postun addressbook -p /sbin/ldconfig
 
 %post calendar
 /sbin/ldconfig
-%gconf_schema_install apps_evolution_calendar-2.2.schemas
+%gconf_schema_install apps_evolution_calendar-2.4.schemas
 
 %preun calendar
-%gconf_schema_uninstall apps_evolution_calendar-2.2.schemas
+%gconf_schema_uninstall apps_evolution_calendar-2.4.schemas
 
 %postun calendar -p /sbin/ldconfig
 
@@ -327,20 +328,22 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS* README
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/evolution/*/libeconduit.so.*
-%attr(755,root,root) %{_libdir}/evolution/*/libemiscwidgets.so.*
-%attr(755,root,root) %{_libdir}/evolution/*/libeshell.so.*
-%attr(755,root,root) %{_libdir}/evolution/*/libeutil.so.*
-%attr(755,root,root) %{_libdir}/evolution/*/libevolution-a11y.so.*
-%attr(755,root,root) %{_libdir}/evolution/*/libevolution-importer.so.*
-%attr(755,root,root) %{_libdir}/evolution/*/libevolution-widgets-a11y.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libeabutil.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libeconduit.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libecontacteditor.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libecontactlisteditor.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libefilterbar.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libemiscwidgets.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libeshell.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libessmime.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libetable.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libetext.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libetimezonedialog.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libeutil.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libevolution-a11y.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libevolution-importer.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libevolution-smime.so.*
+%attr(755,root,root) %{_libdir}/evolution/*/libevolution-widgets-a11y.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libfilter.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/libmenus.so.*
 %attr(755,root,root) %{_libdir}/evolution/*/evolution-alarm-notify
@@ -376,8 +379,8 @@
 %{_datadir}/idl/evolution-*/Evolution-ConfigControl.idl
 %{_datadir}/idl/evolution-*/Evolution-Offline.idl
 %{_datadir}/idl/evolution-*/Evolution-Shell.idl
-%{_datadir}/idl/evolution-*/Evolution-Wizard.idl
-%{_datadir}/idl/evolution-*/Evolution-common.idl
+#%{_datadir}/idl/evolution-*/Evolution-Wizard.idl
+#%{_datadir}/idl/evolution-*/Evolution-common.idl
 %{_datadir}/idl/evolution-*/Evolution.idl
 %{_datadir}/idl/evolution-*/GNOME_Evolution_Importer.idl
 %{_desktopdir}/*
@@ -412,7 +415,8 @@
 %lang(zh_CN) %{_datadir}/evolution/*/default/zh_CN/mail
 %{_datadir}/idl/evolution-*/Composer.idl
 %{_datadir}/idl/evolution-*/Evolution-Composer.idl
-%{_sysconfdir}/gconf/schemas/evolution-mail-*.schemas
+%{_datadir}/idl/evolution-*/Evolution-Mail.idl
+%{_sysconfdir}/gconf/schemas/*-mail-*.schemas
 
 %files addressbook
 %defattr(644,root,root,755)
@@ -454,6 +458,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.171.2.1  2005/07/04 18:41:12  freetz
+- 2.3.4
+
 Revision 1.171  2005/06/05 21:10:34  qboosh
 - merged freetz's changes from AC-branch:
   - 2.2.3, updated BRs/Rs, added pretty gg icons, added german default Inbox
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/evolution.spec?r1=1.171&r2=1.171.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to