Request 356 (accepted)

Overview

Request 356 (accepted)

* cyrus-imapd-2.4.17_htmlstrip_no_return.patch added (not submitted upstream)
* use suse macros for sysconfig handling

Created by ajaissle over 10 years ago
In state accepted
Open review for Admin

Submit cyrus-imapd

Submit package home:ajaissle...b:Development / cyrus-imapd to package Kolab:Development / cyrus-imapd

cyrus-imapd.spec Changed

@@ -59,6 +59,8 @@
 # for c-i <= 2.4.12
 Patch12:            cyrus-imapd-2.4.12-debugopt.patch
 Patch13:            %{name}-2.3.16-002-strip-out-krb4.patch
+# PATCH-FIX-UPSTREAM cyrus-imapd-2.4.17_htmlstrip_no_return.patch
+Patch20:            %{name}-2.4.17_htmlstrip_no_return.patch
 # Patches of which the status or upstream is unknown
 Patch903:           %{name}-2.4.15-903-normalize-authorization-id.patch
 Patch905:           cyrus-imapd-2.4.10-ptloader-ldap_user_attribute.patch
@@ -110,6 +112,15 @@
 Requires:           file
 Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%if 0%{?suse_version}
+%if 0%{?with_systemd}
+PreReq: %fillup_prereq
+%else
+PreReq: %fillup_prereq
+PreReq: %insserv_prereq
+%endif
+%endif
+
 Requires(post):     coreutils
 Requires(post):     e2fsprogs
 Requires(post):     findutils
@@ -184,6 +195,8 @@
 %patch12 -p1
 %patch13 -p1
 
+%patch20 -p1
+
 %patch903 -p1
 %patch905 -p1
 
@@ -286,6 +299,11 @@
   %{buildroot}%{_sysconfdir}/pki/%{_name} \
   doc/contrib
 
+%if 0%{?suse_version}
+%{__install} -d \
+  %{buildroot}%{_localstatedir}/adm/fillup-templates/
+%endif
+
 # Install additional files
 %{__install} -p -m 644 master/conf/prefork.conf %{buildroot}%{_sysconfdir}/cyrus.conf
 %{__install} -p -m 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/imapd.conf
@@ -300,7 +318,11 @@
 %{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/nntp
 %{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/csync
 %{__install} -p -m 755 %{SOURCE13}   %{buildroot}%{_sysconfdir}/cron.daily/%{_name}
+%if 0%{?suse_version}
+%{__install} -p -m 644 %{SOURCE22}   %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{_name}
+%else
 %{__install} -p -m 644 %{SOURCE22}   %{buildroot}%{_sysconfdir}/sysconfig/%{_name}
+%endif
 
 %if 0%{?with_systemd}
 %{__install} -p -D -m 644 %{SOURCE31}   %{buildroot}%{_unitdir}/cyrus-imapd.service
@@ -377,6 +399,14 @@
 %post
 CHATTRSYNC=0
 
+%if 0%{?suse_version}
+%if 0%{?with_systemd}
+    %fillup_only %{_name}
+%else
+    %fillup_and_insserv %{_name}
+%endif
+%endif
+
 if [ -f "%{_sysconfdir}/sysconfig/cyrus-imapd" ]; then
     source %{_sysconfdir}/sysconfig/cyrus-imapd
 fi
@@ -412,14 +442,22 @@
 fi
 
 %if 0%{?with_systemd}
+%if 0%{?suse_version}
+    %service_add_post cyrus-imapd.service
+%else
     %systemd_post cyrus-imapd.service
+%endif
 %else
     /sbin/chkconfig --add %{_name}
 %endif
 
 %preun
 %if 0%{?with_systemd}
+%if 0%{?suse_version}
+    %service_del_preun cyrus-imapd.service
+%else
     %systemd_preun cyrus-imapd.service
+%endif
 %else
     if [ $1 = 0 ]; then
         /sbin/service %{_name} stop >/dev/null 2>&1 || :
@@ -429,7 +467,11 @@
 
 %postun
 %if 0%{?with_systemd}
+%if 0%{?suse_version}
+    %service_del_postun cyrus-imapd.service
+%else
     %systemd_postun_with_restart cyrus-imapd.service
+%endif
 %else
     if [ $1 != 0 ]; then
         /sbin/service %{_name} condrestart >/dev/null 2>&1 || :
@@ -450,7 +492,11 @@
 %endif
 %dir %{_sysconfdir}/pki
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{_name}
+%if 0%{?suse_version}
+%config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.%{_name}
+%else
 %config(noreplace) %{_sysconfdir}/sysconfig/%{_name}
+%endif
 %config(noreplace) %{_sysconfdir}/pam.d/pop
 %config(noreplace) %{_sysconfdir}/pam.d/imap
 %config(noreplace) %{_sysconfdir}/pam.d/sieve

cyrus-imapd-2.4.17_htmlstrip_no_return.patch Added

Build Results
RPM Lint

Refresh

Comments for request 356 0

Request History

ajaissle created request over 10 years ago

* cyrus-imapd-2.4.17_htmlstrip_no_return.patch added (not submitted upstream)
* use suse macros for sysconfig handling

vanmeeuwen accepted review over 10 years ago

vanmeeuwen accepted request over 10 years ago

Please add a comment

vanmeeuwen accepted request over 10 years ago

Please add a comment