Attachment 612855 Details for Bug 854423 – Patch against git master HEAD to allow the package to be built and installed on EL 6 w/ EPEL

[patch] Patch against git master HEAD to allow the package to be built and installed on EL 6 w/ EPEL

openerp-6.1-2-for-el6-git-master-HEAD.patch (text/plain), 2.39 KB, created by Jeroen van Meeuwen on 2012-09-14 12:54:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeroen van Meeuwen

Created: 2012-09-14 12:54:25 UTC

Size: 2.39 KB

patch

obsolete

>diff --git a/openerp.spec b/openerp.spec
>index fccc5c0..7bc188c 100644
>--- a/openerp.spec
>+++ b/openerp.spec
>@@ -70,12 +70,14 @@ BuildRequires:  python-setuptools
> %endif
> 
> BuildRequires:  python2-devel
>+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
> BuildRequires:  systemd-units
>-
>-Requires(pre):    shadow-utils
> Requires(post):   systemd-units
> Requires(preun):  systemd-units
> Requires(postun): systemd-units
>+%endif
>+
>+Requires(pre):    shadow-utils
> 
> 
> %description
>@@ -165,8 +167,15 @@ install -m 644 -D install/openerp-server.conf  \
> install -d %{buildroot}%{_sysconfdir}/openerp/start.d
> install -d %{buildroot}%{_sysconfdir}/openerp/stop.d
> 
>-install -D -m 755 %SOURCE2 %{buildroot}%{_sbindir}/openerp-gen-cert
>-install -D -m 644 %SOURCE1 %{buildroot}%{_unitdir}/openerp.service
>+install -D -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/openerp-gen-cert
>+
>+%if 0%{?rhel} > 7 || 0%{?fedora} > 15
>+install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/openerp.service
>+%else
>+mkdir -p %{buildroot}%{_initddir}
>+install -pm 755 install/openerp-server.init %{buildroot}%{_initddir}/openerp-server
>+%endif
>+
> install -m 644  %{SOURCE3} %{SOURCE4} .
> 
> install -m 644 openerp/import_xml.rng %{buildroot}%{python_sitelib}/openerp
>@@ -195,22 +204,37 @@ usermod -d /var/run/openerp openerp >/dev/null 2>&1 || :
> %post
> if [ $1 -eq 1 ]; then
>     # Initial installation
>+%if 0%{?rhel} > 7 || 0%{?fedora} > 15
>     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+%else
>+    /sbin/chkconfig --add openerp-server
>+%endif
> fi
> 
> %preun
> if [ $1 -eq 0 ] ; then
>     # Package removal, not upgrade
>+%if 0%{?rhel} > 7 || 0%{?fedora} > 15
>     /bin/systemctl --no-reload disable \
>         openerp.service > /dev/null 2>&1 || :
>     /bin/systemctl stop openerp.service > /dev/null 2>&1 || :
>+%else
>+    /sbin/chkconfig --del openerp-server
>+%endif
> fi
> 
> %postun
>+%if 0%{?rhel} > 7 || 0%{?fedora} > 15
> /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+%endif
>+
> if [ $1 -ge 1 ] ; then
>     # Package upgrade, not uninstall
>+%if 0%{?rhel} > 7 || 0%{?fedora} > 15
>     /bin/systemctl try-restart openrep-server.service >/dev/null 2>&1 || :
>+%else
>+    /sbin/service openerp-server condrestart
>+%endif
> fi
> 
> 
>@@ -218,7 +242,11 @@ fi
> %doc LICENSE README  README.fedora LICENSING
> %{_bindir}/*
> %{_sbindir}/*
>+%if 0%{?rhel} > 7 || 0%{?fedora} > 15
> %{_unitdir}/*
>+%else
>+%{_initddir}/openerp-server
>+%endif
> %{_mandir}/man1/*
> %{_mandir}/man5/*
> %{_datadir}/openerp

Actions: View | Diff

Attachments on bug 854423: 612855