/[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.13 by jpp, Wed Feb 17 18:47:38 2021 UTC Revision 1.23 by jpp, Tue Mar 16 20:54:07 2021 UTC
# Line 1  Line 1 
1  # $Id: smeserver-spamassassin.spec,v 1.12 2021/01/08 19:49:49 jpp Exp $  # $Id: smeserver-spamassassin.spec,v 1.22 2021/02/23 17:14:33 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 4  %define release 9
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 42  AutoReqProv: no Line 45  AutoReqProv: no
45  SME Server - spamassassin anti-spam module  SME Server - spamassassin anti-spam module
46    
47  %changelog  %changelog
48    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-9.sme
49    - clean rsyslog syntax for spamd [SME: 11422]
50    
51    * Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
52    - remove warning while trying to delete file when missing in post script [SME: 11375]
53    
54    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme
55    - remove spamd reference as service use spamassassin.service [SME: 11375]
56      migrate spamd propertie SpamLearning to spamassassin
57      template for /etc/sysconfig/spamassassin, revert --allow-tell option
58      stop spamassassin spamd and delete /etc/systemd/system/spamassassin.service link if exists
59    
60    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-6.sme
61    - fix typo [SME: 11361]
62    
63    * Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-5.sme
64    - fix spamd unable to load [SME: 11361]
65    - redirect spamd loging to spamd.log instead of message [SME: 11362]
66    
67  * Wed Feb 17 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-4.sme  * Wed Feb 17 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-4.sme
68  - add requires DCC as we have built it  [SME: 11065]  - add requires DCC as we have built it  [SME: 11065]
69    
# Line 456  SME Server - spamassassin anti-spam modu Line 478  SME Server - spamassassin anti-spam modu
478  %prep  %prep
479  %setup  %setup
480  %patch0 -p1  %patch0 -p1
481    %patch1 -p1
482    rm -rf root/etc/e-smith/templates/usr/
483    rm -rf root//usr/lib/systemd/system/spamd.service.d
484    %patch2 -p1
485    %patch3 -p1
486    rm -rf root/etc/e-smith/db/configuration/defaults/spamd
487    
488  %build  %build
489  perl createlinks  perl createlinks
# Line 476  rm -f %{name}-%{version}-%{release}-file Line 504  rm -f %{name}-%{version}-%{release}-file
504  %pre  %pre
505  /sbin/e-smith/create-system-user spamd 1005 \  /sbin/e-smith/create-system-user spamd 1005 \
506      'spamassassin daemon user' /var/spool/spamd /bin/false      'spamassassin daemon user' /var/spool/spamd /bin/false
507    #clean 10.0b1 bad choice
508    if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then
509            unlink /etc/systemd/system/spamassassin.service; fi
510    if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then
511            /usr/bin/systemctl stop spamd.service
512            /usr/bin/systemctl stop spamassassin.service
513    fi
514    
515    
516    
517  %clean  %clean
518  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 483  rm -rf $RPM_BUILD_ROOT Line 520  rm -rf $RPM_BUILD_ROOT
520  %post  %post
521    
522  # Cleanup old files  # Cleanup old files
523  rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true  if [[  -d /var/lib/spamassassin/3.004000 ]]; then
524      rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
525    fi
526    
527  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then
528    echo "Installing new spam databases - please be patient"    echo "Installing new spam databases - please be patient"
# Line 497  if [[ ! -d /var/lib/spamassassin/3.00400 Line 536  if [[ ! -d /var/lib/spamassassin/3.00400
536    fi    fi
537  fi  fi
538    
539    if [[  -d /usr/lib/systemd/system/spamd.service.d ]]; then
540      rm -rf /usr/lib/systemd/system/spamd.service.d
541    fi
542    
543  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist
544  %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