SPECS: openssl.spec - rel 2 - move /var/lib/openssl to /etc/openssl (trigge...

[baggins]

Author: baggins                      Date: Sat Nov  1 18:25:07 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2
- move /var/lib/openssl to /etc/openssl (trigger provided)
- switch ca-bundle to ca-certificates one

---- Files affected:
SPECS:
   openssl.spec (1.190 -> 1.191) 

---- Diffs:

================================================================
Index: SPECS/openssl.spec
diff -u SPECS/openssl.spec:1.190 SPECS/openssl.spec:1.191
--- SPECS/openssl.spec:1.190	Wed Oct  1 20:33:48 2008
+++ SPECS/openssl.spec	Sat Nov  1 19:25:02 2008
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# TODO: ca-bundle.crt is out of date; switch to ca-certificates completely?
 #
 # Conditional build:
 %bcond_without	tests	# don't perform "make tests"
@@ -17,12 +16,11 @@
 Summary(uk.UTF-8):	Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:		openssl
 Version:	0.9.8i
-Release:	1
+Release:	2
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 # Source0-md5:	561e00f18821c74b2b86c8c7786f9d8b
-Source1:	%{name}-ca-bundle.crt
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
 Patch0:		%{name}-alpha-ccc.patch
@@ -42,6 +40,7 @@
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 Obsoletes:	libopenssl0
+Requires:	ca-certificates
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -208,7 +207,7 @@
 
 OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
 ./Configure \
-	--openssldir=%{_var}/lib/%{name} \
+	--openssldir=%{_sysconfdir}/%{name} \
 	--lib=%{_lib} \
 	shared threads \
 	enable-mdc2 enable-rc5 \
@@ -274,18 +273,13 @@
 	INSTALL_PREFIX=$RPM_BUILD_ROOT \
 	MANDIR=%{_mandir}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/ssl/ca-bundle.crt
 install libcrypto.a libssl.a $RPM_BUILD_ROOT%{_libdir}
 install lib*.so.*.* $RPM_BUILD_ROOT%{_libdir}
 ln -sf libcrypto.so.*.* $RPM_BUILD_ROOT%{_libdir}/libcrypto.so
 ln -sf libssl.so.*.* $RPM_BUILD_ROOT%{_libdir}/libssl.so
 
-mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-ln -s %{_sysconfdir}/%{name}/openssl.cnf \
-	$RPM_BUILD_ROOT%{_var}/lib/%{name}/%{name}.cnf
-
-mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
-rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc
 
 # not installed as individual utilities (see openssl dgst instead)
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{md2,md4,md5,mdc2,ripemd160,sha,sha1}.1
@@ -299,6 +293,19 @@
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%triggerpostun -- %{name} < 0.9.8i-2
+if [ -d /var/lib/openssl/certs ] ; then
+	mv /var/lib/openssl/certs/* %{_sysconfdir}/%{name}/certs 2>/dev/null || :
+fi
+if [ -d /var/lib/openssl/private ] ; then
+	mv /var/lib/openssl/private/* %{_sysconfdir}/%{name}/private 2>/dev/null || :
+fi
+if [ -d /var/lib/openssl ] ; then
+	for f in /var/lib/openssl/* ; do
+		[ -f "$f" ] && mv "$f" %{_sysconfdir}/%{name} 2>/dev/null || :
+	done
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt
@@ -307,19 +314,14 @@
 %attr(755,root,root) %{_libdir}/libssl.so.*.*.*
 %dir %{_libdir}/engines
 %attr(755,root,root) %{_libdir}/engines/*.so
-%dir %{_var}/lib/%{name}
-%dir %{_var}/lib/%{name}/certs
-%dir %{_var}/lib/%{name}/private
+%dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/certs
+%dir %{_sysconfdir}/%{name}/private
 %dir %{_datadir}/ssl
-%config(noreplace) %verify(not md5 mtime size) %{_datadir}/ssl/ca-bundle.crt
 
 %files tools
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}/%{name}
-
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/openssl.cnf
-%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/%{name}/openssl.cnf
-
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(754,root,root) %{_bindir}/ssl-certificate
 
@@ -397,6 +399,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.191  2008/11/01 18:25:02  baggins
+- rel 2
+- move /var/lib/openssl to /etc/openssl (trigger provided)
+- switch ca-bundle to ca-certificates one
+
 Revision 1.190  2008/10/01 18:33:48  qboosh
 - note on ca-bundle
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssl.spec?r1=1.190&r2=1.191&f=u