[pathfinder] Make valgrind conditional on ARM platforms
Peter Robinson
pbrobinson at fedoraproject.org
Tue Sep 20 09:48:44 UTC 2011
commit a993334a1d182d87cff12a069857088e9951fd06
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Tue Sep 20 10:48:30 2011 +0100
Make valgrind conditional on ARM platforms
pathfinder.spec | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/pathfinder.spec b/pathfinder.spec
index f5beb3d..9191e57 100644
--- a/pathfinder.spec
+++ b/pathfinder.spec
@@ -14,10 +14,12 @@ Source2: pathfinderd.ini
Source3: wvtestrunner.pl
Source4: wvstreams.supp
Patch0: pathfinder-1.1.3-fix-implicit-dso-linking.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cmake, libwvstreams-devel >= 4.6-3, boost-devel, valgrind
+BuildRequires: cmake, libwvstreams-devel >= 4.6-3, boost-devel
BuildRequires: openssl-devel, nss-devel, dbus-devel, openldap-devel
+%ifnarch %{arm}
+BuildRequires: valgrind
+%endif
%description
Pathfinder is designed to provide a mechanism for any program to perform
@@ -96,7 +98,6 @@ make VERBOSE=1 %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove docs -- we repackage them later
rm -rf $RPM_BUILD_ROOT%{_docdir}
@@ -137,10 +138,6 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/pathfinderd
#%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%pre -n pathfinderd
getent group %{daemon_user} >/dev/null || groupadd -r %{daemon_user}
getent passwd %{daemon_user} >/dev/null || \
@@ -215,6 +212,9 @@ exit 0
%changelog
+* Tue Sep 20 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.1.3-4
+- Make valgrind conditional on ARM platforms
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list