Hi Michal,
On Fri, 27 May 2011 16:10:50 +0000 (UTC)
Michal Hlavinka <mhlavink@xxxxxxxxxxxxxxxxx> wrote:
> commit b68c74888ca43310e2f6bea942073ae975fd6050
> Author: Michal Hlavinka <mhlavink@xxxxxxxxxx>
> Date: Fri May 27 18:10:30 2011 +0200
>
> make spec work for epel5 and epel6
>
> dovecot.spec | 16 +++++++++++-----
> 1 files changed, 11 insertions(+), 5 deletions(-)
> ---
> diff --git a/dovecot.spec b/dovecot.spec
> index 494b3da..4c50c7c 100644
> --- a/dovecot.spec
> +++ b/dovecot.spec
> @@ -43,11 +43,16 @@ BuildRequires: krb5-devel
> Requires: openssl >= 0.9.7f-4
>
> # Package includes an initscript service file, needs to require
> initscripts package -Requires: initscripts
> Requires(pre): shadow-utils
> Requires(post): chkconfig shadow-utils
> Requires(preun): shadow-utils chkconfig initscripts
> +%if %{?fedora}0 > 140 || %{?rhel}0 > 60
> +Requires: systemd
> +Requires(postun): systemd
> +%else
> +Requires: initscripts
> Requires(postun): initscripts
> +%endif
>
> %define ssldir %{_sysconfdir}/pki/%{name}
>
> @@ -136,7 +141,7 @@ make %{?_smp_mflags}
>
> #pigeonhole
> pushd dovecot-2.0-pigeonhole-%{pigeonholever}
> -autoreconf -fiv
> +#autoreconf -fiv
> %configure \
> INSTALL_DATA="install -c -p -m644" \
> --disable-static \
> @@ -158,7 +163,6 @@ popd
> #move doc dir back to build dir so doc macro in files section can
> use it mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
> %{_builddir}/%{name}-%{version}/docinstall
> -install -p -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/dovecot
>
> %if %{?fedora}00%{?rhel} < 6
> sed -i 's|password-auth|system-auth|' %{SOURCE2}
> @@ -181,6 +185,8 @@ chmod 600
> $RPM_BUILD_ROOT%{ssldir}/private/dovecot.pem
> %if %{?fedora}0 > 140 || %{?rhel}0 > 60
> install -p -D -m 644 %{SOURCE10}
> $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/dovecot.conf +%else
> +install -p -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/dovecot
> %endif
You probably want to conditionally include /etc/sysconfig/dovecot too
as it's used by the SysV initscript but not by the systemd unit file.
Paul.
--
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
