jonathan/openssl
1
0
Fork 0
forked from rpms/openssl
Code Pull Requests Activity

auto-import changelog data from openssl-0.9.7a-36.src.rpm

Browse Source 
Tue May 25 2004 Nalin Dahyabhai <nalin@redhat.com> 0.9.7a-36
- handle %{_arch}=i486/i586/i686/athlon cases in the intermediate header
    (#124303)
This commit is contained in:
cvsdist 2004-09-09 09:50:13 +00:00
parent 80904fbc6f
commit c7b9ffb47e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openssl.spec
View File

@ -21,7 +21,7 @@
Summary: The OpenSSL toolkit. Summary: The OpenSSL toolkit.
Name: openssl Name: openssl
Version: 0.9.7a Version: 0.9.7a
Release: 35 Release: 36
Source: openssl-%{version}-usa.tar.bz2 Source: openssl-%{version}-usa.tar.bz2
Source1: hobble-openssl Source1: hobble-openssl
Source2: Makefile.certificate Source2: Makefile.certificate
@ -304,14 +304,20 @@ cat $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp > \
$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc && \ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc && \
rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
# Determine which arch opensslconf.h is going to try to #include.
basearch=%{_arch}
%ifarch %{ix86}
basearch=i386
%endif
%ifarch %{multilib_arches} %ifarch %{multilib_arches}
# Do an opensslconf.h switcheroo to avoid file conflicts on systems where you # Do an opensslconf.h switcheroo to avoid file conflicts on systems where you
# can have both a 32- and 64-bit version of the library, and they each need # can have both a 32- and 64-bit version of the library, and they each need
# their own correct-but-different versions of opensslconf.h to be usable. # their own correct-but-different versions of opensslconf.h to be usable.
install -m644 $RPM_SOURCE_DIR/opensslconf-new-warning.h \ install -m644 $RPM_SOURCE_DIR/opensslconf-new-warning.h \
$RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf-%{_arch}.h $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf-${basearch}.h
cat $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h >> \ cat $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h >> \
$RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf-%{_arch}.h $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf-${basearch}.h
install -m644 $RPM_SOURCE_DIR/opensslconf-new.h \ install -m644 $RPM_SOURCE_DIR/opensslconf-new.h \
$RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h
%endif %endif
@ -398,6 +404,10 @@ popd
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Tue May 25 2004 Nalin Dahyabhai <nalin@redhat.com> 0.9.7a-36
- handle %%{_arch}=i486/i586/i686/athlon cases in the intermediate
header (#124303)
* Thu Mar 25 2004 Joe Orton <jorton@redhat.com> 0.9.7a-35 * Thu Mar 25 2004 Joe Orton <jorton@redhat.com> 0.9.7a-35
- add security fixes for CAN-2004-0079, CAN-2004-0112 - add security fixes for CAN-2004-0079, CAN-2004-0112