- revert openldap bump

[packages/claws-mail.git] / claws-mail.spec

diff --git a/claws-mail.spec b/claws-mail.spec
index b0f064108efe8d5d1cb8cb312babd0fac0232c1c..835af090fccc87967b9fb6de4d0f5b34ccb8fb33 100644 (file)
--- 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,21 +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:       2.9.0
+Version:       3.4.0
 Release:       1
-License:       GPL v2
+License:       GPL v3
 Group:         X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
-# Source0-md5: 0a5a22e456640070ca09f6d65c0f680c
+# Source0-md5: ec5ee743baa198c7fd707b0461b6c68a
 Source1:       %{name}.desktop
-Patch0:                %{name}-pc_cflags_sequence.patch
-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
@@ -45,10 +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
 Obsoletes:     sylpheed-claws
+Obsoletes:     sylpheed-claws-plugin-clamav
 Obsoletes:     sylpheed-gtk2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,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}
@@ -124,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
@@ -258,7 +235,6 @@ najpopularniejsze operacje.
 
 %prep
 %setup -q
-%patch0 -p1
 
 rm -f po/stamp-po
 
@@ -270,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 \
@@ -348,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