Clean up scriptlets and dependencies.
The %pre scriptlet had some horrible hack to try and turn on synchronous writes if /var was on ext2. That hasn't been useful for a long time. cyrus no longer builds static libraries, so don't bother having the -devel package provide a -static package. Scriptlet dependencies were weird across the board; the -utils package had scriptlet deps but didn't even have any scriptlets. Clean all of that up.
This commit is contained in:
parent
92f542ee81
commit
c9b618f56b
@ -43,8 +43,8 @@ BuildRequires: libical-devel libxml2-devel net-snmp-devel openldap-devel
|
|||||||
BuildRequires: openssl-devel sqlite-devel
|
BuildRequires: openssl-devel sqlite-devel
|
||||||
|
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
Requires(post): e2fsprogs, perl, grep, coreutils, findutils, systemd-units
|
Requires(post): perl, grep, coreutils, systemd-units
|
||||||
Requires(preun): systemd-units, coreutils
|
Requires(preun): systemd-units
|
||||||
Requires(postun): systemd-units
|
Requires(postun): systemd-units
|
||||||
|
|
||||||
Requires: %{name}-utils = %{version}-%{release}
|
Requires: %{name}-utils = %{version}-%{release}
|
||||||
@ -85,7 +85,6 @@ recipients, SIEVE provides server side email filtering.
|
|||||||
Summary: Cyrus IMAP server development files
|
Summary: Cyrus IMAP server development files
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: pkgconfig
|
Requires: pkgconfig
|
||||||
Provides: %{name}-static = %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The %{name}-devel package contains header files and libraries
|
The %{name}-devel package contains header files and libraries
|
||||||
@ -93,8 +92,6 @@ necessary for developing applications which use the imclient library.
|
|||||||
|
|
||||||
%package utils
|
%package utils
|
||||||
Summary: Cyrus IMAP server administration utilities
|
Summary: Cyrus IMAP server administration utilities
|
||||||
Requires(post): grep, coreutils, make, openssl
|
|
||||||
Requires(postun): shadow-utils
|
|
||||||
|
|
||||||
%description utils
|
%description utils
|
||||||
The cyrus-imapd-utils package contains administrative tools for the
|
The cyrus-imapd-utils package contains administrative tools for the
|
||||||
@ -275,15 +272,6 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{
|
|||||||
-G saslauth -s /sbin/nologin -u %{uid} -r %{cyrususer}
|
-G saslauth -s /sbin/nologin -u %{uid} -r %{cyrususer}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
|
||||||
# Force synchronous updates, usually only on ext2 filesystems
|
|
||||||
for i in %{_var}/lib/imap/{user,quota} %{_var}/spool/imap
|
|
||||||
do
|
|
||||||
if [ "$(find $i -maxdepth 0 -printf %%F)" = "ext2" ]; then
|
|
||||||
chattr -R +S $i 2>/dev/null ||:
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Create SSL certificates
|
# Create SSL certificates
|
||||||
exec > /dev/null 2> /dev/null
|
exec > /dev/null 2> /dev/null
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user