From f4987a6fa5ed3f405b456d16825436c3642f0eab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Jul 2013 13:44:08 +0200 Subject: [PATCH] Fix: Upgrade of package break install --- build/rpm/dolibarr_fedora.spec | 42 ++++++++----- build/rpm/dolibarr_generic.spec | 104 +++++++++++++++++-------------- build/rpm/dolibarr_mandriva.spec | 51 ++++++++------- build/rpm/dolibarr_opensuse.spec | 54 +++++++++------- 4 files changed, 142 insertions(+), 109 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 1479a5bf023..ef7216d1bc3 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -297,29 +297,37 @@ echo "-------------------------------------------------------" echo -#---- postun (after uninstall) +#---- postun (after upgrade or uninstall) %postun -# Define vars -export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - -# Remove apache link -if [ -L $apachelink ] ; +if [ "x$1" = "x0" ] ; then - echo "Delete apache config link for Dolibarr ($apachelink)" - %{__rm} -f $apachelink - status=purge -fi + # Remove + echo "Removed package" -# Restart web servers if required -if [ "x$status" = "xpurge" ] ; -then - # Restart web server - echo Restart web server - /sbin/service httpd restart + # Define vars + export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + + # Remove apache link + if [ -L $apachelink ] ; + then + echo "Delete apache config link for Dolibarr ($apachelink)" + %{__rm} -f $apachelink + status=purge + fi + + # Restart web servers if required + if [ "x$status" = "xpurge" ] ; + then + # Restart web server + echo Restart web server + /sbin/service httpd restart + fi +else + # Upgrade + echo "No remove ation done (this is an upgrade)" fi - # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog * Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3 diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 4570d885dfd..160eaefbda4 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -488,63 +488,71 @@ echo -#---- postun (after uninstall) +#---- postun (after upgrade or uninstall) %postun -# Define vars -os='unknown'; -%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} -export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" -%else -%if 0%{?suse_version} -export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" -%else -if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; - export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" -fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then - export os='opensuse'; - export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" -fi -if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then - export os='mageia-mandriva'; - export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" -fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then - export os='ubuntu-debian'; - export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" -fi -%endif -%endif - -# Remove apache link -if [ -L $apachelink ] ; +if [ "x$1" = "x0" ] ; then - echo "Delete apache config link for Dolibarr ($apachelink)" - %{__rm} -f $apachelink - status=purge -fi + # Remove + echo "Removed package" -# Restart web servers if required -if [ "x$status" = "xpurge" ] ; -then - # Restart web server - echo Restart web server + # Define vars + os='unknown'; %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} - /sbin/service httpd restart + export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" %else - if [ -f %{_sysconfdir}/init.d/httpd ]; then - %{_sysconfdir}/init.d/httpd restart - fi - if [ -f %{_sysconfdir}/init.d/apache2 ]; then - %{_sysconfdir}/init.d/apache2 restart - fi - %endif + %if 0%{?suse_version} + export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + %else + if [ -d %{_sysconfdir}/httpd/conf.d ]; then + export os='fedora-redhat'; + export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + fi + if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then + export os='opensuse'; + export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + fi + if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + fi + if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then + export os='ubuntu-debian'; + export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + fi + %endif + %endif + + # Remove apache link + if [ -L $apachelink ] ; + then + echo "Delete apache config link for Dolibarr ($apachelink)" + %{__rm} -f $apachelink + status=purge + fi + + # Restart web servers if required + if [ "x$status" = "xpurge" ] ; + then + # Restart web server + echo Restart web server + %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} + /sbin/service httpd restart + %else + if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart + fi + if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart + fi + %endif + fi +else + # Upgrade + echo "No remove ation done (this is an upgrade)" fi - # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog * Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3 diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 533e2f03ff1..c6a78e9311a 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -296,31 +296,40 @@ echo "-------------------------------------------------------" echo -#---- postun (after uninstall) +#---- postun (after upgrade or uninstall) %postun -# Define vars -export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - -# Remove apache link -if [ -L $apachelink ] ; +if [ "x$1" = "x0" ] ; then - echo "Delete apache config link for Dolibarr ($apachelink)" - %{__rm} -f $apachelink - status=purge -fi + # Remove + echo "Removed package" -# Restart web servers if required -if [ "x$status" = "xpurge" ] ; -then - # Restart web server - echo Restart web server - if [ -f %{_sysconfdir}/init.d/httpd ]; then - %{_sysconfdir}/init.d/httpd restart - fi - if [ -f %{_sysconfdir}/init.d/apache2 ]; then - %{_sysconfdir}/init.d/apache2 restart - fi + # Define vars + export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + + # Remove apache link + if [ -L $apachelink ] ; + then + echo "Delete apache config link for Dolibarr ($apachelink)" + %{__rm} -f $apachelink + status=purge + fi + + # Restart web servers if required + if [ "x$status" = "xpurge" ] ; + then + # Restart web server + echo Restart web server + if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart + fi + if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart + fi + fi +else + # Upgrade + echo "No remove ation done (this is an upgrade)" fi diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 13b2f3ea20b..43b9e8c2d70 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -302,34 +302,42 @@ echo "-------------------------------------------------------" echo -#---- postun (after uninstall) +#---- postun (after upgrade or uninstall) %postun -# Define vars -export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - -# Remove apache link -if [ -L $apachelink ] ; +if [ "x$1" = "x0" ] ; then - echo "Delete apache config link for Dolibarr ($apachelink)" - %{__rm} -f $apachelink - status=purge + # Remove + echo "Removed package" + + # Define vars + export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + + # Remove apache link + if [ -L $apachelink ] ; + then + echo "Delete apache config link for Dolibarr ($apachelink)" + %{__rm} -f $apachelink + status=purge + fi + + # Restart web servers if required + if [ "x$status" = "xpurge" ] ; + then + # Restart web server + echo Restart web server + if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart + fi + if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart + fi + fi +else + # Upgrade + echo "No remove ation done (this is an upgrade)" fi -# Restart web servers if required -if [ "x$status" = "xpurge" ] ; -then - # Restart web server - echo Restart web server - if [ -f %{_sysconfdir}/init.d/httpd ]; then - %{_sysconfdir}/init.d/httpd restart - fi - if [ -f %{_sysconfdir}/init.d/apache2 ]; then - %{_sysconfdir}/init.d/apache2 restart - fi -fi - - # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog