From: Artur Frysiak <artur@frysiak.net>
Date: Sat, 22 May 1999 08:11:19 +0000 (+0000)
Subject: - updated to snapshots
X-Git-Tag: openssl-0_9_3-0_19990520~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=commitdiff_plain;h=faddd3090c58e59a77a62246fb53b4306965500d

- updated to snapshots
- added devel and static subpackages
- stripped binaries and shared libs
TODO: link openssl with shared libs
Warning:
- Headers files moved to /usr/include/openssl
- Certs now in /var/state/openssl

Changed files:
    openssl.spec -> 1.8
---

diff --git a/openssl.spec b/openssl.spec
index b7dfdfe..5848e04 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,13 +1,14 @@
+%define		date	19990520
+%define		time	2130
 Summary: 	Library and toolkit for the "Secure Sockets Layer" (SSL v2/v3)
 Name: 		openssl
-Version: 	0.9.2b
-Release: 	2
+Version: 	0.9.3
+Release: 	0.%{date}
 Group: 		Libraries
 Group(pl):	Biblioteki
-Source: 	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
+Source: 	ftp://ftp.openssl.org/source/%{name}-SNAP-%{date}-%{time}.tar.gz
 Patch0:		openssl-sslcrypto.patch
 Patch1:		openssl-perl.patch
-Patch2:		openssl-shlib.patch
 Vendor: 	The OpenSSL Project
 License: 	Apache-style License
 BuildPrereq:	perl
@@ -16,6 +17,11 @@ Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 
+%define		openssldir	/var/state/openssl
+%define		_sysconfdir	/etc/%{name}
+%define		_pkglibdir	%{_libdir}/%{name}
+%define		_pkgincludedir	%{_includedir}/%{name}
+
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
 commercial-grade, full-featured, and Open Source toolkit implementing
@@ -31,14 +37,39 @@ Apache-style licence, which basically means that you are free to get
 and use it for commercial and non-commercial purposes subject to some
 simple license conditions.
 
+%package devel
+Summary:	Development part of OpenSSL library
+Summary(pl):	Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów
+Group:		Development/Library
+Group(pl):	Programownie/Biblioteki
+Requires:	%{name} = %{version}
+
+%description devel
+Development part of OpenSSL library.
+
+%description devel -l pl
+Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów.
+
+%package static
+Summary:	Static OpenSSL library
+Summary(pl):	Statyczna wersja biblioteki OpenSSL
+Group:		Development/Library
+Group(pl):	Programowanie/Biblioteki
+Requires:	%{name}-devel = %{version}
+
+%description static
+Static OpenSSL library.
+
+%description static -l pl
+Statyczna wersja biblioteki OpenSSL.
+
 %prep
-%setup  -q
+%setup  -q -n %{name}-SNAP-%{date}-%{time}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-for i in ` echo Configure Makefile.org Makefile.ssl `; do
+for i in ` echo Configure Makefile.org `; do
         sed -e 's#-m486##g' \
 		-e 's#-O3 -fomit-frame-pointer#%{optflags}#g' \
 		<$i >$i.work
@@ -46,25 +77,39 @@ for i in ` echo Configure Makefile.org Makefile.ssl `; do
 done
 
 perl util/perlpath.pl %{_bindir}
-perl util/ssldir.pl /var/state/ssl
 
-./config
-make INSTALLTOP=/usr OPT_FLAGS="$RPM_OPT_FLAGS"
+ln -s crypto sslcrypto
+
+./config --openssldir=%{openssldir}
+
+make OPT_FLAGS="$RPM_OPT_FLAGS" linux-shared
+make INSTALLTOP=%{_prefix} OPT_FLAGS="$RPM_OPT_FLAGS"
 make rehash
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{etc,usr/include/ssl,var/state/ssl/{certs,private}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_pkglibdir}}
+
+make install \
+	INSTALLTOP=%{_prefix} \
+	INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-make INSTALLTOP=$RPM_BUILD_ROOT/usr install
+install libRSAglue.a 	$RPM_BUILD_ROOT%{_libdir}
+install lib*.so.*.* 	$RPM_BUILD_ROOT%{_libdir}
+mv 	lib*.so		$RPM_BUILD_ROOT%{_libdir}
 
-install libRSAglue.a $RPM_BUILD_ROOT%{_libdir}
 
-mv $RPM_BUILD_ROOT%{_includedir}/*.h $RPM_BUILD_ROOT/usr/include/ssl
+mv $RPM_BUILD_ROOT%{openssldir}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}
+ln -s $RPM_BUILD_ROOT%{_sysconfdir}/openssl.cnf \
+	$RPM_BUILD_ROOT%{openssldir}/openssl.cnf
+symlinks -cs $RPM_BUILD_ROOT%{openssldir}
 
-mv $RPM_BUILD_ROOT%{_libdir}/openssl.cnf $RPM_BUILD_ROOT/etc
-ln -s ../../etc/openssl.cnf $RPM_BUILD_ROOT%{_libdir}/openssl.cnf
+mv $RPM_BUILD_ROOT%{openssldir}/misc/*	$RPM_BUILD_ROOT%{_pkglibdir}
+rm -rf $RPM_BUILD_ROOT%{openssldir}/misc
+
+strip $RPM_BUILD_ROOT%{_bindir}/* || :
+strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* || :
 
 gzip -9fn CHANGES CHANGES.SSLeay LICENSE NEWS README \
 	doc/*.pod doc/*.txt
@@ -73,7 +118,7 @@ gzip -9fn CHANGES CHANGES.SSLeay LICENSE NEWS README \
 %{_bindir}/c_rehash certs
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
@@ -82,11 +127,22 @@ gzip -9fn CHANGES CHANGES.SSLeay LICENSE NEWS README \
 %doc doc/openssl_button.gif doc/openssl_button.html
 
 %attr(755,root,root) %{_bindir}/*
-%verify(not md5 size mtime) %config(noreplace) /etc/openssl.cnf
-%verify(not md5 size mtime) %config(noreplace) %{_libdir}/openssl.cnf
+%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/openssl.cnf
+%verify(not md5 size mtime) %config(noreplace) %{openssldir}/openssl.cnf
+%{openssldir}/certs
+%{openssldir}/private
+%dir %{_pkglibdir}
+%attr(755,root,root) %{_pkglibdir}/*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_pkgincludedir}
+
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%{_includedir}/ssl/*.h
-/var/state/ssl
 
 %changelog
 * Wed Apr 14 1999 Artur Frysiak <wiget@pld.org.pl>