diff --git a/.gitignore b/.gitignore index b742433..56bb02d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,152 +1 @@ -evolution-2.31.5.tar.bz2 -/evolution-2.31.91.tar.bz2 -/evolution-2.31.92.tar.bz2 -/evolution-2.91.0.tar.bz2 -/evolution-2.91.1.tar.bz2 -/evolution-2.91.2.tar.bz2 -/evolution-2.91.3.tar.bz2 -/evolution-2.91.4.tar.bz2 -/evolution-2.91.5.tar.bz2 -/evolution-2.91.6.tar.bz2 -/evolution-2.91.6.1.tar.bz2 -/evolution-2.91.6.2.tar.bz2 -/evolution-2.91.90.tar.bz2 -/evolution-2.91.91.tar.bz2 -/evolution-2.91.92.tar.bz2 -/evolution-3.0.0.tar.bz2 -/evolution-3.1.1.tar.bz2 -/evolution-3.1.2.tar.bz2 -/evolution-3.1.3.tar.bz2 -/evolution-3.1.4.tar.bz2 -/evolution-3.1.5.tar.bz2 -/evolution-3.1.90.tar.xz -/evolution-3.1.91.tar.xz -/evolution-3.1.92.tar.xz -/evolution-3.2.0.tar.xz -/evolution-3.3.1.tar.xz -/evolution-3.3.2.tar.xz -/evolution-3.3.3.tar.xz -/evolution-3.3.4.tar.xz -/evolution-3.3.5.tar.xz -/evolution-3.3.90.tar.xz -/evolution-3.3.91.tar.xz -/evolution-3.3.92.tar.xz -/evolution-3.4.0.tar.xz -/evolution-3.4.0.1.tar.xz -/evolution-3.4.1.tar.xz -/evolution-3.5.1.tar.xz -/evolution-3.5.2.tar.xz -/evolution-3.5.3.tar.xz -/evolution-3.5.3.1.tar.xz -/evolution-3.5.4.tar.xz -/evolution-3.5.5.tar.xz -/evolution-3.5.90.tar.xz -/evolution-3.5.91.tar.xz -/evolution-3.5.92.tar.xz -/evolution-3.6.0.tar.xz -/evolution-3.7.1.tar.xz -/evolution-3.7.2.tar.xz -/evolution-3.7.3.1.tar.xz -/evolution-3.7.3.2.tar.xz -/evolution-3.7.4.tar.xz -/evolution-3.7.5.tar.xz -/evolution-3.7.90.tar.xz -/evolution-3.7.91.tar.xz -/evolution-3.7.92.tar.xz -/evolution-3.8.0.tar.xz -/evolution-3.9.1.tar.xz -/evolution-3.9.2.tar.xz -/evolution-3.9.3.tar.xz -/evolution-3.9.4.tar.xz -/evolution-3.9.5.tar.xz -/evolution-3.9.90.tar.xz -/evolution-3.9.91.tar.xz -/evolution-3.9.92.tar.xz -/evolution-3.10.0.tar.xz -/evolution-3.10.1.tar.xz -/evolution-3.11.1.tar.xz -/evolution-3.11.2.tar.xz -/evolution-3.11.4.tar.xz -/evolution-3.11.5.tar.xz -/evolution-3.11.90.tar.xz -/evolution-3.11.91.tar.xz -/evolution-3.11.92.tar.xz -/evolution-3.12.0.tar.xz -/evolution-3.12.1.tar.xz -/evolution-3.12.2.tar.xz -/evolution-3.12.3.tar.xz -/evolution-3.12.4.tar.xz -/evolution-3.13.4.tar.xz -/evolution-3.13.5.tar.xz -/evolution-3.13.6.tar.xz -/evolution-3.13.7.tar.xz -/evolution-3.13.8.tar.xz -/evolution-3.13.9.tar.xz -/evolution-3.13.10.tar.xz -/evolution-3.13.90.tar.xz -/evolution-3.15.91.tar.xz -/evolution-3.15.92.tar.xz -/evolution-3.16.0.tar.xz -/evolution-3.16.1.tar.xz -/evolution-3.17.1.tar.xz -/evolution-3.17.2.tar.xz -/evolution-3.17.3.tar.xz -/evolution-3.17.4.tar.xz -/evolution-3.17.90.tar.xz -/evolution-3.17.91.tar.xz -/evolution-3.17.92.tar.xz -/evolution-3.18.0.tar.xz -/evolution-3.18.1.tar.xz -/evolution-3.19.1.tar.xz -/evolution-3.19.2.tar.xz -/evolution-3.19.3.tar.xz -/evolution-3.19.4.tar.xz -/evolution-3.19.90.tar.xz -/evolution-3.19.91.tar.xz -/evolution-3.19.92.tar.xz -/evolution-3.20.0.tar.xz -/evolution-3.20.1.tar.xz -/evolution-3.21.1.tar.xz -/evolution-3.21.2.tar.xz -/evolution-3.21.3.tar.xz -/evolution-3.21.4.tar.xz -/evolution-3.21.90.tar.xz -/evolution-3.21.91.tar.xz -/evolution-3.21.92.tar.xz -/evolution-3.22.0.tar.xz -/evolution-3.22.1.tar.xz -/evolution-3.23.1.tar.xz -/evolution-3.23.2.tar.xz -/evolution-3.23.3.tar.xz -/evolution-3.23.4.tar.xz -/evolution-3.23.90.tar.xz -/evolution-3.23.91.tar.xz -/evolution-3.23.92.tar.xz -/evolution-3.24.0.tar.xz -/evolution-3.24.1.tar.xz -/evolution-3.25.1.tar.xz -/evolution-3.25.2.tar.xz -/evolution-3.25.3.tar.xz -/evolution-3.25.4.tar.xz -/evolution-3.25.90.tar.xz -/evolution-3.25.91.tar.xz -/evolution-3.25.92.tar.xz -/evolution-3.25.92.1.tar.xz -/evolution-3.25.92.2.tar.xz -/evolution-3.26.0.tar.xz -/evolution-3.26.1.tar.xz -/evolution-3.27.1.tar.xz -/evolution-3.27.2.tar.xz -/evolution-3.27.3.tar.xz -/evolution-3.27.4.tar.xz -/evolution-3.27.90.tar.xz -/evolution-3.27.91.tar.xz -/evolution-3.27.92.tar.xz -/evolution-3.28.0.tar.xz -/evolution-3.28.1.tar.xz -/evolution-3.29.1.tar.xz -/evolution-3.29.2.tar.xz -/evolution-3.29.3.tar.xz -/evolution-3.29.4.tar.xz -/evolution-3.29.90.tar.xz -/evolution-3.29.91.tar.xz +/evolution-*.tar.xz diff --git a/evolution.spec b/evolution.spec index 0cfecf9..93419f8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,9 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") %global _python_bytecompile_extra 0 +# correct Obsoletes for evolution-tests when this is changed +%global enable_installed_tests 0 + %define glib2_version 2.46.0 %define gtk3_version 3.10.0 %define gnome_autoar_version 0.1.1 @@ -28,13 +31,13 @@ ### Abstract ### Name: evolution -Version: 3.29.91 +Version: 3.30.5 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz ### Patches ### @@ -43,10 +46,15 @@ Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} Obsoletes: evolution-perl < %{last_evo_perl_version} +%if !%{enable_installed_tests} +Obsoletes: evolution-tests <= 3.30.1 +%endif + %global eds_version %{version} ## Dependencies ### +Requires: %{_bindir}/killall Requires: evolution-data-server >= %{eds_version} Requires: gvfs Requires: gtkspell3 @@ -55,6 +63,7 @@ Requires: %{name}-langpacks = %{version}-%{release} ### Build Dependencies ### +BuildRequires: %{_bindir}/killall BuildRequires: cmake BuildRequires: gcc BuildRequires: gettext @@ -197,6 +206,7 @@ This package contains the plugin to import Microsoft Personal Storage Table (PST) files used by Microsoft Outlook and Microsoft Exchange. %endif +%if %{enable_installed_tests} %package tests Summary: Tests for the %{name} package Group: Development/Libraries @@ -207,6 +217,7 @@ Requires: python2-dogtail %description tests The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. +%endif %prep %setup -q -n evolution-%{version} @@ -241,15 +252,20 @@ fi %define gtkdoc_flags -DENABLE_GTK_DOC=OFF -DWITH_HELP=OFF %endif +%if %{enable_installed_tests} +%define tests_flags -DENABLE_INSTALLED_TESTS=ON +%else +%define tests_flags -DENABLE_INSTALLED_TESTS=OFF +%endif + CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS %cmake -G "Unix Makefiles" \ -DENABLE_MAINTAINER_MODE=OFF \ -DVERSION_SUBSTRING=" (%{version}-%{release})" \ - %ldap_flags %ssl_flags %gtkdoc_flags \ + %ldap_flags %ssl_flags %gtkdoc_flags %tests_flags \ -DENABLE_PLUGINS=all \ -DENABLE_YTNEF=OFF \ - -DENABLE_INSTALLED_TESTS=ON \ .. make %{?_smp_mflags} @@ -497,11 +513,40 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif +%if %{enable_installed_tests} %files tests %{_libexecdir}/%{name}/installed-tests %{_datadir}/installed-tests +%endif %changelog +* Mon Feb 04 2019 Milan Crha - 3.30.5-1 +- Update to 3.30.5 + +* Mon Jan 07 2019 Milan Crha - 3.30.4-1 +- Update to 3.30.4 + +* Mon Dec 10 2018 Milan Crha - 3.30.3-1 +- Update to 3.30.3 + +* Fri Oct 26 2018 Milan Crha - 3.30.2-2 +- Add BuildRequires/Requires for 'killall' binary + +* Mon Oct 22 2018 Milan Crha - 3.30.2-1 +- Update to 3.30.2 +- Disable and obsolete tests subpackage - it uses python2 and it is unmaintained upstream + +* Mon Sep 24 2018 Milan Crha - 3.30.1-1 +- Update to 3.30.1 +- Remove patch for GNOME Evolution issue #86 (fixed upstream) + +* Mon Sep 03 2018 Milan Crha - 3.30.0-1 +- Update to 3.30.0 +- Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels) + +* Mon Aug 27 2018 Milan Crha - 3.29.92-1 +- Update to 3.29.92 + * Mon Aug 13 2018 Milan Crha - 3.29.91-1 - Update to 3.29.91 diff --git a/sources b/sources index 8d4f808..961e491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.29.91.tar.xz) = 3b311d14f49ae4c90abf996693f2fdb9104913dd655f9e96391921bbaff0cbb2230e3a1da6ac7c7a5c8a3c592a3fd91001b8b271d2d8c3f09e0d283b81877f68 +SHA512 (evolution-3.30.5.tar.xz) = 1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1