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 2e0c9c147800fe6a10e9bdc3e35f65766f7af90e (commit) via ae2084cb8609b49e55034314cd64b2316c301223 (commit) via aa7b07b542058d965895afb7b205a4535a5eaa75 (commit) from ed1f6221b2be056f3d804261141f6fa341b3ac22 (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 2e0c9c147800fe6a10e9bdc3e35f65766f7af90e Merge: ae2084c aa7b07b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 3 13:18:42 2012 +0100
Merge remote-tracking branch 'stevee/lm_sensors'
commit ae2084cb8609b49e55034314cd64b2316c301223 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 3 13:17:10 2012 +0100
gcc: Fix /lib/cpp link to /usr/bin/cpp on x86_64.
Using the C preprocessor (e.g. by rpcgen) was not possible. This commit fixes those builds.
commit aa7b07b542058d965895afb7b205a4535a5eaa75 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 3 12:20:46 2012 +0100
lm-sensors: Fix typo in make_build_targets and make_install_targets.
Also remove rpath from sensors daemon.
-----------------------------------------------------------------------
Summary of changes: gcc/gcc.nm | 6 +++--- lm-sensors/lm-sensors.nm | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-)
Difference in files: diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 37904a2..b32e028 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_cloog_ppl = 1
name = gcc version = 4.6.2 -release = 13 +release = 14
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -222,8 +222,8 @@ build FULLPATH="%{BUILDROOT}%{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}" [ -d "${FULLPATH}" ] || exit 1
- mkdir -pv %{BUILDROOT}/%{lib} - ln -sfv ../usr/bin/cpp %{BUILDROOT}/%{lib}/cpp + mkdir -pv %{BUILDROOT}/lib + ln -sfv ../usr/bin/cpp %{BUILDROOT}/lib/cpp ln -sfv gcc %{BUILDROOT}/usr/bin/cc
# Move libgcc_s to /lib diff --git a/lm-sensors/lm-sensors.nm b/lm-sensors/lm-sensors.nm index c3b4749..1eebbfb 100644 --- a/lm-sensors/lm-sensors.nm +++ b/lm-sensors/lm-sensors.nm @@ -5,7 +5,7 @@
name = lm-sensors version = 3.3.1 -release = 2 +release = 3 thisapp = lm_sensors-%{version}
groups = Applications/Statistics @@ -39,12 +39,13 @@ build common_flags = PREFIX=%{prefix} LIBDIR=%{libdir} MANDIR=%{mandir} \ PROG_EXTRA=sensord
- make_build_target += %{common_flags} user - make_install_target += %{common_flags} user_install + make_build_targets += %{common_flags} user + make_install_targets += %{common_flags} user_install
install_cmds - # Remove RPATH from binary. + # Remove RPATH from binaries. chrpath --delete %{BUILDROOT}/usr/bin/sensors + chrpath --delete %{BUILDROOT}/usr/sbin/sensord end end
hooks/post-receive -- IPFire 3.x development tree