Sync with rawhide
This commit is contained in:
Richard Hughes
parent
6fd704e803
commit
8a89d52cf6
2 changed files with 67 additions and 93 deletions
|
|
@ -1,21 +0,0 @@
|
|||
diff -up evolution-3.10.0/shell/e-shell-window-actions.c.help-contents evolution-3.10.0/shell/e-shell-window-actions.c
|
||||
--- evolution-3.10.0/shell/e-shell-window-actions.c.help-contents 2013-09-07 18:34:59.000000000 +0200
|
||||
+++ evolution-3.10.0/shell/e-shell-window-actions.c 2013-10-10 08:51:03.863987108 +0200
|
||||
@@ -1414,6 +1414,17 @@ e_shell_window_actions_init (EShellWindo
|
||||
if (path == NULL)
|
||||
gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
|
||||
g_free (path);
|
||||
+
|
||||
+ /* Viewing user documentation requires the evolution-help
|
||||
+ * Fedora package. Look for one of the files it installs. */
|
||||
+ path = g_build_filename (
|
||||
+ EVOLUTION_DATADIR, "help", "C",
|
||||
+ PACKAGE, "index.page", NULL);
|
||||
+ if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
|
||||
+ gtk_action_set_visible (ACTION (CONTENTS), FALSE);
|
||||
+ gtk_action_set_sensitive (ACTION (CONTENTS), FALSE);
|
||||
+ }
|
||||
+ g_free (path);
|
||||
}
|
||||
|
||||
GtkWidget *
|
||||
139
evolution.spec
139
evolution.spec
|
|
@ -1,6 +1,6 @@
|
|||
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
||||
|
||||
%define glib2_version 2.34.0
|
||||
%define glib2_version 2.36.0
|
||||
%define gtk3_version 3.4.0
|
||||
%define gtkhtml_version 4.5.2
|
||||
%define gnome_desktop_version 2.91.3
|
||||
|
|
@ -10,20 +10,20 @@
|
|||
%define libgdata_version 0.10.0
|
||||
%define libgweather_version 3.5.0
|
||||
%define libsoup_version 2.40.3
|
||||
%define clutter_gtk_version 0.10
|
||||
%define webkit_version 1.8.0
|
||||
|
||||
%define evo_base_version 3.10
|
||||
%define evo_base_version 3.12
|
||||
|
||||
%define last_anjal_version 0.3.2-3
|
||||
%define last_libgal2_version 2:2.5.3-2
|
||||
%define last_evo_nm_version 3.5.0
|
||||
|
||||
%define inline_audio_support 1
|
||||
%define ldap_support 1
|
||||
%define libnotify_support 1
|
||||
%define libpst_support 1
|
||||
%define krb5_support 1
|
||||
|
||||
# Coverity scan can override this to 0, to skip checking in gtk-doc generated code
|
||||
%{!?with_docs: %define with_docs 1}
|
||||
|
||||
%define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ Release: 1%{?dist}
|
|||
Group: Applications/Productivity
|
||||
Summary: Mail and calendar client for GNOME
|
||||
License: GPLv2+ and GFDL
|
||||
URL: http://projects.gnome.org/evolution/
|
||||
URL: https://wiki.gnome.org/Apps/Evolution
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
Source: http://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz
|
||||
|
||||
|
|
@ -48,72 +48,68 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
|
|||
# bad hack
|
||||
Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
|
||||
|
||||
# RH bug #589555
|
||||
Patch02: evolution-2.30.1-help-contents.patch
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
||||
Requires: gvfs
|
||||
Requires: gtkspell3
|
||||
Requires: highlight
|
||||
|
||||
### Build Dependencies ###
|
||||
|
||||
BuildRequires: atk-devel
|
||||
BuildRequires: autoconf >= 2.59
|
||||
BuildRequires: automake >= 1.9
|
||||
BuildRequires: cairo-gobject-devel
|
||||
BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version}
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: evolution-data-server-devel >= %{version}
|
||||
BuildRequires: gettext
|
||||
BuildRequires: glib2-devel >= %{glib2_version}
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version}
|
||||
BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
|
||||
BuildRequires: gnome-icon-theme-devel >= %{gnome_icon_theme_version}
|
||||
BuildRequires: gnome-online-accounts
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: gtk3-devel >= %{gtk3_version}
|
||||
BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
|
||||
BuildRequires: highlight
|
||||
BuildRequires: intltool >= %{intltool_version}
|
||||
BuildRequires: itstool
|
||||
BuildRequires: libcanberra-devel
|
||||
BuildRequires: libgdata-devel >= %{libgdata_version}
|
||||
BuildRequires: libgweather-devel >= %{libgweather_version}
|
||||
BuildRequires: libpst-devel
|
||||
BuildRequires: libsoup-devel >= %{libsoup_version}
|
||||
BuildRequires: libtool >= 1.5
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: nspr-devel
|
||||
BuildRequires: nss-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: webkitgtk3-devel >= %{webkit_version}
|
||||
BuildRequires: yelp-tools
|
||||
|
||||
%if %{inline_audio_support}
|
||||
BuildRequires: gstreamer1-devel
|
||||
%endif
|
||||
BuildRequires: pkgconfig(atk)
|
||||
BuildRequires: pkgconfig(cairo-gobject)
|
||||
BuildRequires: pkgconfig(camel-1.2) >= %{version}
|
||||
BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
|
||||
BuildRequires: pkgconfig(gcr-3)
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
|
||||
BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
|
||||
BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
|
||||
BuildRequires: pkgconfig(gnome-icon-theme) >= %{gnome_icon_theme_version}
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas)
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
|
||||
BuildRequires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version}
|
||||
BuildRequires: pkgconfig(gtkspell3-3.0)
|
||||
BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
|
||||
BuildRequires: pkgconfig(libcanberra-gtk3)
|
||||
BuildRequires: pkgconfig(libebackend-1.2) >= %{version}
|
||||
BuildRequires: pkgconfig(libebook-1.2) >= %{version}
|
||||
BuildRequires: pkgconfig(libecal-1.2) >= %{version}
|
||||
BuildRequires: pkgconfig(libedataserver-1.2) >= %{version}
|
||||
BuildRequires: pkgconfig(libgdata) >= %{libgdata_version}
|
||||
BuildRequires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version}
|
||||
BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(nspr)
|
||||
BuildRequires: pkgconfig(nss)
|
||||
BuildRequires: pkgconfig(shared-mime-info)
|
||||
BuildRequires: pkgconfig(webkitgtk-3.0) >= %{webkit_version}
|
||||
|
||||
%if %{ldap_support}
|
||||
BuildRequires: openldap-devel >= 2.0.11
|
||||
%endif
|
||||
|
||||
%if %{krb5_support}
|
||||
BuildRequires: krb5-devel
|
||||
# tweak for krb5 1.2 vs 1.3
|
||||
%define krb5dir /usr/kerberos
|
||||
#define krb5dir `pwd`/krb5-fakeprefix
|
||||
%endif
|
||||
|
||||
%if %{libnotify_support}
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
%endif
|
||||
|
||||
%if %{libpst_support}
|
||||
BuildRequires: libpst-devel
|
||||
BuildRequires: pkgconfig(libpst)
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
|
@ -126,13 +122,19 @@ personal information-management tool.
|
|||
Group: Development/Libraries
|
||||
Summary: Development files for building against %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: evolution-data-server-devel >= %{version}
|
||||
Requires: gtk3-devel >= %{gtk3_version}
|
||||
Requires: gtkhtml3-devel >= %{gtkhtml_version}
|
||||
Requires: libgdata-devel >= %{libgdata_version}
|
||||
Requires: libgweather-devel >= %{libgweather_version}
|
||||
Requires: libsoup-devel >= %{libsoup_version}
|
||||
Requires: libxml2-devel
|
||||
Requires: pkgconfig(camel-1.2) >= %{version}
|
||||
Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
|
||||
Requires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version}
|
||||
Requires: pkgconfig(gtkspell3-3.0)
|
||||
Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
|
||||
Requires: pkgconfig(libebackend-1.2) >= %{version}
|
||||
Requires: pkgconfig(libebook-1.2) >= %{version}
|
||||
Requires: pkgconfig(libecal-1.2) >= %{version}
|
||||
Requires: pkgconfig(libedataserver-1.2) >= %{version}
|
||||
Requires: pkgconfig(libgdata) >= %{libgdata_version}
|
||||
Requires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version}
|
||||
Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
|
||||
Requires: pkgconfig(libxml-2.0)
|
||||
Obsoletes: libgal2-devel <= %{last_libgal2_version}
|
||||
|
||||
%description devel
|
||||
|
|
@ -148,6 +150,7 @@ BuildArch: noarch
|
|||
%description devel-docs
|
||||
This package contains developer documentation for Evolution.
|
||||
|
||||
%if %{with_docs}
|
||||
%package help
|
||||
Group: Applications/Productivity
|
||||
Summary: Help files for %{name}
|
||||
|
|
@ -157,6 +160,7 @@ BuildArch: noarch
|
|||
|
||||
%description help
|
||||
This package contains user documentation for %{name}.
|
||||
%endif
|
||||
|
||||
%package bogofilter
|
||||
Group: Applications/Productivity
|
||||
|
|
@ -200,11 +204,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
|
|||
%prep
|
||||
%setup -q -n evolution-%{version}
|
||||
%patch01 -p1 -b .ldaphack
|
||||
%patch02 -p1 -b .help-contents
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
mkdir -p krb5-fakeprefix/%{_lib}
|
||||
|
||||
# Remove the welcome email from Novell
|
||||
for inbox in mail/default/*/Inbox; do
|
||||
|
|
@ -219,12 +218,6 @@ done
|
|||
%define ldap_flags --without-openldap
|
||||
%endif
|
||||
|
||||
%if %{krb5_support}
|
||||
%define krb5_flags --with-krb5=%{krb5dir}
|
||||
%else
|
||||
%define krb5_flags --without-krb5
|
||||
%endif
|
||||
|
||||
%define ssl_flags --enable-nss=yes --enable-smime=yes
|
||||
|
||||
if ! pkg-config --exists nss; then
|
||||
|
|
@ -232,8 +225,14 @@ if ! pkg-config --exists nss; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
%if %{with_docs}
|
||||
%define gtkdoc_flags --enable-gtk-doc
|
||||
%else
|
||||
%define gtkdoc_flags --disable-gtk-doc
|
||||
%endif
|
||||
|
||||
CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
|
||||
|
||||
# Regenerate configure to pick up configure.ac changes
|
||||
aclocal -I m4
|
||||
|
|
@ -245,13 +244,14 @@ autoconf
|
|||
|
||||
%configure \
|
||||
--disable-maintainer-mode \
|
||||
--enable-gtk-doc \
|
||||
--with-sub-version=" (%{version}-%{release})" \
|
||||
%ldap_flags %krb5_flags %ssl_flags \
|
||||
%ldap_flags %ssl_flags %gtkdoc_flags \
|
||||
--enable-plugins=all
|
||||
export tagname=CC
|
||||
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
|
||||
|
||||
%if %{with_docs}
|
||||
|
||||
# Strip unneeded translations from .mo files.
|
||||
# This reduces the RPM size by several megabytes.
|
||||
cd po
|
||||
|
|
@ -281,6 +281,8 @@ for f in $helpdir/C/figures/*.png; do
|
|||
done
|
||||
done
|
||||
|
||||
# %{with_docs}
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
|
@ -295,11 +297,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 {} \;
|
||||
|
||||
# remove additional things we don't want
|
||||
%if ! %{inline_audio_support}
|
||||
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so
|
||||
%endif
|
||||
|
||||
%find_lang evolution-%{evo_base_version} --all-name --with-gnome
|
||||
|
||||
grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang
|
||||
|
|
@ -409,10 +406,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so
|
||||
%{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so
|
||||
|
||||
%if %{inline_audio_support}
|
||||
%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so
|
||||
%endif
|
||||
|
||||
# Shared libraries:
|
||||
%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-composer.so
|
||||
%{_libdir}/evolution/%{evo_base_version}/libeabutil.so
|
||||
|
|
@ -495,20 +488,22 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_includedir}/evolution-%{evo_base_version}
|
||||
%{_libdir}/pkgconfig/evolution-calendar-3.0.pc
|
||||
%{_libdir}/pkgconfig/evolution-mail-3.0.pc
|
||||
%{_libdir}/pkgconfig/evolution-plugin-3.0.pc
|
||||
%{_libdir}/pkgconfig/evolution-shell-3.0.pc
|
||||
%{_libdir}/pkgconfig/libemail-engine.pc
|
||||
|
||||
%files devel-docs
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{_datadir}/gtk-doc/html/evolution-mail-composer
|
||||
%doc %{_datadir}/gtk-doc/html/evolution-mail-engine
|
||||
%doc %{_datadir}/gtk-doc/html/evolution-mail-formatter
|
||||
%doc %{_datadir}/gtk-doc/html/evolution-shell
|
||||
%doc %{_datadir}/gtk-doc/html/evolution-util
|
||||
|
||||
%if %{with_docs}
|
||||
%files help -f help.lang
|
||||
%defattr(-, root, root)
|
||||
%dir %{_datadir}/help/*/evolution
|
||||
%endif
|
||||
|
||||
%files bogofilter
|
||||
%defattr(-, root, root)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue