X-Git-Url: https://git.tld-linux.org/?p=packages%2Fspamassassin.git;a=blobdiff_plain;f=spamassassin.spec;fp=spamassassin.spec;h=b88367b51c1c8a2e3220a7d5353601a60f4f93a9;hp=246970a0fd9b227f809594b986f401110a247322;hb=c1afbf53c3b26be67d5774306eda0be93ce514c1;hpb=6fb54ed6717b2c049a93e91e8d635ba5abc7e706

diff --git a/spamassassin.spec b/spamassassin.spec
index 246970a..b88367b 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -13,7 +13,7 @@ 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.2
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Applications/Mail
 Source0:	http://ftp.man.poznan.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
@@ -27,6 +27,7 @@ Source6:	sa-update.cron
 Source7:	spamassassin-official.conf
 Source8:	sought.conf
 Patch0:		bug_771408_perl_version
+Patch1:		config-dir.patch
 URL:		http://spamassassin.apache.org/
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.16
@@ -81,7 +82,7 @@ considerably speeds processing of mail.
 
 To enable spamassassin, if you are receiving mail locally, simply add
 this line to your ~/.procmailrc:
-INCLUDERC=/etc/mail/spamassassin/spamassassin-default.rc
+INCLUDERC=/etc/spamassassin/spamassassin-default.rc
 
 To filter spam for all users, add that line to /etc/procmailrc
 (creating if necessary).
@@ -99,7 +100,7 @@ przyspieszy proces przetwarzania poczty.
 
 Aby uruchomić spamassassina dla lokalnie przychodzącej poczty,
 wystarczy dodać do własnego ~/.procmailrc linię:
-INCLUDERC=/etc/mail/spamassassin/spamassassin-default.rc
+INCLUDERC=/etc/spamassassin/spamassassin-default.rc
 
 Aby filtrować spam dla wszystkich użytkowników, należy dodać tę linię
 do pliku /etc/procmailrc (tworząc go w razie potrzeby).
@@ -148,7 +149,7 @@ whole spamassassin program.
 
 To enable spamassassin, if you are receiving mail locally, simply add
 this line to your ~/.procmailrc:
-INCLUDERC=/etc/mail/spamassassin/spamassassin-spamc.rc
+INCLUDERC=/etc/spamassassin/spamassassin-spamc.rc
 
 To filter spam for all users, add that line to /etc/procmailrc
 (creating if necessary).
@@ -162,7 +163,7 @@ dzięki czemu powinien działać szybciej niż sam spamassassin.
 
 Aby uruchomić spamassassina dla lokalnie przychodzącej poczty,
 wystarczy dodać do własnego ~/.procmailrc linię:
-INCLUDERC=/etc/mail/spamassassin/spamassassin-spamc.rc
+INCLUDERC=/etc/spamassassin/spamassassin-spamc.rc
 
 Aby filtrować spam dla wszystkich użytkowników, należy dodać tę linię
 do pliku /etc/procmailrc (tworząc go w razie potrzeby).
@@ -262,6 +263,7 @@ aplikacji do czytania poczty.
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # disable broken test
 %{__mv} t/sa_compile.t{,.disabled}
@@ -280,6 +282,7 @@ export CFLAGS="%{rpmcflags}"
 	INSTALLDIRS=vendor \
 	PREFIX=%{_prefix} \
 	SYSCONFDIR=%{_sysconfdir} \
+	CONFDIR=%{_sysconfdir}/spamassassin \
 	DATADIR=%{_datadir}/spamassassin \
 	ENABLE_SSL=yes \
 	CONTACT_ADDRESS="postmaster@localhost" \
@@ -293,29 +296,29 @@ export CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{cron.d,sysconfig,rc.d/init.d},%{_sysconfdir}/mail/spamassassin/channel.d}
+install -d $RPM_BUILD_ROOT{/etc/{cron.d,sysconfig,rc.d/init.d},%{_sysconfdir}/spamassassin/channel.d}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/spamd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/spamd
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin
 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 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/channel.d
+install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/channel.d
 
 # sa-update, sa-compile
 install -d $RPM_BUILD_ROOT/var/lib/spamassassin/{%{sa_version},compiled/%{sa_version}}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys
-touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/{pubring,secring,trustdb}.gpg
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/sa-update-keys
+touch $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/sa-update-keys/{pubring,secring,trustdb}.gpg
 
 rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Mail/SpamAssassin/.packlist,%{_mandir}/man3/spamassassin-run.*}
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels << 'EOF'
-# Use %{_sysconfdir}/mail/spamassassin/channel.d/*.conf for new channels
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/channels << 'EOF'
+# Use %{_sysconfdir}/spamassassin/channel.d/*.conf for new channels
 EOF
 
 %clean
@@ -331,6 +334,41 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del spamd
 fi
 
+%triggerun -n perl-Mail-SpamAssassin -- perl-Mail-SpamAssassin < 3.4.2-2
+if [ $1 -le 1 ]; then
+	exit 0
+fi
+[ -d /etc/spamassassin ] || mkdir /etc/spamassassin 2>/dev/null || :
+for f in /etc/mail/spamassassin/*.{cf,pre}; do
+	f=${f##*/}
+	[ -f "/etc/mail/spamassassin/$f" ] && mv "/etc/mail/spamassassin/$f" "/etc/spamassassin/$f" 2>/dev/null || :
+done
+[ -n "$(find /etc/mail/spamassassin -type d -empty 2>/dev/null)" ] && rmdir /etc/mail/spamassassin 2>/dev/null || :
+[ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
+
+%triggerun -- %{name} < 3.4.2-2
+if [ $1 -le 1 ]; then
+	exit 0
+fi
+[ -d /etc/spamassassin ] || mkdir /etc/spamassassin 2>/dev/null || :
+[ -f /etc/mail/spamassassin/spamassassin-default.rc ] && mv /etc/mail/spamassassin/spamassassin-default.rc /etc/spamassassin 2>/dev/null || :
+[ -n "$(find /etc/mail/spamassassin -type d -empty 2>/dev/null)" ] && rmdir /etc/mail/spamassassin 2>/dev/null || :
+[ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
+
+%triggerun spamc -- spamassassin-spamc < 3.4.2-2
+if [ $1 -le 1 ]; then
+	exit 0
+fi
+[ -d /etc/spamassassin ] || mkdir /etc/spamassassin 2>/dev/null || :
+[ -f /etc/mail/spamassassin/spamassassin-spamc.rc ] && mv /etc/mail/spamassassin/spamassassin-spamc.rc /etc/spamassassin 2>/dev/null || :
+[ -n "$(find /etc/mail/spamassassin -type d -empty 2>/dev/null)" ] && rmdir /etc/mail/spamassassin 2>/dev/null || :
+[ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
+
+%triggerpostun -n perl-Mail-SpamAssassin -- perl-Mail-SpamAssassin < 3.4.2
+echo
+echo "Warning! Configuration has been migrated to /etc/spamassassin."
+echo
+
 %triggerpostun spamd -- spamassassin-spamd < 3.1.0-5.3
 # temp hack, should we care of the dead link?
 ln -s spamd /etc/rc.d/init.d/spamassassin
@@ -344,7 +382,7 @@ fi
 %defattr(644,root,root,755)
 %doc CREDITS Changes INSTALL README TRADEMARK UPGRADE USAGE
 %doc procmailrc.example sql/ ldap/
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/spamassassin-default.rc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spamassassin/spamassassin-default.rc
 %attr(755,root,root) %{_bindir}/sa-learn
 %attr(755,root,root) %{_bindir}/sa-awl
 %attr(755,root,root) %{_bindir}/spamassassin
@@ -367,7 +405,7 @@ fi
 
 %files spamc
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/spamassassin-spamc.rc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spamassassin/spamassassin-spamc.rc
 %attr(755,root,root) %{_bindir}/spamc
 %{_mandir}/man1/spamc.1*
 
@@ -380,12 +418,12 @@ fi
 
 %files update
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/channels
-%dir %{_sysconfdir}/mail/spamassassin/channel.d
-%{_sysconfdir}/mail/spamassassin/channel.d/spamassassin-official.conf
-%{_sysconfdir}/mail/spamassassin/channel.d/sought.conf
-%attr(700,root,root) %dir %{_sysconfdir}/mail/spamassassin/sa-update-keys
-%attr(700,root,root) %ghost %{_sysconfdir}/mail/spamassassin/sa-update-keys/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spamassassin/channels
+%dir %{_sysconfdir}/spamassassin/channel.d
+%{_sysconfdir}/spamassassin/channel.d/spamassassin-official.conf
+%{_sysconfdir}/spamassassin/channel.d/sought.conf
+%attr(700,root,root) %dir %{_sysconfdir}/spamassassin/sa-update-keys
+%attr(700,root,root) %ghost %{_sysconfdir}/spamassassin/sa-update-keys/*
 %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/sa-update
 %attr(755,root,root) %{_bindir}/sa-update
 %attr(755,root,root) %{_datadir}/spamassassin/sa-update.cron
@@ -396,10 +434,10 @@ fi
 %files -n perl-Mail-SpamAssassin
 %defattr(644,root,root,755)
 %doc sample-nonspam.txt sample-spam.txt
-%dir %{_sysconfdir}/mail/spamassassin
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/*.pre
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/*.cf
-%exclude %{_sysconfdir}/mail/spamassassin/sa-update-keys
+%dir %{_sysconfdir}/spamassassin
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spamassassin/*.pre
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spamassassin/*.cf
+%exclude %{_sysconfdir}/spamassassin/sa-update-keys
 %dir %{_datadir}/spamassassin
 %config(noreplace) %{_datadir}/spamassassin/languages
 %config(noreplace) %{_datadir}/spamassassin/user_prefs.template