- kill systemd infestation

diff --git a/postfix.service b/postfix.service
deleted file mode 100644 (file)
index 6ea9214..0000000
--- a/postfix.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Postfix Mail Transport Agent
-After=syslog.target network.target
-Conflicts=sendmail.service exim.service
-
-[Service]
-Type=forking
-PIDFile=/var/spool/postfix/pid/master.pid
-ExecStart=/usr/sbin/postfix start
-ExecReload=/usr/sbin/postfix reload
-ExecStop=/usr/sbin/postfix stop
-
-[Install]
-WantedBy=multi-user.target

diff --git a/postfix.spec b/postfix.spec
index d6aec4ee7835b9a59e69ebe86515a58d40e7cfe7..06d83b5c8ec8f707fdfb30e85c2f1dc2bea532a7 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -22,7 +22,7 @@ Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho
 Summary(sk.UTF-8):     Agent prenosu pošty Postfix
 Name:          postfix
 Version:       2.11.3
-Release:       1
+Release:       2
 Epoch:         2
 License:       distributable
 Group:         Networking/Daemons/SMTP
@@ -43,7 +43,6 @@ Source10:     %{name}.monitrc
 Source11:      %{name}-vda-bigquota.patch
 #Source11:     http://vda.sourceforge.net/VDA/%{name}-%{vda_ver}-vda-ng-bigquota.patch.gz
 # -ource11-md5:        d46103195b43ec5784ea2c166b238f71
-Source12:      %{name}.service
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-conf_msg.patch
 Patch2:                %{name}-dynamicmaps.patch
@@ -90,7 +89,6 @@ Requires:     findutils
 Requires:      rc-scripts
 Requires:      sed
 %{?with_cdb:Requires:tinycdb}
-Requires:      systemd-units >= 38
 Suggests:      cyrus-sasl-saslauthd
 Provides:      group(postfix)
 Provides:      smtpdaemon
@@ -311,8 +309,7 @@ install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,
        $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/postfix,/usr/lib}\
        $RPM_BUILD_ROOT{%{_includedir}/postfix,%{_mandir}} \
        $RPM_BUILD_ROOT%{_var}/spool/postfix/{active,corrupt,deferred,maildrop,private,saved,bounce,defer,incoming,pid,public} \
-       $RPM_BUILD_ROOT%{_var}/lib/postfix \
-       $RPM_BUILD_ROOT%{systemdunitdir}
+       $RPM_BUILD_ROOT%{_var}/lib/postfix
 
 %{__rm} html/Makefile.in conf/{LICENSE,main.cf.default}
 
@@ -342,7 +339,6 @@ cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/smtp
 cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.pl
 cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.de
 cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
-cp -a %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 install -p auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail
 install -p auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{_bindir}/qshape
 
@@ -391,14 +387,12 @@ fi
 %{_bindir}/newaliases
 /sbin/chkconfig --add postfix
 %service postfix restart "Postfix Daemon"
-#%%systemd_post
 
 %preun
 if [ "$1" = "0" ]; then
        %service postfix stop
        /sbin/chkconfig --del postfix
 fi
-#%%systemd_preun
 
 %postun
 /sbin/ldconfig
@@ -407,7 +401,6 @@ if [ "$1" = "0" ]; then
        %userremove postfix
        %groupremove postfix
 fi
-#%%systemd_postun
 
 %files
 %defattr(644,root,root,755)
@@ -503,7 +496,6 @@ fi
 %{_mandir}/man5/transport.5*
 %{_mandir}/man5/virtual.5*
 %{_mandir}/man8/*.8*
-%{systemdunitdir}/%{name}.service
 
 %files devel
 %defattr(644,root,root,755)