/[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.17 by jpp, Sun Feb 21 16:41:24 2021 UTC Revision 1.22 by jpp, Tue Feb 23 17:14:33 2021 UTC
# Line 1  Line 1 
1  # $Id: smeserver-spamassassin.spec,v 1.16 2021/02/19 06:03:30 jpp Exp $  # $Id: smeserver-spamassassin.spec,v 1.21 2021/02/22 04:23:46 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 6  %define release 8
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
# Line 13  Source: %{name}-%{version}.tar.xz Line 13  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  Patch1: smeserver-spamassassin-2.7.0-bz11361-spamd-fails.patch
15  Patch2: smeserver-spamassassin-2.7.0-bz11362-logging.patch  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 44  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 Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
49    - remove warning while trying to delete file when missing in post script [SME: 11375]
50    
51    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme
52    - remove spamd reference as service use spamassassin.service [SME: 11375]
53      migrate spamd propertie SpamLearning to spamassassin
54      template for /etc/sysconfig/spamassassin, revert --allow-tell option
55      stop spamassassin spamd and delete /etc/systemd/system/spamassassin.service link if exists
56    
57  * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-6.sme  * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-6.sme
58  - fix typo [SME: 11361]  - fix typo [SME: 11361]
59    
# Line 469  SME Server - spamassassin anti-spam modu Line 479  SME Server - spamassassin anti-spam modu
479  rm -rf root/etc/e-smith/templates/usr/  rm -rf root/etc/e-smith/templates/usr/
480  rm -rf root//usr/lib/systemd/system/spamd.service.d  rm -rf root//usr/lib/systemd/system/spamd.service.d
481  %patch2 -p1  %patch2 -p1
482    %patch3 -p1
483    rm -rf root/etc/e-smith/db/configuration/defaults/spamd
484    
485  %build  %build
486  perl createlinks  perl createlinks
# Line 489  rm -f %{name}-%{version}-%{release}-file Line 501  rm -f %{name}-%{version}-%{release}-file
501  %pre  %pre
502  /sbin/e-smith/create-system-user spamd 1005 \  /sbin/e-smith/create-system-user spamd 1005 \
503      'spamassassin daemon user' /var/spool/spamd /bin/false      'spamassassin daemon user' /var/spool/spamd /bin/false
504    #clean 10.0b1 bad choice
505    if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then
506            unlink /etc/systemd/system/spamassassin.service; fi
507    if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then
508            /usr/bin/systemctl stop spamd.service
509            /usr/bin/systemctl stop spamassassin.service
510    fi
511    
512    
513    
514  %clean  %clean
515  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 496  rm -rf $RPM_BUILD_ROOT Line 517  rm -rf $RPM_BUILD_ROOT
517  %post  %post
518    
519  # Cleanup old files  # Cleanup old files
520  rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true  if [[  -d /var/lib/spamassassin/3.004000 ]]; then
521      rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
522    fi
523    
524  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then
525    echo "Installing new spam databases - please be patient"    echo "Installing new spam databases - please be patient"
# Line 510  if [[ ! -d /var/lib/spamassassin/3.00400 Line 533  if [[ ! -d /var/lib/spamassassin/3.00400
533    fi    fi
534  fi  fi
535    
536  rm -rf /usr/lib/systemd/system/spamd.service.d 2>/dev/null || true  if [[  -d /usr/lib/systemd/system/spamd.service.d ]]; then
537      rm -rf /usr/lib/systemd/system/spamd.service.d
538    fi
539    
540  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist
541  %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