From 74191a078e24e648ce72f647f39f4d7f9e1a542e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 13 Jul 2010 13:56:22 +0000 Subject: [PATCH] - Update to 2.31.5 - Remove 'conduit' (removed upstream) --- .cvsignore | 2 +- evolution-2.30.1-help-contents.patch | 2 +- evolution-2.5.4-fix-conduit-dir.patch | 96 --------------------------- evolution.spec | 64 ++---------------- sources | 2 +- 5 files changed, 9 insertions(+), 157 deletions(-) delete mode 100644 evolution-2.5.4-fix-conduit-dir.patch diff --git a/.cvsignore b/.cvsignore index 819c992..a151a6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.31.3.tar.bz2 +evolution-2.31.5.tar.bz2 diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index e53d67a..1c90903 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -3,7 +3,7 @@ diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evoluti +++ 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 diff --git a/evolution-2.5.4-fix-conduit-dir.patch b/evolution-2.5.4-fix-conduit-dir.patch deleted file mode 100644 index 334564b..0000000 --- a/evolution-2.5.4-fix-conduit-dir.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -up evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.am ---- evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2008-06-15 23:20:16.000000000 -0400 -+++ evolution-2.23.4/addressbook/conduit/Makefile.am 2008-07-18 09:10:29.000000000 -0400 -@@ -25,7 +25,7 @@ e-address.conduit: e-address.conduit.in - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-address.conduit - - BUILT_SOURCES = $(conduit_DATA) -diff -up evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.in ---- evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir 2008-06-16 07:11:50.000000000 -0400 -+++ evolution-2.23.4/addressbook/conduit/Makefile.in 2008-07-18 09:10:29.000000000 -0400 -@@ -421,7 +421,7 @@ libeaddress_conduit_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-address.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.am ---- evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/calendar/Makefile.am 2008-07-18 09:10:29.000000000 -0400 -@@ -28,7 +28,7 @@ e-calendar.conduit: e-calendar.conduit.i - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar.conduit - - BUILT_SOURCES = $(conduit_DATA) -diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.in ---- evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/calendar/Makefile.in 2008-07-18 09:13:04.000000000 -0400 -@@ -426,7 +426,7 @@ libecalendar_conduit_la_LIBADD = \ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.am ---- evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/memo/Makefile.am 2008-07-18 09:10:29.000000000 -0400 -@@ -28,7 +28,7 @@ e-memo.conduit: e-memo.conduit.in - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo.conduit - - BUILT_SOURCES = $(conduit_DATA) -diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.in ---- evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/memo/Makefile.in 2008-07-18 09:12:17.000000000 -0400 -@@ -424,7 +424,7 @@ libememo_conduit_la_LIBADD = \ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.am ---- evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/todo/Makefile.am 2008-07-18 09:10:29.000000000 -0400 -@@ -28,7 +28,7 @@ e-todo.conduit: e-todo.conduit.in - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit - - BUILT_SOURCES = $(conduit_DATA) -diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.in ---- evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/todo/Makefile.in 2008-07-18 09:11:53.000000000 -0400 -@@ -424,7 +424,7 @@ libetodo_conduit_la_LIBADD = \ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) diff --git a/evolution.spec b/evolution.spec index d07e171..344c4b3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -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_version} # 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 or other -PalmOS devices with %{name}. -%endif - %package bogofilter Group: Applications/Productivity Summary: Bogofilter plugin for Evolution @@ -233,7 +205,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %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_DEPRECATED -I%{_includedir}/et -Wno-sign-com --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}/evolution -name '*.la' -exec rm {} \; # 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 - 2.31.5-1.fc14 +- Update to 2.31.5 +- Remove 'conduit' (removed upstream) + * Mon Jun 07 2010 Milan Crha - 2.31.3-1.fc14 - Update to 2.31.3 diff --git a/sources b/sources index ec4116f..7cb2a79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -006ae66cf24385195ad6bf439f79b0c9 evolution-2.31.3.tar.bz2 +59a9c75d808788fa9eacce4a757b04fe evolution-2.31.5.tar.bz2