SPECS (AC-branch): openssl.spec - can't wait any longer... AC-bran...

[hawk]

Author: hawk                         Date: Fri Sep  8 07:57:51 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- can't wait any longer... AC-branch restored to proper place, updated
  to 0.9.7k

---- Files affected:
SPECS:
   openssl.spec (1.146.2.3 -> 1.146.2.3.2.1) 

---- Diffs:

================================================================
Index: SPECS/openssl.spec
diff -u SPECS/openssl.spec:1.146.2.3 SPECS/openssl.spec:1.146.2.3.2.1
--- SPECS/openssl.spec:1.146.2.3	Tue Jun 13 12:23:22 2006
+++ SPECS/openssl.spec	Fri Sep  8 09:57:46 2006
@@ -14,12 +14,12 @@
 Summary(ru):	âÉÂĚÉĎÔĹËÉ É ŐÔÉĚÉÔŮ ÄĚŃ ÓĎĹÄÉÎĹÎÉĘ ŢĹŇĹÚ Secure Sockets Layer
 Summary(uk):	âŚÂĚŚĎÔĹËÉ ÔÁ ŐÔÉĚŚÔÉ ÄĚŃ Ú'¤ÄÎÁÎŘ ŢĹŇĹÚ Secure Sockets Layer
 Name:		openssl
-Version:	0.9.7i
-Release:	2
+Version:	0.9.7k
+Release:	1
 License:	Apache-style License
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	f69d82b206ff8bff9d0e721f97380b9e
+# Source0-md5:	be6bba1d67b26eabb48cf1774925416f
 Source1:	%{name}-ca-bundle.crt
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
@@ -195,7 +195,7 @@
 
 # conflicts with i386-only DES implementation
 # (missing #ifdef OPENSSL_FIPS  ...  #endif)
-:> fips/des/asm/fips-dx86-elf.s
+:> fips-1.0/des/asm/fips-dx86-elf.s
 
 %build
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
@@ -338,7 +338,7 @@
 install doc/crypto/*.7 $RPM_BUILD_ROOT%{_mandir}/man7
 install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
 install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
-install fips/openssl_fips_fingerprint $RPM_BUILD_ROOT%{_bindir}
+install fips-1.0/openssl_fips_fingerprint $RPM_BUILD_ROOT%{_bindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -437,6 +437,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146.2.3.2.1  2006/09/08 07:57:46  hawk
+- can't wait any longer... AC-branch restored to proper place, updated
+  to 0.9.7k
+
 Revision 1.146.2.3  2006/06/13 10:23:22  jajcus
 - 'purify' bcond added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openssl.spec?r1=1.146.2.3&r2=1.146.2.3.2.1&f=u