]> TLD Linux GIT Repositories - packages/spamassassin.git/blobdiff - spamassassin.spec
- merged 3.4.2 from PLD
[packages/spamassassin.git] / spamassassin.spec
index a71316032d9c699934ba798eb03af900c0353034..2ad941095c02d8f3bf5b69a980558535940ce85e 100644 (file)
 Summary:       A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
-Version:       3.4.1
-Release:       8
+Version:       3.4.2
+Release:       1
 License:       Apache v2.0
 Group:         Applications/Mail
 Source0:       http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
-# Source0-md5: 0db5d27d7b782ff5eadee12b95eae84c
+# Source0-md5: 4f4c38a7cd4ae3e3750895ae21d2fc78
 Source1:       %{name}.sysconfig
 Source2:       %{name}-spamd.init
 Source3:       %{name}-default.rc
@@ -26,16 +26,7 @@ Source5:     sa-update.sh
 Source6:       sa-update.cron
 Source7:       spamassassin-official.conf
 Source8:       sought.conf
-Source9:       cronjob-sa-update.service
-Source10:      cronjob-sa-update.timer
-Patch0:                spamassassin-3.4.1-netdns.patch
-Patch1:                %{name}-perl-fix.patch
-Patch2:                bug_771408_perl_version
-Patch3:                bug_828552-openssl-1.1.0
-Patch4:                bug-869408-unescaped-brace-in-regex.patch
-Patch5:                disable_sslv3
-Patch6:                dkim_subdomains
-Patch7:                fix-uninitialized-concat
+Patch0:                bug_771408_perl_version
 URL:           http://spamassassin.apache.org/
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.16
@@ -271,13 +262,6 @@ aplikacji do czytania poczty.
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 # disable broken test
 %{__mv} t/sa_compile.t{,.disabled}
@@ -285,6 +269,10 @@ aplikacji do czytania poczty.
 # this test needs network, does not work on builders
 %{__mv} t/dnsbl_subtests.t{,.disabled}
 
+# temporary disable problematic tests
+%{__mv} t/trust_path.t{,.disabled}
+%{__mv} t/urilocalbl_geoip.t{,.disabled}
+
 %build
 # for spamc/configure
 export CFLAGS="%{rpmcflags}"
@@ -301,14 +289,11 @@ export CFLAGS="%{rpmcflags}"
        CC="%{__cc}" \
        OPTIMIZE="%{rpmcflags}"
 
-%{__sed} -e "s,@@LOCAL_STATE_DIR@@,$(pwd)," sa-compile.raw > sa-compile.pl
-%{__perl} -T sa-compile.pl --siteconfigpath=rules
-
 %{?with_tests:%{__make} -j1 TEST_VERBOSE=1 test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{cron.d,sysconfig,rc.d/init.d},%{_sysconfdir}/mail/spamassassin/channel.d,%{systemdunitdir}}
+install -d $RPM_BUILD_ROOT{/etc/{cron.d,sysconfig,rc.d/init.d},%{_sysconfdir}/mail/spamassassin/channel.d}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -321,8 +306,6 @@ install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/spamassassin/sa-update.cron
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/sa-update
 install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d
 install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d
-install %{SOURCE9} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-sa-update.service
-install %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-sa-update.timer
 
 # sa-update, sa-compile
 install -d $RPM_BUILD_ROOT/var/lib/spamassassin/{%{sa_version},compiled/%{sa_version}}
@@ -409,8 +392,6 @@ fi
 %{_datadir}/spamassassin/sa-update-pubkey.txt
 %dir /var/lib/spamassassin/%{sa_version}
 %{_mandir}/man1/sa-update.1*
-%{systemdunitdir}/cronjob-sa-update.service
-%{systemdunitdir}/cronjob-sa-update.timer
 
 %files -n perl-Mail-SpamAssassin
 %defattr(644,root,root,755)