X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=claws-mail.spec;h=835af090fccc87967b9fb6de4d0f5b34ccb8fb33;hb=9c71148a76b48f17e378c2a48a89a71a5c9b5d4f;hp=dbdee3eede98d96e696466daa216d0f59632e50f;hpb=3478bd9e9abb2113e4af551edfd2fcf1d12f3707;p=packages%2Fclaws-mail.git

diff --git a/claws-mail.spec b/claws-mail.spec
index dbdee3e..835af09 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -1,6 +1,5 @@
 #
 # Conditional build:
-%bcond_without	clamav		# build without clamav plugin
 %bcond_without	compface	# build without compface support
 %bcond_without	gnomeprint	# build without gnomeprint support
 %bcond_without	gpg		# build without GPG support
@@ -12,20 +11,19 @@
 Summary:	A bleeding edge branch of Sylpheed, a GTK2 based, lightweight, and fast e-mail client
 Summary(pl.UTF-8):	Rozwojowa wersja Sylpheed z dużą ilością zmian oraz ulepszeń
 Name:		claws-mail
-Version:	3.2.0
+Version:	3.4.0
 Release:	1
 License:	GPL v3
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
-# Source0-md5:	acbfd919f7b633d51e96a0419ac07802
+# Source0-md5:	ec5ee743baa198c7fd707b0461b6c68a
 Source1:	%{name}.desktop
-URL:		http://www.claws-mail.net/
+URL:		http://www.claws-mail.org/
 BuildRequires:	aspell >= 2:0.50
 BuildRequires:	aspell-devel >= 2:0.50
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
-%{?with_clamav:BuildRequires:	clamav-devel}
 %{?with_compface:BuildRequires:	compface-devel}
 BuildRequires:	gettext-devel
 BuildRequires:	gmp-devel
@@ -35,7 +33,7 @@ BuildRequires:	libetpan-devel >= 0.49
 %{?with_gnomeprint:BuildRequires:	libgnomeprintui-devel}
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool
-%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
 %{?with_jpilot:BuildRequires:	pilot-link-devel}
 BuildRequires:	pkgconfig
@@ -44,9 +42,11 @@ BuildRequires:	startup-notification-devel >= 0.5
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Provides:	sylpheed-claws
+Obsoletes:	claws-mail-plugin-clamav
 Obsoletes:	claws-mail-plugin-etpan-privacy
 Obsoletes:	claws-mail-plugin-maildir
 Obsoletes:	sylpheed-claws
+Obsoletes:	sylpheed-claws-plugin-clamav
 Obsoletes:	sylpheed-gtk2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -83,7 +83,6 @@ Summary(pl.UTF-8):	Dodatkowe wtyczki dla Claws-Mail (metapakiet)
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-plugin-bogofilter = %{version}-%{release}
-%{?with_clamav:Requires:	%{name}-plugin-clamav = %{version}-%{release}}
 Requires:	%{name}-plugin-dillo = %{version}-%{release}
 %if %{with gpg}
 Requires:	%{name}-plugin-pgpinline = %{version}-%{release}
@@ -122,26 +121,6 @@ jak i już znajdującej się w lokalnych skrzynkach. Opcjonalnie może
 usuwać listy oznaczone jako spam lub zapisywać je w dedykowanym
 folderze.
 
-%package plugin-clamav
-Summary:	clamav plugin for Claws-Mail
-Summary(pl.UTF-8):	Wtyczka clamav dla Claws-Mail
-Group:		X11/Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-Provides:	sylpheed-claws-plugin-clamav
-Obsoletes:	sylpheed-claws-plugin-clamav
-Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
-
-%description plugin-clamav
-This plugin enables the scanning of message attachments in mail
-received from a POP, IMAP, or LOCAL account using Clam AntiVirus. It
-can optionally delete the mail or save it to a designated folder.
-
-%description plugin-clamav -l pl.UTF-8
-Ta wtyczka pozwala na lokalne skanowanie załączników z poczty
-otrzymanej przez POP, IMAP lub znajdującej się w lokalnych skrzynkach.
-Opcjonalnie może usuwać lub zapisywać zainfekowane listy w
-przeznaczonym do tego folderze.
-
 %package plugin-dillo
 Summary:	dillo plugin for Claws-Mail
 Summary(pl.UTF-8):	Wtyczka dillo dla Claws-Mail
@@ -267,7 +246,6 @@ rm -f po/stamp-po
 %{__autoheader}
 %{__automake}
 %configure \
-	--%{?with_clamav:en}%{!?with_clamav:dis}able-clamav-plugin \
 	--%{?with_compface:en}%{!?with_compface:dis}able-compface \
 	--%{?with_gnomeprint:en}%{!?with_gnomeprint:dis}able-gnomeprint \
 	--%{?with_gpg:en}%{!?with_gpg:dis}able-pgpcore-plugin \
@@ -345,12 +323,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/bogofilter.so
 
-%if %{with clamav}
-%files plugin-clamav
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/clamav_plugin.so
-%endif
-
 %files plugin-dillo
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/dillo_viewer.so