Remove example config file and service unit

Include systemd related documentation from upstream contrib directory
instead.

Resolves: #2027047

Signed-off-by: Vitezslav Crhonek <vcrhonek@redhat.com>
This commit is contained in:
Vitezslav Crhonek 2022-03-21 11:27:36 +01:00
parent 2224c5a217
commit a5d63f9bb7
3 changed files with 5 additions and 29 deletions

View File

@ -1,11 +0,0 @@
[Unit]
Description=A remote-mail retrieval utility
After=local-fs.target network.target
[Service]
User=mail
ExecStart=/usr/bin/fetchmail -d 300 --fetchmailrc /etc/fetchmailrc.example
RestartSec=1
[Install]
WantedBy=multi-user.target

View File

@ -4,14 +4,10 @@ Version: 6.4.29
Release: 1%{?dist} Release: 1%{?dist}
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
# systemd service file
Source2: fetchmail.service
# example configuration file
Source3: fetchmailrc.example
URL: http://www.fetchmail.info/ URL: http://www.fetchmail.info/
# For a breakdown of the licensing, see COPYING # For a breakdown of the licensing, see COPYING
License: GPL+ and Public Domain License: GPL+ and Public Domain
BuildRequires: gcc gettext-devel krb5-devel openssl-devel systemd python3-devel BuildRequires: gcc gettext-devel krb5-devel openssl-devel python3-devel
BuildRequires: make BuildRequires: make
%description %description
@ -38,14 +34,6 @@ make
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# install example systemd unit
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/fetchmail.service
# install example config file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m 600 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fetchmailrc.example
# remove fetchmailconf stuff # remove fetchmailconf stuff
rm -f $RPM_BUILD_ROOT%{_bindir}/fetchmailconf* rm -f $RPM_BUILD_ROOT%{_bindir}/fetchmailconf*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/fetchmailconf.1* rm -f $RPM_BUILD_ROOT%{_mandir}/man1/fetchmailconf.1*
@ -55,15 +43,16 @@ rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
%find_lang %name %find_lang %name
%files -f %{name}.lang %files -f %{name}.lang
%doc COPYING FAQ FEATURES NEWS NOTES README README.SSL TODO %doc COPYING FAQ FEATURES NEWS NOTES README README.SSL TODO contrib/systemd
%{_bindir}/fetchmail %{_bindir}/fetchmail
%{_mandir}/man1/fetchmail.1* %{_mandir}/man1/fetchmail.1*
%{_unitdir}/fetchmail.service
%config(noreplace) %attr(0600, mail, mail) %{_sysconfdir}/fetchmailrc.example
%changelog %changelog
* Mon Mar 21 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.29-1 * Mon Mar 21 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.29-1
- Update to fetchmail-6.4.29 - Update to fetchmail-6.4.29
- Remove example config file and service unit, include systemd related
documentation from upstream contrib directory
Resolves: #2027047
* Thu Mar 17 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.28-1 * Thu Mar 17 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.28-1
- Update to fetchmail-6.4.28 - Update to fetchmail-6.4.28

View File

@ -1,2 +0,0 @@
#poll pop.domain.com proto pop3
# user 'user1' there with password 'secret' is user1 here