Attachment 914918 Details for Bug 1116553 – suggested patch

[patch] suggested patch

epel6.patch (text/plain), 3.16 KB, created by Matěj Cepl on 2014-07-06 07:35:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2014-07-06 07:35:11 UTC

Size: 3.16 KB

patch

obsolete

>diff --git a/dictd.spec b/dictd.spec
>index e1d988f..3902e2b 100644
>--- a/dictd.spec
>+++ b/dictd.spec
>@@ -1,3 +1,10 @@
>+%if 0%{?rhel} > 6 || 0%{?fedora} >= 16
>+%bcond_with         fedora
>+%bcond_without      systemd
>+%else
>+%bcond_without      fedora
>+%bcond_with         systemd
>+%endif
> %global _hardened_build 1
> # User management -- https://fedoraproject.org/wiki/PackageUserCreation
> %bcond_without      fedora
>@@ -12,17 +19,21 @@
> Summary:   DICT protocol (RFC 2229) server and command-line client
> Name:      dictd
> Version:   1.12.1
>-Release:   7%{?dist}
>+Release:   7.0.1.EL6rebuild%{?dist}
> License:   GPL+ and zlib and MIT
> Group:     Applications/Internet
> Source0:   http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz
> Source1:   dictd.service
> Source2:   libmaa-%{libmaaVersion}.tar.gz
>+Source3:   dictd.init
> Patch0:    dictd-1.12.1-unused-return.patch
> URL:       http://www.dict.org/
> 
> BuildRequires:  flex bison libtool libtool-ltdl-devel byacc
>-BuildRequires:  libdbi-devel, zlib-devel, gawk, systemd
>+BuildRequires:  libdbi-devel, zlib-devel, gawk
>+%if %{with systemd}
>+BuildRequires:  systemd
>+%endif
> Requires(pre):  shadow-utils
> 
> %description
>@@ -34,9 +45,15 @@ language dictionary databases.
> %package server
> Summary: Server for the Dictionary Server Protocol (DICT)
> Group: System Environment/Daemons
>+%if %{with systemd}
> Requires(post): systemd
> Requires(preun): systemd
> Requires(postun): systemd
>+%else
>+Requires(post):  chkconfig
>+Requires(preun): chkconfig
>+Requires(postun): initscripts
>+%endif
> %description server
> A server for the DICT protocol. You need to install dictd-usable databases
> before you can use this server. Those can be found p.e. at 
>@@ -65,9 +82,14 @@ make %{?_smp_mflags}
> %install
> make install DESTDIR=$RPM_BUILD_ROOT
> mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
>-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
> mkdir -p $RPM_BUILD_ROOT%{homedir}
>+%if %{with systemd}
>+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
> install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/dictd.service
>+%else
>+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
>+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/dictd
>+%endif
> 
> cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/dictd
> # Secure by default: --listen-to 127.0.0.1
>@@ -91,13 +113,33 @@ EOF
> 
> 
> %post server
>+%if %{with systemd}
> %systemd_post dictd.service
>+%else
>+if [ $1 = 1 ]; then
>+   /sbin/chkconfig --add dictd
>+fi
>+%endif
> 
> %preun server
>+%if %{with systemd}
> %systemd_preun dictd.service
>+%else
>+if [ $1 = 0 ]; then
>+   # Stop the service (otherwise userdel will fail)
>+   /etc/rc.d/init.d/dictd stop &>/dev/null || :
>+   /sbin/chkconfig --del dictd
>+fi
>+%endif
> 
> %postun server
>+%if %{with systemd}
> %systemd_postun_with_restart dictd.service 
>+%else
>+if [ $1 -ge 1 ] ; then
>+   /sbin/service dictd condrestart > /dev/null 2>&1 || :
>+fi
>+%endif
> 
> %pre
> getent group %{username} >/dev/null || groupadd -r %{username} -g %{uid}
>@@ -122,7 +164,11 @@ exit 0
> %{_bindir}/*
> %{_sbindir}/*
> %{_mandir}/man?/*
>+%if %{with systemd}
> %{_unitdir}/dictd.service
>+%else
>+%{_sysconfdir}/rc.d/init.d/*
>+%endif
> %{homedir}
> %config(noreplace) %{_sysconfdir}/sysconfig/dictd
> %config(noreplace) %{_sysconfdir}/dictd.conf

Actions: View | Diff

Attachments on bug 1116553: 914918