diff options
Diffstat (limited to 'meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-libtirpc-build-option.patch')
| -rw-r--r-- | meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-libtirpc-build-option.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-libtirpc-build-option.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-libtirpc-build-option.patch deleted file mode 100644 index 8ad2afacff..0000000000 --- a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-libtirpc-build-option.patch +++ /dev/null | |||
| @@ -1,66 +0,0 @@ | |||
| 1 | autofs-5.0.7 - fix libtirpc build option | ||
| 2 | |||
| 3 | From: Ian Kent <raven@themaw.net> | ||
| 4 | |||
| 5 | |||
| 6 | --- | ||
| 7 | CHANGELOG | 1 + | ||
| 8 | autofs.spec | 17 ++++++++++++++++- | ||
| 9 | 2 files changed, 17 insertions(+), 1 deletion(-) | ||
| 10 | |||
| 11 | diff --git a/CHANGELOG b/CHANGELOG | ||
| 12 | index e848bcd..b6b2679 100644 | ||
| 13 | --- a/CHANGELOG | ||
| 14 | +++ b/CHANGELOG | ||
| 15 | @@ -34,6 +34,7 @@ | ||
| 16 | - depricate nosymlink pseudo option. | ||
| 17 | - add symlink pseudo option. | ||
| 18 | - fix requires in spec file. | ||
| 19 | +- fix libtirpc build option to require libtirpc-devel if needed. | ||
| 20 | |||
| 21 | 25/07/2012 autofs-5.0.7 | ||
| 22 | ======================= | ||
| 23 | diff --git a/autofs.spec b/autofs.spec | ||
| 24 | index 703f7a9..f77acc1 100644 | ||
| 25 | --- a/autofs.spec | ||
| 26 | +++ b/autofs.spec | ||
| 27 | @@ -12,6 +12,10 @@ | ||
| 28 | # disable them. | ||
| 29 | %define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1} | ||
| 30 | |||
| 31 | +# Use --without libtirpc in your rpmbuild command or force values to 0 to | ||
| 32 | +# disable them. | ||
| 33 | +%define with_libtirpc %{?_without_libtirpc: 0} %{?!_without_libtirpc: 1} | ||
| 34 | + | ||
| 35 | Summary: A tool from automatically mounting and umounting filesystems. | ||
| 36 | Name: autofs | ||
| 37 | %define version 5.0.7 | ||
| 38 | @@ -25,6 +29,9 @@ Buildroot: %{_tmppath}/%{name}-tmp | ||
| 39 | %if %{with_systemd} | ||
| 40 | BuildRequires: systemd-units | ||
| 41 | %endif | ||
| 42 | +%if %{with_libtirpc} | ||
| 43 | +BuildRequires: libtirpc-devel | ||
| 44 | +%endif | ||
| 45 | BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, cyrus-sasl-devel | ||
| 46 | Requires: chkconfig | ||
| 47 | Requires: /bin/bash mktemp sed textutils sh-utils grep /bin/ps | ||
| 48 | @@ -72,9 +79,17 @@ echo %{version}-%{release} > .version | ||
| 49 | %define _unitdir %{?_unitdir:/lib/systemd/system} | ||
| 50 | %define systemd_configure_arg --with-systemd | ||
| 51 | %endif | ||
| 52 | +%if %{with_libtirpc} | ||
| 53 | + %define libtirpc_configure_arg --with-libtirpc | ||
| 54 | +%endif | ||
| 55 | |||
| 56 | %build | ||
| 57 | -CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --libdir=%{_libdir} --disable-mount-locking --enable-ignore-busy --with-libtirpc %{?systemd_configure_arg:} | ||
| 58 | +CFLAGS="$RPM_OPT_FLAGS -Wall" \ | ||
| 59 | +./configure --libdir=%{_libdir} \ | ||
| 60 | + --disable-mount-locking \ | ||
| 61 | + --enable-ignore-busy \ | ||
| 62 | + %{?systemd_configure_arg:} \ | ||
| 63 | + %{?libtirpc_configure_arg:} | ||
| 64 | CFLAGS="$RPM_OPT_FLAGS -Wall" make initdir=/etc/rc.d/init.d DONTSTRIP=1 | ||
| 65 | |||
| 66 | %install | ||
