Browse Source

evolution-3.22.6-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11446 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 6 years ago
parent
commit
d821fd3993
1 changed files with 26 additions and 7 deletions
  1. 26 7
      e/evolution/evolution-vl.spec

+ 26 - 7
e/evolution/evolution-vl.spec

@@ -12,9 +12,9 @@
 %define libgweather_version 3.5.0
 %define gsettings_desktop_schemas_version 2.91.92
 %define webkitgtk_version 1.10.0
-%define eds_version 3.20.0
+%define eds_version 3.22.0
 
-%define evo_major 3.20
+%define evo_major 3.22
 
 %define ldap_support 1
 %define libnotify_support 1
@@ -27,16 +27,17 @@
 %define strict_build_settings 0
 
 %define evo_plugin_dir %{_libdir}/evolution/plugins
+%define web_extensions_dir %{_libdir}/evolution/web-extensions
 
 ### Abstract ###
 
 Name: evolution
-Version: 3.20.4
+Version: 3.22.6
 Release: 1%{?_dist_release}
 License: GPLv2 and GFDL+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org/projects/evolution/
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/3.20/%{name}-%{version}.tar.xz
+Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/%{evo_major}/%{name}-%{version}.tar.xz
 
 Summary: GNOME's next-generation groupware suite
 Summary(ja): GNOME 次世代グループウェアスイート
@@ -55,6 +56,9 @@ Patch13: evolution-2.5.4-fix-conduit-dir.patch
 # RH bug #176400
 Patch15: evolution-2.9.1-im-context-reset.patch
 
+# to build with libical-3
+Patch1000: evolution-libical3.patch
+
 ### Dependencies ###
 Requires: dbus >= %{dbus_version}
 Requires: evolution-data-server >= %{eds_version}
@@ -79,7 +83,8 @@ BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
 BuildRequires: gtkhtml4-devel >= %{gtkhtml_version}
 BuildRequires: libcanberra-gtk3-devel
-BuildRequires: WebKit3-gtk-devel >= %{webkitgtk_version}
+#BuildRequires: WebKit3-gtk-devel >= %{webkitgtk_version}
+BuildRequires: webkitgtk4-devel >= %{webkitgtk_version}
 BuildRequires: gstreamer1-devel >= %{gstreamer1_version}
 BuildRequires: libSM-devel
 BuildRequires: libgdata-devel >= %{libgdata_version}
@@ -206,6 +211,8 @@ SpamAssassin を使って迷惑メールをフィルタリングするための
 ##%patch13 -p1 -b .fix-conduit-dir
 %patch15 -p1 -b .im-context-reset
 
+%patch1000 -p1 -b .libical3
+
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}
@@ -307,6 +314,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
 # evolution link
 #ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
 
+# remove test GIO modules directory
+rm -r $RPM_BUILD_ROOT/%{_libdir}/evolution/test-gio-modules
+
 %find_lang %name-%{evo_major} --all-name --with-gnome
 
 grep "%{_datadir}/locale" evolution-%{evo_major}.lang > translations.lang
@@ -402,8 +412,6 @@ rm -rf $RPM_BUILD_ROOT
 
 # Various libexec programs:
 %dir %{_libexecdir}/evolution
-%{_libexecdir}/evolution/csv2vcard
-%{_libexecdir}/evolution/evolution-addressbook-export
 %{_libexecdir}/evolution/evolution-alarm-notify
 %{_libexecdir}/evolution/evolution-backup
 %{_libexecdir}/evolution/killev
@@ -456,6 +464,14 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-face.eplug
 %{evo_plugin_dir}/liborg-gnome-face.so
 
+# Web extensions
+
+%dir %{web_extensions_dir}
+%{web_extensions_dir}/libedomutils.so
+%{web_extensions_dir}/libewebextension.so
+%{web_extensions_dir}/libmoduleitipformatterwebextension.so
+%dir %{web_extensions_dir}/webkit-editor
+%{web_extensions_dir}/webkit-editor/libewebkiteditorwebextension.so
 
 %files devel
 %defattr(-, root, root)
@@ -487,6 +503,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 
 %changelog
+* Fri Jan 26 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.22.6-1
+- new upstream release.
+
 * Mon Jul 18 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.20.4-1
 - new upstream release