Update to 3.13.4; Introduce tests subpackage with installed tests
This commit is contained in:
parent
831aad1270
commit
f54cc9e68b
1
.gitignore
vendored
1
.gitignore
vendored
@ -76,3 +76,4 @@ evolution-2.31.5.tar.bz2
|
|||||||
/evolution-3.12.2.tar.xz
|
/evolution-3.12.2.tar.xz
|
||||||
/evolution-3.12.3.tar.xz
|
/evolution-3.12.3.tar.xz
|
||||||
/evolution-3.12.4.tar.xz
|
/evolution-3.12.4.tar.xz
|
||||||
|
/evolution-3.13.4.tar.xz
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
%define libsoup_version 2.40.3
|
%define libsoup_version 2.40.3
|
||||||
%define webkit_version 1.8.0
|
%define webkit_version 1.8.0
|
||||||
|
|
||||||
%define evo_base_version 3.12
|
%define evo_base_version 3.14
|
||||||
|
|
||||||
%define last_anjal_version 0.3.2-3
|
%define last_anjal_version 0.3.2-3
|
||||||
%define last_libgal2_version 2:2.5.3-2
|
%define last_libgal2_version 2:2.5.3-2
|
||||||
@ -29,14 +29,14 @@
|
|||||||
### Abstract ###
|
### Abstract ###
|
||||||
|
|
||||||
Name: evolution
|
Name: evolution
|
||||||
Version: 3.12.4
|
Version: 3.13.4
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: Mail and calendar client for GNOME
|
Summary: Mail and calendar client for GNOME
|
||||||
License: GPLv2+ and GFDL
|
License: GPLv2+ and GFDL
|
||||||
URL: https://wiki.gnome.org/Apps/Evolution
|
URL: https://wiki.gnome.org/Apps/Evolution
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
Source: http://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
Obsoletes: anjal <= %{last_anjal_version}
|
Obsoletes: anjal <= %{last_anjal_version}
|
||||||
Obsoletes: libgal2 <= %{last_libgal2_version}
|
Obsoletes: libgal2 <= %{last_libgal2_version}
|
||||||
@ -50,8 +50,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
|
|||||||
# RH bug #589555
|
# RH bug #589555
|
||||||
Patch02: evolution-2.30.1-help-contents.patch
|
Patch02: evolution-2.30.1-help-contents.patch
|
||||||
|
|
||||||
Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch
|
|
||||||
|
|
||||||
## Dependencies ###
|
## Dependencies ###
|
||||||
|
|
||||||
Requires: gvfs
|
Requires: gvfs
|
||||||
@ -146,7 +144,7 @@ Development files needed for building things which link against %{name}.
|
|||||||
Summary: Developer documentation for Evolution
|
Summary: Developer documentation for Evolution
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: devhelp
|
Requires: devhelp
|
||||||
Requires: evolution-devel = %{version}-%{release}
|
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description devel-docs
|
%description devel-docs
|
||||||
@ -156,7 +154,7 @@ This package contains developer documentation for Evolution.
|
|||||||
%package help
|
%package help
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: Help files for %{name}
|
Summary: Help files for %{name}
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: yelp
|
Requires: yelp
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -167,7 +165,7 @@ This package contains user documentation for %{name}.
|
|||||||
%package bogofilter
|
%package bogofilter
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: Bogofilter plugin for Evolution
|
Summary: Bogofilter plugin for Evolution
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: bogofilter
|
Requires: bogofilter
|
||||||
BuildRequires: bogofilter
|
BuildRequires: bogofilter
|
||||||
|
|
||||||
@ -177,7 +175,7 @@ This package contains the plugin to filter junk mail using Bogofilter.
|
|||||||
%package spamassassin
|
%package spamassassin
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: SpamAssassin plugin for Evolution
|
Summary: SpamAssassin plugin for Evolution
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: spamassassin
|
Requires: spamassassin
|
||||||
BuildRequires: spamassassin
|
BuildRequires: spamassassin
|
||||||
|
|
||||||
@ -187,7 +185,7 @@ This package contains the plugin to filter junk mail using SpamAssassin.
|
|||||||
%package perl
|
%package perl
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: Supplemental utilities that require Perl
|
Summary: Supplemental utilities that require Perl
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description perl
|
%description perl
|
||||||
This package contains supplemental utilities for %{name} that require Perl.
|
This package contains supplemental utilities for %{name} that require Perl.
|
||||||
@ -196,18 +194,26 @@ This package contains supplemental utilities for %{name} that require Perl.
|
|||||||
%package pst
|
%package pst
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: PST importer plugin for Evolution
|
Summary: PST importer plugin for Evolution
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description pst
|
%description pst
|
||||||
This package contains the plugin to import Microsoft Personal Storage Table
|
This package contains the plugin to import Microsoft Personal Storage Table
|
||||||
(PST) files used by Microsoft Outlook and Microsoft Exchange.
|
(PST) files used by Microsoft Outlook and Microsoft Exchange.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%package tests
|
||||||
|
Summary: Tests for the %{name} package
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description tests
|
||||||
|
The %{name}-tests package contains tests that can be used to verify
|
||||||
|
the functionality of the installed %{name} package.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n evolution-%{version}
|
%setup -q -n evolution-%{version}
|
||||||
%patch01 -p1 -b .ldaphack
|
%patch01 -p1 -b .ldaphack
|
||||||
%patch02 -p1 -b .help-contents
|
%patch02 -p1 -b .help-contents
|
||||||
%patch03 -p1 -b .drop-gnome-icon-theme-dep
|
|
||||||
|
|
||||||
# Remove the welcome email from Novell
|
# Remove the welcome email from Novell
|
||||||
for inbox in mail/default/*/Inbox; do
|
for inbox in mail/default/*/Inbox; do
|
||||||
@ -250,7 +256,8 @@ autoconf
|
|||||||
--disable-maintainer-mode \
|
--disable-maintainer-mode \
|
||||||
--with-sub-version=" (%{version}-%{release})" \
|
--with-sub-version=" (%{version}-%{release})" \
|
||||||
%ldap_flags %ssl_flags %gtkdoc_flags \
|
%ldap_flags %ssl_flags %gtkdoc_flags \
|
||||||
--enable-plugins=all
|
--enable-plugins=all \
|
||||||
|
--enable-installed-tests
|
||||||
export tagname=CC
|
export tagname=CC
|
||||||
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
|
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
|
||||||
|
|
||||||
@ -528,7 +535,16 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{evo_plugin_dir}/liborg-gnome-pst-import.so
|
%{evo_plugin_dir}/liborg-gnome-pst-import.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%files tests
|
||||||
|
%{_libexecdir}/%{name}/installed-tests
|
||||||
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 30 2014 Milan Crha <mcrha@redhat.com> - 3.13.4-1
|
||||||
|
- Update to 3.13.4
|
||||||
|
- Introduce tests subpackage with installed tests
|
||||||
|
- Remove patch to drop gnome-icon-theme dependency (fixed upstream)
|
||||||
|
|
||||||
* Mon Jul 14 2014 Milan Crha <mcrha@redhat.com> - 3.12.4-1
|
* Mon Jul 14 2014 Milan Crha <mcrha@redhat.com> - 3.12.4-1
|
||||||
- Update to 3.12.4
|
- Update to 3.12.4
|
||||||
- Remove patch to fix folder names in Mail view's folder tree (fixed upstream)
|
- Remove patch to fix folder names in Mail view's folder tree (fixed upstream)
|
||||||
|
Loading…
Reference in New Issue
Block a user