[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f079f2b8f215d525efa9ecb8f5c0831354a1b289

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2943 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  f079f2b8f215d525efa9ecb8f5c0831354a1b289 (commit)
       via  5aa11a479b206c1121d261125bf6cce120e49184 (commit)
      from  4de56d3e6e760c01680196f32e2ce4be19965eb5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f079f2b8f215d525efa9ecb8f5c0831354a1b289
Merge: 4de56d3 5aa11a4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun May 20 16:51:16 2012 +0200

    Merge remote-tracking branch 'stevee/avahi'

commit 5aa11a479b206c1121d261125bf6cce120e49184
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun May 20 12:31:23 2012 +0200

    avahi: Add systemd service file and scriptlet.
    
    Add configure option to install native systemd service file.
    
    Fixes #10134.

-----------------------------------------------------------------------

Summary of changes:
 avahi/avahi.nm |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/avahi/avahi.nm b/avahi/avahi.nm
index fe6839d..3df04f7 100644
--- a/avahi/avahi.nm
+++ b/avahi/avahi.nm
@@ -5,7 +5,7 @@
 
 name       = avahi
 version    = 0.6.30
-release    = 2
+release    = 3
 
 groups     = Networking/Zeroconf
 url        = http://avahi.org/
@@ -38,10 +38,12 @@ build
 		pkg-config
 		python-devel
 		python-dbus
+		systemd-units
 	end
 
 	configure_options += \
 		--with-distro=none \
+		--with-systemdsystemunitdir=%{unitdir} \
 		--disable-gdbm \
 		--disable-qt3 \
 		--disable-qt4 \
@@ -53,7 +55,31 @@ end
 
 packages
 	package %{name}
-		requires = libdaemon>=0.14
+		requires
+			libdaemon>=0.14
+		end
+
+		# Just search for new unit files that were just installed.
+		script postin
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		# Disable the service that is to be removed and stop it if it is still running.
+		script preun
+			systemctl --no-reload disable avahi-daemon.service >/dev/null 2>&1 || :
+			systemctl stop avahi-daemon.service avahi-dnsconfd.service >/dev/null 2>&1 || :
+		end
+
+		# Just tell systemd that unitfiles have been removed.
+		script postun
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		# Try to restart the service if it is running.
+		script postup
+			systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl try-restart avahi-daemon.service avahi-dnsconfd.service >/dev/null 2>&1 || :
+		end
 	end
 
 	package %{name}-devel


hooks/post-receive
--
IPFire 3.x development tree