Ian Kent 92f44e
autofs-5.0.7 - fix libtirpc build option
Ian Kent 92f44e
Ian Kent 92f44e
From: Ian Kent <raven@themaw.net>
Ian Kent 92f44e
Ian Kent 92f44e
Ian Kent 92f44e
---
Ian Kent 92f44e
 CHANGELOG   |    1 +
Ian Kent 92f44e
 autofs.spec |   17 ++++++++++++++++-
Ian Kent 92f44e
 2 files changed, 17 insertions(+), 1 deletion(-)
Ian Kent 92f44e
Ian Kent 92f44e
diff --git a/CHANGELOG b/CHANGELOG
Ian Kent 92f44e
index e848bcd..b6b2679 100644
Ian Kent 92f44e
--- a/CHANGELOG
Ian Kent 92f44e
+++ b/CHANGELOG
Ian Kent 92f44e
@@ -34,6 +34,7 @@
Ian Kent 92f44e
 - depricate nosymlink pseudo option.
Ian Kent 92f44e
 - add symlink pseudo option.
Ian Kent 92f44e
 - fix requires in spec file.
Ian Kent 92f44e
+- fix libtirpc build option to require libtirpc-devel if needed.
Ian Kent 92f44e
 
Ian Kent 92f44e
 25/07/2012 autofs-5.0.7
Ian Kent 92f44e
 =======================
Ian Kent 92f44e
diff --git a/autofs.spec b/autofs.spec
Ian Kent 92f44e
index 703f7a9..f77acc1 100644
Ian Kent 92f44e
--- a/autofs.spec
Ian Kent 92f44e
+++ b/autofs.spec
Ian Kent 92f44e
@@ -12,6 +12,10 @@
Ian Kent 92f44e
 # disable them.
Ian Kent 92f44e
 %define with_systemd        %{?_without_systemd:        0} %{?!_without_systemd:        1}
Ian Kent 92f44e
 
Ian Kent 92f44e
+# Use --without libtirpc in your rpmbuild command or force values to 0 to
Ian Kent 92f44e
+# disable them.
Ian Kent 92f44e
+%define with_libtirpc        %{?_without_libtirpc:        0} %{?!_without_libtirpc:        1}
Ian Kent 92f44e
+
Ian Kent 92f44e
 Summary: A tool from automatically mounting and umounting filesystems.
Ian Kent 92f44e
 Name: autofs
Ian Kent 92f44e
 %define version 5.0.7
Ian Kent 92f44e
@@ -25,6 +29,9 @@ Buildroot: %{_tmppath}/%{name}-tmp
Ian Kent 92f44e
 %if %{with_systemd}
Ian Kent 92f44e
 BuildRequires: systemd-units
Ian Kent 92f44e
 %endif
Ian Kent 92f44e
+%if %{with_libtirpc}
Ian Kent 92f44e
+BuildRequires: libtirpc-devel
Ian Kent 92f44e
+%endif
Ian Kent 92f44e
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, cyrus-sasl-devel
Ian Kent 92f44e
 Requires: chkconfig
Ian Kent 92f44e
 Requires: /bin/bash mktemp sed textutils sh-utils grep /bin/ps
Ian Kent 92f44e
@@ -72,9 +79,17 @@ echo %{version}-%{release} > .version
Ian Kent 92f44e
   %define _unitdir %{?_unitdir:/lib/systemd/system}
Ian Kent 92f44e
   %define systemd_configure_arg --with-systemd
Ian Kent 92f44e
 %endif
Ian Kent 92f44e
+%if %{with_libtirpc}
Ian Kent 92f44e
+  %define libtirpc_configure_arg --with-libtirpc
Ian Kent 92f44e
+%endif
Ian Kent 92f44e
 
Ian Kent 92f44e
 %build
Ian Kent 92f44e
-CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --libdir=%{_libdir} --disable-mount-locking --enable-ignore-busy --with-libtirpc %{?systemd_configure_arg:}
Ian Kent 92f44e
+CFLAGS="$RPM_OPT_FLAGS -Wall" \
Ian Kent 92f44e
+./configure --libdir=%{_libdir} \
Ian Kent 92f44e
+	--disable-mount-locking \
Ian Kent 92f44e
+	--enable-ignore-busy \
Ian Kent 92f44e
+	%{?systemd_configure_arg:} \
Ian Kent 92f44e
+	%{?libtirpc_configure_arg:}
Ian Kent 92f44e
 CFLAGS="$RPM_OPT_FLAGS -Wall" make initdir=/etc/rc.d/init.d DONTSTRIP=1
Ian Kent 92f44e
 
Ian Kent 92f44e
 %install