From c9b618f56bc3d027ef7765f524d0570e66c4adcc Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Nov 24 2016 01:38:56 +0000 Subject: 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. --- diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 3b13d1c..3c68669 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -43,8 +43,8 @@ BuildRequires: libical-devel libxml2-devel net-snmp-devel openldap-devel BuildRequires: openssl-devel sqlite-devel Requires(pre): shadow-utils -Requires(post): e2fsprogs, perl, grep, coreutils, findutils, systemd-units -Requires(preun): systemd-units, coreutils +Requires(post): perl, grep, coreutils, systemd-units +Requires(preun): systemd-units Requires(postun): systemd-units Requires: %{name}-utils = %{version}-%{release} @@ -85,7 +85,6 @@ recipients, SIEVE provides server side email filtering. Summary: Cyrus IMAP server development files Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig -Provides: %{name}-static = %{version}-%{release} %description devel The %{name}-devel package contains header files and libraries @@ -93,8 +92,6 @@ necessary for developing applications which use the imclient library. %package utils Summary: Cyrus IMAP server administration utilities -Requires(post): grep, coreutils, make, openssl -Requires(postun): shadow-utils %description utils 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} %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 exec > /dev/null 2> /dev/null