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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2749 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  ec040d8965dea87452484081e0481633e459d726 (commit)
       via  1fcbfc00b631dc72fd8522aeb3cb5a030eec2195 (commit)
      from  e1a6656ec74bf88002f170efc32c6fc5cf340ce3 (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 ec040d8965dea87452484081e0481633e459d726
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jul 22 11:32:38 2012 +0200

    plymouth: Build without libkms.

commit 1fcbfc00b631dc72fd8522aeb3cb5a030eec2195
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jul 22 11:31:55 2012 +0200

    wpa_supplicant: Update to 1.0.

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

Summary of changes:
 plymouth/plymouth.nm             |   10 +++-------
 wpa_supplicant/wpa_supplicant.nm |    3 +--
 2 files changed, 4 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 55e1720..cee24a2 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -5,7 +5,7 @@
 
 name       = plymouth
 version    = 0.8.5.1
-release    = 3
+release    = 4
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -37,12 +37,7 @@ build
 
 	enable_libdrm_intel = 0
 
-	if "%{DISTRO_MACHINE}" == "x86_64"
-		enable_libdrm_intel = 1
-		requires += pkgconfig(libdrm_intel)
-	end
-
-	if "%{DISTRO_MACHINE}" == "i686"
+	if "%{DISTRO_PLATFORM}" == "x86"
 		enable_libdrm_intel = 1
 		requires += pkgconfig(libdrm_intel)
 	end
@@ -51,6 +46,7 @@ build
 
 	configure_options += \
 		--libexecdir=/usr/lib \
+		--disable-libkms \
 		--enable-tracing \
 		--disable-tests \
 		--with-logo=%{datadir}/pixmaps/system-logo-white.png \
diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm
index fb0af1a..92fac58 100644
--- a/wpa_supplicant/wpa_supplicant.nm
+++ b/wpa_supplicant/wpa_supplicant.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = wpa_supplicant
-version    = 0.7.3
+version    = 1.0
 release    = 1
 
 groups     = Sytem/Base
@@ -53,7 +53,6 @@ end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-debuginfo
 		template DEBUGINFO


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