Fix: Upgrade of package break install

build/rpm/dolibarr_fedora.spec

@@ -297,29 +297,37 @@ echo "-------------------------------------------------------"
 echo
 
 
-#---- postun (after uninstall)
+#---- postun (after upgrade or uninstall)
 %postun
 
-# Define vars
+if [ "x$1" = "x0" ] ;
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
 then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
+	# Remove
-    %{__rm} -f $apachelink
+	echo "Removed package"
-    status=purge
-fi
 
-# Restart web servers if required
+	# Define vars
-if [ "x$status" = "xpurge" ] ;
+	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-then
+	
-    # Restart web server
+	# Remove apache link
-    echo Restart web server
+	if [ -L $apachelink ] ;
-    /sbin/service httpd restart
+	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

build/rpm/dolibarr_generic.spec

@@ -488,63 +488,71 @@ echo
 
 
 
-#---- postun (after uninstall)
+#---- postun (after upgrade or uninstall)
 %postun
 
-# Define vars
+if [ "x$1" = "x0" ] ;
-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 ] ;
 then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
+	# Remove
-    %{__rm} -f $apachelink
+	echo "Removed package"
-    status=purge
-fi
 
-# Restart web servers if required
+	# Define vars
-if [ "x$status" = "xpurge" ] ;
+	os='unknown';
-then
-    # Restart web server
-    echo Restart web server
 	%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
+	%if 0%{?suse_version}
-        %{_sysconfdir}/init.d/httpd restart
+	export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    fi
+	%else
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+	if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-        %{_sysconfdir}/init.d/apache2 restart
+	    export os='fedora-redhat';
-    fi
+	    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    %endif
+	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

build/rpm/dolibarr_mandriva.spec

@@ -296,31 +296,40 @@ echo "-------------------------------------------------------"
 echo
 
 
-#---- postun (after uninstall)
+#---- postun (after upgrade or uninstall)
 %postun
 
-# Define vars
+if [ "x$1" = "x0" ] ;
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
 then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
+	# Remove
-    %{__rm} -f $apachelink
+	echo "Removed package"
-    status=purge
-fi
 
-# Restart web servers if required
+	# Define vars
-if [ "x$status" = "xpurge" ] ;
+	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-then
+	
-    # Restart web server
+	# Remove apache link
-    echo Restart web server
+	if [ -L $apachelink ] ;
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+	then
-        %{_sysconfdir}/init.d/httpd restart
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
-    fi
+	    %{__rm} -f $apachelink
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+	    status=purge
-        %{_sysconfdir}/init.d/apache2 restart
+	fi
-    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
 
 

build/rpm/dolibarr_opensuse.spec

@@ -302,34 +302,42 @@ echo "-------------------------------------------------------"
 echo
 
 
-#---- postun (after uninstall)
+#---- postun (after upgrade or uninstall)
 %postun
 
-# Define vars
+if [ "x$1" = "x0" ] ;
-export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
 then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
+	# Remove
-    %{__rm} -f $apachelink
+	echo "Removed package"
-    status=purge
+	
+	# 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