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

   of RPM so build completes. Signatures were changed to .asc since 4.1p1.

2 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f393ca49..87066031 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
  - (djm) [regress/Makefile] use $TEST_SSH_KEYGEN instead of the one in
    $PATH, fix cleanup of droppings; reported by openssh AT
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 515fe334..b76e6fd7 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -57,7 +57,7 @@ BuildRequires	: XFree86-imake
 # %{use_stable}==0:	:pserver:cvs@bass.directhit.com:/cvs/openssh_cvs
 Source0: see-above:/.../openssh-%{version}.tar.gz
 %if %{use_stable}
-Source1: see-above:/.../openssh-%{version}.tar.gz.sig
+Source1: see-above:/.../openssh-%{version}.tar.gz.asc
 %endif
 Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz
 Source3: http://www.openssh.com/faq.html
@@ -182,7 +182,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
 	    --with-privsep-path=%{_var}/empty/sshd \
 	    #leave this line for easy edits.
 
-%__make CFLAGS="$RPM_OPT_FLAGS"
+%__make
 
 cd %{askpass}
 %configure \
@@ -356,7 +356,11 @@ fi
  
 
 %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 ...
 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 $