From ddbb702adcb71bc778f7d828f1b98b4533a41c04fd590d69ac67053462d15f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 23 Aug 2024 18:24:13 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main postfix revision c107d1b3831e4e3c9cec627a4044eb44 --- postfix-bdb.changes | 10 ---------- postfix-bdb.spec | 14 ++++---------- postfix.changes | 10 ---------- postfix.spec | 14 ++++---------- 4 files changed, 8 insertions(+), 40 deletions(-) diff --git a/postfix-bdb.changes b/postfix-bdb.changes index 1c37a4d..f1cddbb 100644 --- a/postfix-bdb.changes +++ b/postfix-bdb.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 9 08:48:52 UTC 2024 - Thorsten Kukuk - -- Remove rcpostfix symlink [jsc#PED-266] - -------------------------------------------------------------------- -Wed Aug 7 06:34:05 UTC 2024 - Thorsten Kukuk - -- postfix-script requires cmp - ------------------------------------------------------------------- Thu Aug 1 08:36:10 UTC 2024 - Peter Varkoly diff --git a/postfix-bdb.spec b/postfix-bdb.spec index 26ced5a..0379069 100644 --- a/postfix-bdb.spec +++ b/postfix-bdb.spec @@ -126,18 +126,16 @@ Requires(pre): group(%{mail_group}) %else Requires(pre): shadow %endif -# /usr/lib/postfix/bin//postfix-script: line 400: cmp: command not found -Requires: /usr/bin/cmp # /usr/lib/postfix/bin//post-install: line 667: ed: command not found Requires(pre): ed -Requires(preun): ed +Requires(preun):ed Requires(post): ed -Requires(postun): ed +Requires(postun):ed # /usr/sbin/config.postfix needs perl Requires(pre): perl -Requires(preun): perl +Requires(preun):perl Requires(post): perl -Requires(postun): perl +Requires(postun):perl %description Postfix aims to be an alternative to the widely-used sendmail program with bdb support @@ -367,9 +365,7 @@ install -m 0755 postfix-SUSE/update_chroot.systemd %{buildroot}%{pf_shlib_dire install -m 0755 postfix-SUSE/update_postmaps.systemd %{buildroot}%{pf_shlib_directory}/systemd/update_postmaps install -m 0755 postfix-SUSE/wait_qmgr.systemd %{buildroot}%{pf_shlib_directory}/systemd/wait_qmgr install -m 0755 postfix-SUSE/cond_slp.systemd %{buildroot}%{pf_shlib_directory}/systemd/cond_slp -%if 0%{?suse_version} < 1599 ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rcpostfix -%endif %fdupes %{buildroot}%{pf_docdir} %fdupes %{buildroot}%{_mandir} for path in %{buildroot}%{pf_shlib_directory}/libpostfix-*.so @@ -530,9 +526,7 @@ fi %attr(0755,root,root) %{_sbindir}/mkpostfixcert %attr(0755,root,root) %{_sbindir}/check_mail_queue %attr(0755,root,root) %{_sbindir}/config.postfix -%if 0%{?suse_version} < 1599 %{_sbindir}/rcpostfix -%endif %{_libdir}/lib* %{_libexecdir}/sendmail %dir %{pf_shlib_directory} diff --git a/postfix.changes b/postfix.changes index 8ccf3a4..f1cddbb 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 9 08:48:07 UTC 2024 - Thorsten Kukuk - -- Remove rcpostfix symlink [jsc#PED-266] - -------------------------------------------------------------------- -Wed Aug 7 06:34:05 UTC 2024 - Thorsten Kukuk - -- postfix-script requires cmp - ------------------------------------------------------------------- Thu Aug 1 08:36:10 UTC 2024 - Peter Varkoly diff --git a/postfix.spec b/postfix.spec index 3bebca2..6e694bf 100644 --- a/postfix.spec +++ b/postfix.spec @@ -108,18 +108,16 @@ BuildRequires: openldap2-devel %if %{with libnsl} BuildRequires: libnsl-devel %endif -# /usr/lib/postfix/bin//postfix-script: line 400: cmp: command not found -Requires: /usr/bin/cmp # /usr/lib/postfix/bin//post-install: line 667: ed: command not found Requires(pre): /usr/bin/ed -Requires(preun): /usr/bin/ed +Requires(preun):/usr/bin/ed Requires(post): /usr/bin/ed -Requires(postun): /usr/bin/ed +Requires(postun):/usr/bin/ed # /usr/sbin/config.postfix needs perl Requires(pre): perl -Requires(preun): perl +Requires(preun):perl Requires(post): perl -Requires(postun): perl +Requires(postun):perl %description Postfix aims to be an alternative to the widely-used sendmail program. @@ -393,9 +391,7 @@ install -pm 0755 %{name}-SUSE/update_chroot.systemd %{buildroot}%{pf_shlib_dir install -pm 0755 %{name}-SUSE/update_postmaps.systemd %{buildroot}%{pf_shlib_directory}/systemd/update_postmaps install -pm 0755 %{name}-SUSE/wait_qmgr.systemd %{buildroot}%{pf_shlib_directory}/systemd/wait_qmgr install -pm 0755 %{name}-SUSE/cond_slp.systemd %{buildroot}%{pf_shlib_directory}/systemd/cond_slp -%if 0%{?suse_version} < 1599 ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} -%endif ln -sv %{_unitdir}/%{name}.service %{buildroot}%{_unitdir}/mail-transfer-agent.target.wants/%{name}.service %fdupes %{buildroot}%{pf_docdir} %fdupes %{buildroot}%{_mandir} @@ -562,9 +558,7 @@ fi %attr(0755,root,root) %{_sbindir}/mk%{name}cert %attr(0755,root,root) %{_sbindir}/check_mail_queue %attr(0755,root,root) %{_sbindir}/config.%{name} -%if 0%{?suse_version} < 1599 %{_sbindir}/rc%{name} -%endif %{_libdir}/lib* %{_libexecdir}/sendmail %dir %{pf_shlib_directory}