rpms/cyrus-imapd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove ldconfig and F26-specific bits.

Browse Source 
Remove the ldconfig scriptlets; they're not needed in F28+.
Remove <= F26 conditional block of test exclusions; obviously that's not
needed.
If F27 is to be updated, it must be done by cherry picking or separate
commits, as F27 still needs the ldconfig calls.
This commit is contained in:
Jason Tibbitts 2018-05-30 13:23:34 -05:00
parent aa34e471a1
commit 90c5977457
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cyrus-imapd.spec
View File

@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.7
Release: 2%{?dist}
Release: 3%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@ -109,8 +109,6 @@ BuildRequires: perl(Unix::Syslog) perl(XML::DOM) perl(XML::Generator)
%endif
Requires(pre): shadow-utils
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%{?systemd_requires}
Requires: %name-utils = %version-%release
@ -488,28 +486,6 @@ tests=(
for i in ${tests[@]}; do exclude+=("!$i"); done
%endif
%if 0%{?fedora} <= 26
# Some F26-specific test exclusions
tests=(
# These all fail because F26 perl doesn't support quad types in unpack.
Metadata.expunge_messages
Metadata.msg_replication_new_mas_partial_wwd
Metadata.msg_replication_new_rep
Metadata.msg_replication_new_mas
Metadata.msg_replication_exp_bot
Metadata.msg_replication_new_mas_partial_wwsw
Metadata.msg_replication_exp_mas
Metadata.msg_replication_mod_mas
Metadata.msg_replication_exp_rep
Metadata.msg_replication_mod_bot_msl
Metadata.msg_replication_new_bot_mse_gul
Metadata.msg_replication_mod_bot_msh
Metadata.msg_replication_new_bot_mse_guh
Metadata.msg_replication_mod_rep
)
for i in ${tests[@]}; do exclude+=("!$i"); done
%endif
# Add -vvv for too much output
./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1
@ -521,14 +497,12 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
-G saslauth -s /sbin/nologin -u %uid -r %cyrususer
%post
/sbin/ldconfig
%systemd_post cyrus-imapd.service
%preun
%systemd_preun cyrus-imapd.service
%postun
/sbin/ldconfig
%systemd_postun_with_restart cyrus-imapd.service
@ -620,6 +594,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
%changelog
* Wed May 30 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-3
- Remove ldconfig scriptlets.
- Remove F26-specific test exclusions.
* Fri May 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-2
- Really enable mysql and clamav support.