- updated to 2.8.25-1.3.34

[packages/apache1-mod_ssl.git] / apache1-mod_ssl.spec

diff --git a/apache1-mod_ssl.spec b/apache1-mod_ssl.spec
index 663d239c044c6700b4a35afbf9048ad578a9cd03..85f7aece8f650d431eb25b5af3c236f05e08f432 100644 (file)
--- a/apache1-mod_ssl.spec
+++ b/apache1-mod_ssl.spec
@@ -1,7 +1,7 @@
 # TODO
 #  - other language's descriptions look weird, backslashes and quotes
-%define                SSLVER          2.8.22
-%define                APACHEVER       1.3.33
+%define                SSLVER          2.8.25
+%define                APACHEVER       1.3.34
 %define                apxs            /usr/sbin/apxs1
 %define                mod_name        ssl
 Summary:       An SSL module for the Apache Web server
@@ -23,11 +23,11 @@ Summary(sv):        Kryptografist
 Summary(uk):   íÏÄÕÌØ Ð¦ÄÔÒÉÍËÉ SSL × Apache
 Name:          apache1-mod_%{mod_name}
 Version:       %{SSLVER}_%{APACHEVER}
-Release:       2.3
+Release:       1
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.modssl.org/source/mod_%{mod_name}-%{SSLVER}-%{APACHEVER}.tar.gz
-# Source0-md5: cdfdf1f576f77768c90825b43b462405
+# Source0-md5: 1ef2a6cb47573444779b2fd10502514b
 Source1:       %{name}.conf
 Source2:       %{name}-server.crt
 Source3:       %{name}-server.key
@@ -52,6 +52,7 @@ Requires:     apache1 >= 1.3.33-2
 # see the config
 Requires:      apache1-mod_setenvif
 Requires:      apache1-mod_log_config
+Provides:      apache(mod_ssl) = %{version}-%{release}
 Obsoletes:     apache-mod_ssl < 2
 Obsoletes:     mod_ssl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -182,6 +183,9 @@ System.
 
 %{__perl} -pi -e 's@ /lib /usr/lib @ /%{_lib} /usr/%{_lib} @' pkg.sslmod/libssl.module
 
+cd pkg.contrib
+tar xvf sxnet.tar
+
 %build
 SSL_BASE=SYSTEM; export SSL_BASE
 %configure \
@@ -191,9 +195,7 @@ SSL_BASE=SYSTEM; export SSL_BASE
 
 %{__make}
 
-cd pkg.contrib
-tar xvf sxnet.tar
-cd sxnet
+cd pkg.contrib/sxnet
 %{apxs} -DMalloc=malloc -DFree=free -I%{_includedir}/openssl -L%{_libdir} -l ssl -l crypto -c mod_sxnet.c
 
 %install
@@ -273,10 +275,10 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc ANNOUNCE CHANGES CREDITS NEWS README* ssl-doc
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_ssl.conf
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/server.crt
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/server.key
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_ssl.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/server.crt
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/server.key
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(640,root,root) %ghost %{_pkglogdir}/*
 
 %attr(755,root,root) %{_pkglibdir}/libssl.so
@@ -291,5 +293,5 @@ fi
 %files -n apache1-mod_sxnet
 %defattr(644,root,root,755)
 %doc sxnet.html
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_sxnet.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_sxnet.conf
 %attr(755,root,root) %{_pkglibdir}/mod_sxnet.so