From 8f63fceb77dc473b59e3905c8ac233ce6692b445 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Tue, 16 Oct 2012 13:58:58 +0800 Subject: [PATCH] - fix date in changelog entry and allow cross compilation update. --- ...igure-allow-cross-compilation-update.patch | 28 +++++++++++++++++++ autofs.spec | 10 +++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 autofs-5.0.7-configure-allow-cross-compilation-update.patch diff --git a/autofs-5.0.7-configure-allow-cross-compilation-update.patch b/autofs-5.0.7-configure-allow-cross-compilation-update.patch new file mode 100644 index 0000000..a8bc3ce --- /dev/null +++ b/autofs-5.0.7-configure-allow-cross-compilation-update.patch @@ -0,0 +1,28 @@ +autofs-5.0.7 - configure: allow cross compilation update + +From: Chris Packham + +Run "make distclean" to update configure. This should have been included +in 5936c738 when configure.in was updated but it was missed. +--- + + configure | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + + +diff --git a/configure b/configure +index bf62203..ba3bba6 100755 +--- a/configure ++++ b/configure +@@ -5378,10 +5378,7 @@ DAEMON_LDFLAGS= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc -fPIE works" >&5 + $as_echo_n "checking whether gcc -fPIE works... " >&6; } + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } ++ gcc_supports_pie=no + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ diff --git a/autofs.spec b/autofs.spec index 7851aba..bf34150 100644 --- a/autofs.spec +++ b/autofs.spec @@ -8,7 +8,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.7 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -26,6 +26,7 @@ Patch10: autofs-5.0.7-make-description-of-default-MOUNT_WAIT-setting-clear.patch Patch11: autofs-5.0.7-configure-in-allow-cross-compilation.patch Patch12: autofs-5.0.7-README-update-mailing-list-subscription-info.patch Patch13: autofs-5.0.7-allow-non-root-user-to-check-status.patch +Patch14: autofs-5.0.7-configure-allow-cross-compilation-update.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{with_systemd} BuildRequires: systemd-units @@ -95,6 +96,7 @@ echo %{version}-%{release} > .version %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -186,7 +188,11 @@ fi %dir /etc/auto.master.d %changelog -* Mon Sep 15 2012 Ian Kent - 1:5.0.7-4 +* Tue Oct 15 2012 Ian Kent - 1:5.0.7-5 +- configure: allow cross compilation update. +- fix date in changelog entry. + +* Mon Oct 15 2012 Ian Kent - 1:5.0.7-4 - include usage in usage message. - dont wait forever to restart. - add option description to man page.