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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 3066 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  2374e4ddc5bf9f125a79d365815738d72bc317dd (commit)
       via  65221806391b28df736cd816b7cd501ab9b38c71 (commit)
      from  4632c604374836e57b9461ce0dfa4abc4ab71259 (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 2374e4ddc5bf9f125a79d365815738d72bc317dd
Merge: 4632c60 6522180
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Mar 2 16:57:52 2012 +0100

    Merge remote-tracking branch 'stevee/lm_sensors'

commit 65221806391b28df736cd816b7cd501ab9b38c71
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri Mar 2 16:55:59 2012 +0100

    lm_sensors: Fix build errors.

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

Summary of changes:
 lm-sensors/lm-sensors.nm |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/lm-sensors/lm-sensors.nm b/lm-sensors/lm-sensors.nm
index 20114ca..c3b4749 100644
--- a/lm-sensors/lm-sensors.nm
+++ b/lm-sensors/lm-sensors.nm
@@ -3,27 +3,30 @@
 # Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
 ###############################################################################
 
-name       = lm_sensors
+name       = lm-sensors
 version    = 3.3.1
-release    = 1
+release    = 2
+thisapp    = lm_sensors-%{version}
 
 groups     = Applications/Statistics
-url        = http://www.lm-sensors.org/
+url        = http://www.lm-sensors.org
 license    = GPLv2+
 summary    = Hardware monitoring tools.
 
 description
-	The lm_sensors package includes a collection of modules for general SMBus \
+	The lm_sensors package includes a collection of modules for general SMBus
 	access and hardware monitoring.
 end
 
-source_dl  =
+source_dl  = http://dl.lm-sensors.org/lm-sensors/releases/
 sources    = %{thisapp}.tar.bz2
 
 build
 	requires
 		bison
+		chrpath
 		flex
+		rrdtool-devel
 		sysfsutils-devel
 	end
 
@@ -33,14 +36,24 @@ build
 			-e "s/^MANDIR.*/MANDIR=\/usr\/share\/man/g" -i Makefile
 	end
 
-	build
-		make %{PARALLELISMFLAGS} EXLDFLAGS=
+	common_flags = PREFIX=%{prefix} LIBDIR=%{libdir} MANDIR=%{mandir} \
+		PROG_EXTRA=sensord
+
+	make_build_target += %{common_flags} user
+	make_install_target += %{common_flags} user_install
+
+	install_cmds
+		# Remove RPATH from binary.
+		chrpath --delete %{BUILDROOT}/usr/bin/sensors
 	end
 end
 
 packages
 	package %{name}
-		requires = perl rrdtool
+		requires
+			perl
+			rrdtool
+		end
 	end
 
 	package %{name}-debuginfo


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