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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3158 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  cd069e941a85c345635ee58d14c6d2b7adc6e532 (commit)
       via  3af791464e05795729338ba5bdfde2ae1b443e80 (commit)
      from  ef7344ff5166b9cfaf509c80522150fb4e562681 (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 cd069e941a85c345635ee58d14c6d2b7adc6e532
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jun 24 00:42:36 2012 +0200

    ppp: Reload systemd after install/update/uninstall.

commit 3af791464e05795729338ba5bdfde2ae1b443e80
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jun 24 00:35:39 2012 +0200

    rp-pppoe: Fix a typo.
    
    The build removed half of its build environment. Oops.

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

Summary of changes:
 ppp/ppp.nm           |   15 ++++++++++++++-
 rp-pppoe/rp-pppoe.nm |   17 +++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index 8a0ab3f..b893b54 100644
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -5,7 +5,7 @@
 
 name       = ppp
 version    = 2.4.5
-release    = 4
+release    = 5
 
 groups     = System/Daemons
 url        = ftp://ftp.samba.org/pub/ppp/
@@ -28,6 +28,7 @@ build
 		linux-atm-devel
 		openssl-devel
 		pam-devel
+		systemd-units
 	end
 
 	# Explicitely add -fPIC to CFLAGS.
@@ -63,6 +64,18 @@ end
 
 packages
 	package %{name}
+		script postin
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postun
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+	end
 
 	package %{name}-devel
 		template DEVEL
diff --git a/rp-pppoe/rp-pppoe.nm b/rp-pppoe/rp-pppoe.nm
index 0751f43..aa433c2 100644
--- a/rp-pppoe/rp-pppoe.nm
+++ b/rp-pppoe/rp-pppoe.nm
@@ -5,7 +5,7 @@
 
 name       = rp-pppoe
 version    = 3.10
-release    = 1
+release    = 2
 
 groups     = Networking/Dialin
 url        = http://www.roaringpenguin.com/pppoe/
@@ -27,6 +27,7 @@ build
 		iproute2
 		libtool
 		ppp-devel
+		systemd-units
 	end
 
 	DIR_APP := %{DIR_APP}/src
@@ -57,7 +58,7 @@ build
 		rm -vf %{BUILDROOT}%{sbindir}/pppoe-{connect,start,stop,status,setup}
 		rm -vf %{BUILDROOT}%{mandir}/man*/pppoe-{connect,start,stop,status,setup}*
 		rm -vf %{BUILDROOT}%{mandir}/man*/pppoe.{,conf}*
-		rm -rvf ${BUILDROOT}%{libdir}
+		rm -rvf %{BUILDROOT}%{libdir}
 	end
 end
 
@@ -67,6 +68,18 @@ packages
 			iproute2
 			ppp
 		end
+
+		script postin
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postun
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
 	end
 
 	package %{name}-debuginfo


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