Skip to content

Commit

Permalink
Relay Fixes for MailWatch
Browse files Browse the repository at this point in the history
  • Loading branch information
shawniverson committed Nov 22, 2021
1 parent 61fca68 commit ed90929
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 0 additions & 2 deletions rpmbuild/SOURCES/eFa-base-4.0.0/composer.json

This file was deleted.

9 changes: 6 additions & 3 deletions rpmbuild/SPECS/MailWatch.spec
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ Summary: MailWatch Web Front-End for MailScanner
Name: MailWatch
Version: 1.2.18
Epoch: 1
Release: 3.eFa%{?dist}
Release: 4.eFa%{?dist}
License: GNU GPL v2
Group: Applications/Utilities
URL: https://github.com/mailwatch/MailWatch
#Source: https://github.com/mailwatch/MailWatch/archive/v%{version}.tar.gz
Source: https://github.com/shawniverson/MailWatch/archive/refs/heads/111421cherrypick.tar.gz
Source: https://github.com/shawniverson/MailWatch/archive/refs/heads/112121cherrypick.tar.gz
Source2: favicon.ico
Source3: eFa4logo-79px.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Expand All @@ -51,7 +51,7 @@ queried by MailWatch for reporting and statistics.

%prep
#%setup -q -n %{name}-%{version}
%setup -q -n %{name}-111421cherrypick
%setup -q -n %{name}-112121cherrypick

%build
# Nothing to do
Expand Down Expand Up @@ -312,6 +312,9 @@ chgrp apache %{_localstatedir}/www/html/mailscanner/temp
%{_localstatedir}/www/html/mailscanner/viewpart.php

%changelog
* Sun Nov 21 2021 Shawn Iverson <[email protected]> - 1.2.18-4
- Relay fixes

* Tue Nov 16 2021 Shawn Iverson <[email protected]> - 1.2.18-3
- Reapply Unfold message-id field for MailWatch Logger

Expand Down
7 changes: 5 additions & 2 deletions rpmbuild/SPECS/eFa4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Name: eFa
Summary: eFa Maintenance rpm
Version: 4.0.4
Release: 23.eFa%{?dist}
Release: 24.eFa%{?dist}
Epoch: 1
Group: Applications/System
URL: https://efa-project.org
Expand Down Expand Up @@ -215,7 +215,7 @@ Requires: perl-libnet >= 3.11-1
# perl-libnet # eFa # Spamassassin
Requires: perl-Encoding-FixLatin >= 1.04-1
# perl-Encoding-FixLatin # eFa # MailWatch
Requires: MailWatch >= 1:1.2.18-2
Requires: MailWatch >= 1:1.2.18-4
# MailWatch # eFa # MailWatch Frontend
Requires: dcc >= 2.3.167-2
# dcc # eFa # Spamassassin, MailScanner
Expand Down Expand Up @@ -543,6 +543,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644, root, root) %{_sysconfdir}/logrotate.d/eFa-logrotate

%changelog
* Sun Nov 21 2021 eFa Project <[email protected]> - 4.0.4-24
- MailWatch update to 1.2.18-4 relay fixes

* Tue Nov 16 2021 eFa Project <[email protected]> - 4.0.4-23
- Reapply MailWatch update to 1.2.18-3 unfold message-id

Expand Down

0 comments on commit ed90929

Please sign in to comment.