/[smeserver]/rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec
ViewVC logotype

Diff of /rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.11 by jpp, Fri Jan 8 19:46:48 2021 UTC Revision 1.24 by jpp, Wed Apr 7 21:16:20 2021 UTC
# Line 1  Line 1 
1  # $Id: smeserver-spamassassin.spec,v 1.10 2020/12/16 16:21:20 jcrisp Exp $  # $Id: smeserver-spamassassin.spec,v 1.23 2021/03/16 20:54:07 jpp Exp $
2    
3  Summary: SME Server - spamassassin anti-spam module  Summary: SME Server - spamassassin anti-spam module
4  %define name smeserver-spamassassin  %define name smeserver-spamassassin
5  Name: %{name}  Name: %{name}
6  %define version 2.7.0  %define version 2.7.0
7  %define release 2  %define release 10
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
11  Group: Networking/Daemons  Group: Networking/Daemons
12  Source: %{name}-%{version}.tar.xz  Source: %{name}-%{version}.tar.xz
13  Patch0: smeserver-spamassassin-2.7.0-bz11166-update.patch  Patch0: smeserver-spamassassin-2.7.0-bz11166-update.patch
14    Patch1: smeserver-spamassassin-2.7.0-bz11361-spamd-fails.patch
15    Patch2: smeserver-spamassassin-2.7.0-bz11362-logging.patch
16    Patch3: smeserver-spamassassin-2.7.0-bz11375-remove-spamd.patch
17    
18  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
19  Requires: e-smith-email >= 4.13.0-38  Requires: e-smith-email >= 4.13.0-38
# Line 29  Requires: e-smith-base >= 4.13.16 Line 32  Requires: e-smith-base >= 4.13.16
32  Requires: e-smith-qmail >= 1.9.0-09sme02  Requires: e-smith-qmail >= 1.9.0-09sme02
33  Requires: smeserver-clamav >= 2.7.0  Requires: smeserver-clamav >= 2.7.0
34  Requires: perl-Razor-Agent  Requires: perl-Razor-Agent
35    Requires: DCC
36  Requires: pyzor  Requires: pyzor
37  Obsoletes: FuzzyOcr  Obsoletes: FuzzyOcr
38  Obsoletes: e-smith-spamassassin  Obsoletes: e-smith-spamassassin
# Line 41  AutoReqProv: no Line 45  AutoReqProv: no
45  SME Server - spamassassin anti-spam module  SME Server - spamassassin anti-spam module
46    
47  %changelog  %changelog
48  * Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-2.sme  * Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-10.sme
49    - prevent noise in log at spamassassin call from qpsmtpd [SME: 11491]
50    
51    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-9.sme
52    - clean rsyslog syntax for spamd [SME: 11422]
53    
54    * Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
55    - remove warning while trying to delete file when missing in post script [SME: 11375]
56    
57    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme
58    - remove spamd reference as service use spamassassin.service [SME: 11375]
59      migrate spamd propertie SpamLearning to spamassassin
60      template for /etc/sysconfig/spamassassin, revert --allow-tell option
61      stop spamassassin spamd and delete /etc/systemd/system/spamassassin.service link if exists
62    
63    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-6.sme
64    - fix typo [SME: 11361]
65    
66    * Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-5.sme
67    - fix spamd unable to load [SME: 11361]
68    - redirect spamd loging to spamd.log instead of message [SME: 11362]
69    
70    * Wed Feb 17 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-4.sme
71    - add requires DCC as we have built it  [SME: 11065]
72    
73    * Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-3.sme
74  - fix smeserver-spamassassin-update event fix [SME: 11166]  - fix smeserver-spamassassin-update event fix [SME: 11166]
75    
76  * Wed Dec 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-1  * Wed Dec 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-1
# Line 452  SME Server - spamassassin anti-spam modu Line 481  SME Server - spamassassin anti-spam modu
481  %prep  %prep
482  %setup  %setup
483  %patch0 -p1  %patch0 -p1
484    %patch1 -p1
485    rm -rf root/etc/e-smith/templates/usr/
486    rm -rf root//usr/lib/systemd/system/spamd.service.d
487    %patch2 -p1
488    %patch3 -p1
489    rm -rf root/etc/e-smith/db/configuration/defaults/spamd
490    mkdir -p root/var/service/qpsmtpd/.spamassassin
491    
492  %build  %build
493  perl createlinks  perl createlinks
# Line 467  rm -f %{name}-%{version}-%{release}-file Line 503  rm -f %{name}-%{version}-%{release}-file
503      --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \      --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \
504      --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \      --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \
505      --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \      --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \
506        --dir /var/service/qpsmtpd/.spamassassin 'attr(0775,spamd,spamd)' \
507      > %{name}-%{version}-%{release}-filelist      > %{name}-%{version}-%{release}-filelist
508    
509  %pre  %pre
510  /sbin/e-smith/create-system-user spamd 1005 \  /sbin/e-smith/create-system-user spamd 1005 \
511      'spamassassin daemon user' /var/spool/spamd /bin/false      'spamassassin daemon user' /var/spool/spamd /bin/false
512    #clean 10.0b1 bad choice
513    if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then
514            unlink /etc/systemd/system/spamassassin.service; fi
515    if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then
516            /usr/bin/systemctl stop spamd.service
517            /usr/bin/systemctl stop spamassassin.service
518    fi
519    
520    
521    
522  %clean  %clean
523  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 479  rm -rf $RPM_BUILD_ROOT Line 525  rm -rf $RPM_BUILD_ROOT
525  %post  %post
526    
527  # Cleanup old files  # Cleanup old files
528  rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true  if [[  -d /var/lib/spamassassin/3.004000 ]]; then
529      rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
530    fi
531    
532  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then
533    echo "Installing new spam databases - please be patient"    echo "Installing new spam databases - please be patient"
# Line 493  if [[ ! -d /var/lib/spamassassin/3.00400 Line 541  if [[ ! -d /var/lib/spamassassin/3.00400
541    fi    fi
542  fi  fi
543    
544    if [[  -d /usr/lib/systemd/system/spamd.service.d ]]; then
545      rm -rf /usr/lib/systemd/system/spamd.service.d
546    fi
547    
548  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist
549  %defattr(-,root,root)  %defattr(-,root,root)

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed