rpms/evolution/devel .cvsignore, 1.132, 1.133 evolution-2.30.1-help-contents.patch, 1.1, 1.2 evolution.spec, 1.449, 1.450 sources, 1.132, 1.133 evolution-2.5.4-fix-conduit-dir.patch, 1.4, NONE
Milan Crha
mcrha at fedoraproject.org
Tue Jul 13 13:56:22 UTC 2010
Author: mcrha
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12500
Modified Files:
.cvsignore evolution-2.30.1-help-contents.patch evolution.spec
sources
Removed Files:
evolution-2.5.4-fix-conduit-dir.patch
Log Message:
* Tue Jul 13 2010 Milan Crha <mcrha at redhat.com> - 2.31.5-1.fc14
- Update to 2.31.5
- Remove 'conduit' (removed upstream)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- .cvsignore 7 Jun 2010 12:04:51 -0000 1.132
+++ .cvsignore 13 Jul 2010 13:56:21 -0000 1.133
@@ -1 +1 @@
-evolution-2.31.3.tar.bz2
+evolution-2.31.5.tar.bz2
evolution-2.30.1-help-contents.patch:
e-shell-window-actions.c | 8 ++++++++
1 file changed, 8 insertions(+)
Index: evolution-2.30.1-help-contents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.30.1-help-contents.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- evolution-2.30.1-help-contents.patch 8 May 2010 15:10:00 -0000 1.1
+++ evolution-2.30.1-help-contents.patch 13 Jul 2010 13:56:21 -0000 1.2
@@ -3,7 +3,7 @@ diff -up evolution-2.30.1.2/shell/e-shel
+++ evolution-2.30.1.2/shell/e-shell-window-actions.c 2010-05-07 21:29:06.269059830 -0400
@@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo
if (path == NULL)
- gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE);
+ gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
g_free (path);
+
+ /* Viewing user documentation requires the evolution-help
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- evolution.spec 7 Jun 2010 16:53:35 -0000 1.449
+++ evolution.spec 13 Jul 2010 13:56:21 -0000 1.450
@@ -4,13 +4,11 @@
%define gnome_desktop_version 2.26.0
%define gnome_doc_utils_version 0.8.0
%define gnome_icon_theme_version 2.19.91
-%define gnome_pilot_version 2.0.15
%define gtk2_version 2.20.0
%define gtkhtml_version 3.31.2
%define intltool_version 0.35.5
%define libgdata_version 0.6.3
%define libgweather_version 2.25.4
-%define pilot_link_version 2:0.12.1
%define soup_version 2.4.0
%define evo_base_version 3.0
@@ -28,18 +26,13 @@
%else
%define nm_support 0
%endif
-%ifarch s390 s390x
-%define build_conduits 0
-%else
-%define build_conduits 1
-%endif
%define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins
### Abstract ###
Name: evolution
-Version: 2.31.3
+Version: 2.31.5
Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
@@ -56,11 +49,6 @@ Obsoletes: libgal2 <= %{last_libgal2_ver
# bad hack
Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
-# Move .conduit files from share to lib (for the sake of multilib).
-# This patch effects other parts of evolution.spec and so is necessary
-# for a successful build.
-Patch11: evolution-2.5.4-fix-conduit-dir.patch
-
# RH bug #176400
Patch12: evolution-2.9.1-im-context-reset.patch
@@ -124,10 +112,6 @@ BuildRequires: gstreamer-devel
BuildRequires: openldap-devel >= 2.0.11
%endif
-%if %{build_conduits}
-BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
-%endif
-
%if %{krb5_support}
BuildRequires: krb5-devel
# tweak for krb5 1.2 vs 1.3
@@ -180,18 +164,6 @@ BuildArch: noarch
%description help
This package contains user documentation for %{name}.
-%if %{build_conduits}
-%package conduits
-Group: Applications/Communications
-Summary: gnome-pilot conduits for %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: gnome-pilot >= %{gnome_pilot_version}
-
-%description conduits
-This package contains conduits for synchronizing PalmPilot<tm> or other
-PalmOS<tm> devices with %{name}.
-%endif
-
%package bogofilter
Group: Applications/Productivity
Summary: Bogofilter plugin for Evolution
@@ -233,7 +205,6 @@ This package contains the plugin to impo
%prep
%setup -q -n evolution-%{version}
%patch10 -p1 -b .ldaphack
-%patch11 -p1 -b .fix-conduit-dir
%patch12 -p1 -b .im-context-reset
%patch13 -p1 -b .help-contents
@@ -254,12 +225,6 @@ done
%define ldap_flags --without-openldap
%endif
-%if %{build_conduits}
-%define pilot_flags --enable-pilot-conduits
-%else
-%define pilot_flags --disable-pilot-conduits
-%endif
-
%if %{krb5_support}
%define krb5_flags --with-krb5=%{krb5dir}
%else
@@ -280,7 +245,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPR
--enable-gtk-doc \
--with-sub-version=" (%{version}-%{release})" \
--with-kde-applnk-path=no \
- %ldap_flags %pilot_flags %krb5_flags %ssl_flags \
+ %ldap_flags %krb5_flags %ssl_flags \
--enable-plugins=all
export tagname=CC
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
@@ -328,10 +293,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolutio
# remove statically built libraries:
find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
-# 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
-
# remove additional things we don't want
%if ! %{inline_audio_support}
%{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \
@@ -596,7 +557,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/evolution-shell.pc
%{_libdir}/evolution/%{evo_base_version}/libcomposer.so
%{_libdir}/evolution/%{evo_base_version}/libeabutil.so
-%{_libdir}/evolution/%{evo_base_version}/libeconduit.so
%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so
%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so
%{_libdir}/evolution/%{evo_base_version}/libemformat.so
@@ -622,22 +582,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root)
%dir %{_datadir}/omf/evolution
-%if %{build_conduits}
-%files conduits
-%defattr(-, root, root)
-%dir %{_libdir}/evolution/%{evo_base_version}/conduits
-%{_libdir}/evolution/%{evo_base_version}/libeconduit.so.*
-%{_libdir}/evolution/%{evo_base_version}/conduits/libeaddress_conduit.so
-%{_libdir}/evolution/%{evo_base_version}/conduits/libecalendar_common_conduit.so
-%{_libdir}/evolution/%{evo_base_version}/conduits/libecalendar_conduit.so
-%{_libdir}/evolution/%{evo_base_version}/conduits/libememo_conduit.so
-%{_libdir}/evolution/%{evo_base_version}/conduits/libetodo_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-address.conduit
-%{_libdir}/gnome-pilot/conduits/e-calendar.conduit
-%{_libdir}/gnome-pilot/conduits/e-memo.conduit
-%{_libdir}/gnome-pilot/conduits/e-todo.conduit
-%endif
-
%files bogofilter
%defattr(-, root, root)
%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
@@ -662,6 +606,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Jul 13 2010 Milan Crha <mcrha at redhat.com> - 2.31.5-1.fc14
+- Update to 2.31.5
+- Remove 'conduit' (removed upstream)
+
* Mon Jun 07 2010 Milan Crha <mcrha at redhat.com> - 2.31.3-1.fc14
- Update to 2.31.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- sources 7 Jun 2010 12:04:52 -0000 1.132
+++ sources 13 Jul 2010 13:56:22 -0000 1.133
@@ -1 +1 @@
-006ae66cf24385195ad6bf439f79b0c9 evolution-2.31.3.tar.bz2
+59a9c75d808788fa9eacce4a757b04fe evolution-2.31.5.tar.bz2
--- evolution-2.5.4-fix-conduit-dir.patch DELETED ---
More information about the scm-commits
mailing list