X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcone.git;a=blobdiff_plain;f=cone.spec;h=8d29b73adf3106cae219e86056827868549702c2;hp=7bc4c72a3b034ea6f670980d4a330a510c2b3d05;hb=HEAD;hpb=79f20932bf4dba7b9daef64dfb7686bc6e6fc938

diff --git a/cone.spec b/cone.spec
index 7bc4c72..0b921d5 100644
--- a/cone.spec
+++ b/cone.spec
@@ -1,18 +1,18 @@
 #
 # Conditional build:
-%bcond_without	tests	# "make check"
+%bcond_with	tests	# "make check" (requires operational valgrind, i.e. with glibc-debuginfo)
 %bcond_with	gnutls	# GnuTLS instead of OpenSSL
 %bcond_with	socks	# (Courier) Socks support
 
 Summary:	CONE - Console Newsreader and Emailer
 Summary(pl.UTF-8):	CONE - tekstowy klient poczty i czytnik newsów
 Name:		cone
-Version:	1.5
+Version:	1.8
 Release:	1
 License:	GPL v3 with OpenSSL exception
 Group:		Applications/Mail
 Source0:	https://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5:	a67ea05b272b17f4333ec648a9f7c809
+# Source0-md5:	3b5c398c693d6aa60ea90f4d19f0ac39
 Patch0:		%{name}-maildir.patch
 Patch1:		%{name}-curses.patch
 URL:		http://www.courier-mta.org/cone/
@@ -27,7 +27,7 @@ BuildRequires:	gnupg
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 3.0}
 %{?with_gnutls:BuildRequires:	libgcrypt-devel}
 %{?with_gnutls:BuildRequires:	libgpg-error-devel}
-BuildRequires:	libidn-devel >= 0.0.0
+BuildRequires:	libidn2-devel >= 0.0.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
@@ -39,6 +39,7 @@ BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	procps
 BuildRequires:	sysconftool
+%{?with_tests:BuildRequires:	valgrind}
 BuildRequires:	zlib-devel
 Requires:	ca-certificates
 Suggests:	gnupg
@@ -61,7 +62,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe i biblioteka statyczna LibMAIL
 Group:		Development/Libraries
 Requires:	courier-unicode-devel >= 2.0
 %{?with_gnutls:Requires:	gnutls-devel >= 3.0}
-Requires:	libidn-devel >= 0.0.0
+Requires:	libidn2-devel >= 0.0.0
 Requires:	libstdc++-devel
 %{!?with_gnutls:Requires:	openssl-devel >= 0.9.7d}
 Obsoletes:	cone-static < 0.96