- (tim) [contrib/caldera/openssh.spec] Use CFLAGS from Makefile instead

of RPM so build completes. Signatures were changed to .asc since 4.1p1.
This commit is contained in:
Tim Rice 2011-01-18 20:47:04 -08:00
parent ea52a82969
commit 15e1b4dea7
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,7 @@
20110119
- (tim) [contrib/caldera/openssh.spec] Use CFLAGS from Makefile instead
of RPM so build completes. Signatures were changed to .asc since 4.1p1.
20110117 20110117
- (djm) [regress/Makefile] use $TEST_SSH_KEYGEN instead of the one in - (djm) [regress/Makefile] use $TEST_SSH_KEYGEN instead of the one in
$PATH, fix cleanup of droppings; reported by openssh AT $PATH, fix cleanup of droppings; reported by openssh AT

View File

@ -57,7 +57,7 @@ BuildRequires : XFree86-imake
# %{use_stable}==0: :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs # %{use_stable}==0: :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs
Source0: see-above:/.../openssh-%{version}.tar.gz Source0: see-above:/.../openssh-%{version}.tar.gz
%if %{use_stable} %if %{use_stable}
Source1: see-above:/.../openssh-%{version}.tar.gz.sig Source1: see-above:/.../openssh-%{version}.tar.gz.asc
%endif %endif
Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz
Source3: http://www.openssh.com/faq.html Source3: http://www.openssh.com/faq.html
@ -182,7 +182,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
--with-privsep-path=%{_var}/empty/sshd \ --with-privsep-path=%{_var}/empty/sshd \
#leave this line for easy edits. #leave this line for easy edits.
%__make CFLAGS="$RPM_OPT_FLAGS" %__make
cd %{askpass} cd %{askpass}
%configure \ %configure \
@ -356,7 +356,11 @@ fi
%ChangeLog %ChangeLog
* Tue Jan 18 2011 Tim Rice <tim@multitalents.net>
- Use CFLAGS from Makefile instead of RPM so build completes.
- Signatures were changed to .asc since 4.1p1.
* Mon Jan 01 1998 ... * Mon Jan 01 1998 ...
Template Version: 1.31 Template Version: 1.31
$Id: openssh.spec,v 1.71 2010/08/08 16:32:09 djm Exp $ $Id: openssh.spec,v 1.72 2011/01/19 04:47:07 tim Exp $