/[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.18 by jpp, Mon Feb 22 04:04:24 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.17 2021/02/21 16:41:24 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 7
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    
17  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
18  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 31  Requires: e-smith-base >= 4.13.16
31  Requires: e-smith-qmail >= 1.9.0-09sme02  Requires: e-smith-qmail >= 1.9.0-09sme02
32  Requires: smeserver-clamav >= 2.7.0  Requires: smeserver-clamav >= 2.7.0
33  Requires: perl-Razor-Agent  Requires: perl-Razor-Agent
34    Requires: DCC
35  Requires: pyzor  Requires: pyzor
36  Obsoletes: FuzzyOcr  Obsoletes: FuzzyOcr
37  Obsoletes: e-smith-spamassassin  Obsoletes: e-smith-spamassassin
# Line 41  AutoReqProv: no Line 44  AutoReqProv: no
44  SME Server - spamassassin anti-spam module  SME Server - spamassassin anti-spam module
45    
46  %changelog  %changelog
47  * Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-2.sme  * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme
48    - remove spamd reference as service use spamassassin.service [SME: 11375]
49      migrate spamd propertie SpamLearning to spamassassin
50      template for /etc/sysconfig/spamassassin, revert --allow-tell option
51      stop spamassassin spamd and delete /etc/systemd/system/spamassassin.service link if exists
52    
53    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-6.sme
54    - fix typo [SME: 11361]
55    
56    * Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-5.sme
57    - fix spamd unable to load [SME: 11361]
58    - redirect spamd loging to spamd.log instead of message [SME: 11362]
59    
60    * Wed Feb 17 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-4.sme
61    - add requires DCC as we have built it  [SME: 11065]
62    
63    * Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-3.sme
64  - fix smeserver-spamassassin-update event fix [SME: 11166]  - fix smeserver-spamassassin-update event fix [SME: 11166]
65    
66  * 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 471  SME Server - spamassassin anti-spam modu
471  %prep  %prep
472  %setup  %setup
473  %patch0 -p1  %patch0 -p1
474    %patch1 -p1
475    rm -rf root/etc/e-smith/templates/usr/
476    rm -rf root//usr/lib/systemd/system/spamd.service.d
477    %patch2 -p1
478    rm -rf root/etc/e-smith/db/configuration/defaults/spamd
479    
480  %build  %build
481  perl createlinks  perl createlinks
# Line 472  rm -f %{name}-%{version}-%{release}-file Line 496  rm -f %{name}-%{version}-%{release}-file
496  %pre  %pre
497  /sbin/e-smith/create-system-user spamd 1005 \  /sbin/e-smith/create-system-user spamd 1005 \
498      'spamassassin daemon user' /var/spool/spamd /bin/false      'spamassassin daemon user' /var/spool/spamd /bin/false
499    #clean 10.0b1 bad choice
500    if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then
501            echo "unlink /etc/systemd/system/spamassassin.service"; fi
502    if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then
503            /usr/bin/systemctl stop spamd.service
504            /usr/bin/systemctl stop spamassassin.service
505    fi
506    
507    
508    
509  %clean  %clean
510  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 493  if [[ ! -d /var/lib/spamassassin/3.00400 Line 526  if [[ ! -d /var/lib/spamassassin/3.00400
526    fi    fi
527  fi  fi
528    
529    rm -rf /usr/lib/systemd/system/spamd.service.d 2>/dev/null || true
530    
531  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist
532  %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