|
@@ -1,7 +1,7 @@
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
%define soversion 10
|
|
%define soversion 10
|
|
%define version 1.0.0c
|
|
%define version 1.0.0c
|
|
-%define release 3%{_dist_release}
|
|
|
|
|
|
+%define release 4%{_dist_release}
|
|
|
|
|
|
Summary: Secure Sockets Layer Toolkit
|
|
Summary: Secure Sockets Layer Toolkit
|
|
Name: openssl
|
|
Name: openssl
|
|
@@ -198,7 +198,7 @@ for lib in $RPM_BUILD_ROOT/%{_lib}/*.so.%{version} ; do
|
|
ln -s -f ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`
|
|
ln -s -f ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`
|
|
ln -s -f `basename ${lib}` $RPM_BUILD_ROOT/%{_lib}/`basename ${lib} .%{version}`.%{soversion}
|
|
ln -s -f `basename ${lib}` $RPM_BUILD_ROOT/%{_lib}/`basename ${lib} .%{version}`.%{soversion}
|
|
done
|
|
done
|
|
-install -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/openssl.pc
|
|
|
|
|
|
+# install -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/openssl.pc
|
|
|
|
|
|
# Install a makefile for generating keys and self-signed certs, and a script
|
|
# Install a makefile for generating keys and self-signed certs, and a script
|
|
# for generating them on the fly.
|
|
# for generating them on the fly.
|
|
@@ -236,12 +236,12 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
|
|
|
|
|
|
# Fix libdir.
|
|
# Fix libdir.
|
|
#sed 's,^libdir=${exec_prefix}/lib,libdir=${exec_prefix}/%{_lib},g' \
|
|
#sed 's,^libdir=${exec_prefix}/lib,libdir=${exec_prefix}/%{_lib},g' \
|
|
-sed 's,^libdir=/usr/lib,libdir=%{_libdir},g' \
|
|
|
|
- $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc > \
|
|
|
|
- $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp && \
|
|
|
|
-cat $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp > \
|
|
|
|
- $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc && \
|
|
|
|
-rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
|
|
|
|
|
|
+# sed 's,^libdir=/usr/lib,libdir=%{_libdir},g' \
|
|
|
|
+# $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc > \
|
|
|
|
+# $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp && \
|
|
|
|
+# cat $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp > \
|
|
|
|
+# $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc && \
|
|
|
|
+# rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
|
|
|
|
|
|
%clean
|
|
%clean
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
|
@@ -315,6 +315,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
|
|
%postun -n compat32-%{name} -p /sbin/ldconfig
|
|
%postun -n compat32-%{name} -p /sbin/ldconfig
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Jan 15 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0c-4
|
|
|
|
+- use upstream openssl.pc instead of vine original one (SOURCE6)
|
|
|
|
+
|
|
* Sun Jan 9 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0c-3
|
|
* Sun Jan 9 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0c-3
|
|
- move tsget to docs to delete dependency perl(WWW::Curl::Easy)
|
|
- move tsget to docs to delete dependency perl(WWW::Curl::Easy)
|
|
|
|
|