|
@@ -6,9 +6,7 @@
|
|
%define gnome_pilot_version 2.0.13
|
|
%define gnome_pilot_version 2.0.13
|
|
%define libxml2_version 2.7.6
|
|
%define libxml2_version 2.7.6
|
|
%define gtkhtml_version 4.0.0
|
|
%define gtkhtml_version 4.0.0
|
|
-%define intltool_version 0.35.5
|
|
|
|
%define last_libgal2_version 2:2.5.3-2
|
|
%define last_libgal2_version 2:2.5.3-2
|
|
-%define orbit2_version 2.14.0
|
|
|
|
%define pilot_link_version 2:0.12.1
|
|
%define pilot_link_version 2:0.12.1
|
|
%define scrollkeeper_version 0.1.4
|
|
%define scrollkeeper_version 0.1.4
|
|
%define soup_version 2.32.0
|
|
%define soup_version 2.32.0
|
|
@@ -19,13 +17,11 @@
|
|
|
|
|
|
%define evo_major 3.4
|
|
%define evo_major 3.4
|
|
|
|
|
|
-%define inline_audio_support 0
|
|
|
|
%define ldap_support 1
|
|
%define ldap_support 1
|
|
%define libnotify_support 1
|
|
%define libnotify_support 1
|
|
%define krb5_support 1
|
|
%define krb5_support 1
|
|
|
|
|
|
%define nm_support 1
|
|
%define nm_support 1
|
|
-%define build_conduits 0
|
|
|
|
%define use_mozilla_nss 1
|
|
%define use_mozilla_nss 1
|
|
|
|
|
|
# Use stricter build settings than required by upstream.
|
|
# Use stricter build settings than required by upstream.
|
|
@@ -36,7 +32,7 @@
|
|
### Abstract ###
|
|
### Abstract ###
|
|
|
|
|
|
Name: evolution
|
|
Name: evolution
|
|
-Version: 3.4.2
|
|
+Version: 3.4.3
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
License: GPLv2 and GFDL+
|
|
License: GPLv2 and GFDL+
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
@@ -66,11 +62,9 @@ Requires(post): GConf2
|
|
Requires(post): scrollkeeper >= %{scrollkeeper_version}
|
|
Requires(post): scrollkeeper >= %{scrollkeeper_version}
|
|
Requires(postun): scrollkeeper >= %{scrollkeeper_version}
|
|
Requires(postun): scrollkeeper >= %{scrollkeeper_version}
|
|
|
|
|
|
-Requires: ORBit2 >= %{orbit2_version}
|
|
|
|
Requires: dbus >= %{dbus_version}
|
|
Requires: dbus >= %{dbus_version}
|
|
Requires: evolution-data-server >= %{eds_version}
|
|
Requires: evolution-data-server >= %{eds_version}
|
|
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
|
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
|
-Requires: gnome-vfs2 >= %{gnomevfs2_version}
|
|
|
|
Requires: gnutls
|
|
Requires: gnutls
|
|
Requires: gtk3 >= 3.0.0
|
|
Requires: gtk3 >= 3.0.0
|
|
Requires: libsoup >= %{soup_version}
|
|
Requires: libsoup >= %{soup_version}
|
|
@@ -85,40 +79,32 @@ Obsoletes: libgal2 <= %{last_libgal2_version}
|
|
### Build Dependencies ###
|
|
### Build Dependencies ###
|
|
|
|
|
|
BuildRequires: GConf2-devel
|
|
BuildRequires: GConf2-devel
|
|
-BuildRequires: ORBit2-devel >= %{orbit2_version}
|
|
|
|
BuildRequires: atk-devel
|
|
BuildRequires: atk-devel
|
|
-BuildRequires: autoconf >= 2.59
|
|
|
|
-BuildRequires: automake >= 1.9
|
|
|
|
-BuildRequires: bison
|
|
|
|
-## BuildRequires: byacc
|
|
|
|
BuildRequires: dbus-devel >= %{dbus_version}
|
|
BuildRequires: dbus-devel >= %{dbus_version}
|
|
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
|
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
|
BuildRequires: desktop-file-utils
|
|
BuildRequires: desktop-file-utils
|
|
BuildRequires: evolution-data-server-devel >= %{eds_version}
|
|
BuildRequires: evolution-data-server-devel >= %{eds_version}
|
|
-## BuildRequires: flex
|
|
+BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
|
|
-BuildRequires: gettext
|
|
|
|
BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
|
|
BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
|
|
BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
|
|
BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
|
|
BuildRequires: gnutls-devel
|
|
BuildRequires: gnutls-devel
|
|
-BuildRequires: gtk-doc
|
|
+BuildRequires: gsettings-desktop-schemas-devel
|
|
BuildRequires: gtkhtml4-devel >= %{gtkhtml_version}
|
|
BuildRequires: gtkhtml4-devel >= %{gtkhtml_version}
|
|
-BuildRequires: intltool >= %{intltool_version}
|
|
|
|
-BuildRequires: libgnomecanvas-devel >= 2.0
|
|
|
|
-BuildRequires: libgnomeui-devel >= 2.0
|
|
|
|
BuildRequires: libsoup-devel >= %{soup_version}
|
|
BuildRequires: libsoup-devel >= %{soup_version}
|
|
BuildRequires: libtool >= 1.5
|
|
BuildRequires: libtool >= 1.5
|
|
BuildRequires: libxml2-devel >= %{libxml2_version}
|
|
BuildRequires: libxml2-devel >= %{libxml2_version}
|
|
-BuildRequires: pkgconfig
|
|
|
|
BuildRequires: unique3-devel >= %{unique_version}
|
|
BuildRequires: unique3-devel >= %{unique_version}
|
|
BuildRequires: libcanberra-gtk3-devel
|
|
BuildRequires: libcanberra-gtk3-devel
|
|
BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
|
BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
|
BuildRequires: gstreamer-devel >= %{gstreamer_version}
|
|
BuildRequires: gstreamer-devel >= %{gstreamer_version}
|
|
BuildRequires: gtkimageview-devel
|
|
BuildRequires: gtkimageview-devel
|
|
BuildRequires: libSM-devel
|
|
BuildRequires: libSM-devel
|
|
-BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
|
|
|
|
BuildRequires: libgdata-devel >= %{libgdata_version}
|
|
BuildRequires: libgdata-devel >= %{libgdata_version}
|
|
BuildRequires: gnome-online-accounts-devel
|
|
BuildRequires: gnome-online-accounts-devel
|
|
-BuildRequires: rarian-compat
|
|
+
|
|
|
|
+BuildRequires: bison
|
|
|
|
+BuildRequires: gettext
|
|
|
|
+BuildRequires: gtk-doc
|
|
|
|
|
|
%if %{use_mozilla_nss}
|
|
%if %{use_mozilla_nss}
|
|
BuildRequires: nspr-devel
|
|
BuildRequires: nspr-devel
|
|
@@ -127,19 +113,10 @@ BuildRequires: nss-devel
|
|
BuildRequires: openssl-devel
|
|
BuildRequires: openssl-devel
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%if %{inline_audio_support}
|
|
|
|
-# audio-inline plugin requires gstreamer to build:
|
|
|
|
-BuildRequires: gstreamer08-devel
|
|
|
|
-%endif
|
|
|
|
-
|
|
|
|
%if %{ldap_support}
|
|
%if %{ldap_support}
|
|
BuildRequires: openldap-devel >= 2.0.11
|
|
BuildRequires: openldap-devel >= 2.0.11
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%if %{build_conduits}
|
|
|
|
-BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
|
|
|
|
-%endif
|
|
|
|
-
|
|
|
|
%if %{krb5_support}
|
|
%if %{krb5_support}
|
|
BuildRequires: krb5-devel
|
|
BuildRequires: krb5-devel
|
|
# tweak for krb5 1.2 vs 1.3
|
|
# tweak for krb5 1.2 vs 1.3
|
|
@@ -196,18 +173,6 @@ This package contains user documentation for %{name}.
|
|
%description help -l ja
|
|
%description help -l ja
|
|
%{name} のユーザ用ドキュメントです.
|
|
%{name} のユーザ用ドキュメントです.
|
|
|
|
|
|
-%if %{build_conduits}
|
|
|
|
-%package conduits
|
|
|
|
-Group: Applictions/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
|
|
%package bogofilter
|
|
Summary: Bogofilter plugin for Evolution
|
|
Summary: Bogofilter plugin for Evolution
|
|
Summary(ja): Evolution 用 Bogofilter プラグイン
|
|
Summary(ja): Evolution 用 Bogofilter プラグイン
|
|
@@ -259,12 +224,6 @@ done
|
|
%define ldap_flags --without-openldap
|
|
%define ldap_flags --without-openldap
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%if %{build_conduits}
|
|
|
|
-%define pilot_flags --enable-pilot-conduits=yes
|
|
|
|
-%else
|
|
|
|
-%define pilot_flags --enable-pilot-conduits=no
|
|
|
|
-%endif
|
|
|
|
-
|
|
|
|
%if %{krb5_support}
|
|
%if %{krb5_support}
|
|
%define krb5_flags --with-krb5=%{krb5dir}
|
|
%define krb5_flags --with-krb5=%{krb5dir}
|
|
%else
|
|
%else
|
|
@@ -323,7 +282,7 @@ sed -i -e "s:-DGTK_DISABLE_DEPRECATED::" configure
|
|
--enable-gtk-doc \
|
|
--enable-gtk-doc \
|
|
--with-sub-version=" (%{version}-%{release})" \
|
|
--with-sub-version=" (%{version}-%{release})" \
|
|
--with-kde-applnk-path=no \
|
|
--with-kde-applnk-path=no \
|
|
- %ldap_flags %pilot_flags %krb5_flags %ssl_flags \
|
|
+ %ldap_flags %krb5_flags %ssl_flags \
|
|
--disable-pst-import \
|
|
--disable-pst-import \
|
|
--disable-image-inline \
|
|
--disable-image-inline \
|
|
--enable-plugins=all
|
|
--enable-plugins=all
|
|
@@ -345,16 +304,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
|
|
# remove statically built libraries:
|
|
# remove statically built libraries:
|
|
find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
|
|
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 \
|
|
|
|
- $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so
|
|
|
|
-%endif
|
|
|
|
-
|
|
|
|
# scrollkeeper gets handled in %post
|
|
# scrollkeeper gets handled in %post
|
|
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
|
|
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
|
|
|
|
|
|
@@ -548,10 +497,8 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug
|
|
%{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug
|
|
%{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so
|
|
%{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so
|
|
|
|
|
|
-%if %{inline_audio_support}
|
|
|
|
%{evo_plugin_dir}/org-gnome-audio-inline.eplug
|
|
%{evo_plugin_dir}/org-gnome-audio-inline.eplug
|
|
%{evo_plugin_dir}/liborg-gnome-audio-inline.so
|
|
%{evo_plugin_dir}/liborg-gnome-audio-inline.so
|
|
-%endif
|
|
|
|
|
|
|
|
%{evo_plugin_dir}/org-gnome-backup-restore.eplug
|
|
%{evo_plugin_dir}/org-gnome-backup-restore.eplug
|
|
%{evo_plugin_dir}/liborg-gnome-backup-restore.so
|
|
%{evo_plugin_dir}/liborg-gnome-backup-restore.so
|
|
@@ -652,21 +599,6 @@ rm -rf $RPM_BUILD_ROOT
|
|
%defattr(-, root, root)
|
|
%defattr(-, root, root)
|
|
#%dir %{_datadir}/omf/evolution
|
|
#%dir %{_datadir}/omf/evolution
|
|
|
|
|
|
-%if %{build_conduits}
|
|
|
|
-%files conduits
|
|
|
|
-%defattr(-, root, root)
|
|
|
|
-%dir %{_libdir}/evolution/%{evo_major}/conduits
|
|
|
|
-%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
|
|
|
|
-%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
|
|
|
|
-%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
|
|
|
|
-%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
|
|
|
|
-%{_libdir}/evolution/%{evo_major}/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
|
|
%files bogofilter
|
|
%defattr(-, root, root)
|
|
%defattr(-, root, root)
|
|
%{_libdir}/evolution/%{evo_major}/modules/libevolution-module-bogofilter.so
|
|
%{_libdir}/evolution/%{evo_major}/modules/libevolution-module-bogofilter.so
|
|
@@ -680,6 +612,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
|
|
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Fri Jun 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
|
|
|
|
+- new upstream release
|
|
|
|
+- add BuildRequires: gsettings-desktop-schemas-devel
|
|
|
|
+
|
|
* Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
|
|
* Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|