- release 10 (by relup.sh)

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

diff --git a/apache1-mod_ssl.spec b/apache1-mod_ssl.spec
index 8cb544293f035f02b721aebc71a72a7c59b2053e..65af90fb68b8db96bde88eee7d4829d7e0ab8179 100644 (file)
--- a/apache1-mod_ssl.spec
+++ b/apache1-mod_ssl.spec
@@ -1,5 +1,5 @@
-%define                SSLVER          2.8.30
-%define                APACHEVER       1.3.39
+%define                SSLVER          2.8.31
+%define                APACHEVER       1.3.41
 %define                apxs            /usr/sbin/apxs1
 %define                mod_name        ssl
 Summary:       An SSL module for the Apache Web server
@@ -21,11 +21,11 @@ Summary(sv.UTF-8):  Kryptografistöd till webbservern Apache
 Summary(uk.UTF-8):     Модуль підтримки SSL в Apache
 Name:          apache1-mod_%{mod_name}
 Version:       %{SSLVER}_%{APACHEVER}
-Release:       5
+Release:       10
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.modssl.org/source/mod_%{mod_name}-%{SSLVER}-%{APACHEVER}.tar.gz
-# Source0-md5: 66c1ad26954cb1abe59b42dab54d2cd1
+# Source0-md5: 4d55fc5c7cbf38820b44edf767f571c4
 Source1:       %{name}.conf
 Source2:       %{name}-server.crt
 Source3:       %{name}-server.key
@@ -33,8 +33,9 @@ Source4:      %{name}-sxnet.html
 Patch1:                mod_%{mod_name}-cca-openssl-path.patch
 Patch2:                mod_%{mod_name}-db3.patch
 Patch3:                %{name}-nohttpd.patch
+Patch4:                openssl.patch
 URL:           http://www.modssl.org/
-BuildRequires: apache1-devel = %{APACHEVER}
+BuildRequires: apache1-devel >= %{APACHEVER}
 BuildRequires: db-devel >= 4.1
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: openssl-tools >= 0.9.7d
@@ -43,18 +44,18 @@ BuildRequires:      sed >= 4.0
 Requires(triggerpostun):       grep
 Requires(triggerpostun):       sed >= 4.0
 Requires:      apache1-base >= %{APACHEVER}
-Requires:      apache1-base >= 1.3.39-5
 # see the config
 Requires:      apache1-mod_log_config
 Requires:      apache1-mod_setenvif
 Provides:      apache(mod_ssl) = %{version}-%{release}
 Obsoletes:     apache-mod_ssl < 2
 Obsoletes:     mod_ssl
+%requires_ge_to        openssl openssl-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
-%define                _pkglogdir      %(%{apxs} -q PREFIX 2>/dev/null)/logs
+%define                _pkglogdir      /var/log/apache
 
 %description
 The mod_ssl project provides strong cryptography for the Apache 1.3
@@ -171,16 +172,17 @@ System.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{SSLVER}-%{APACHEVER}
+%{__tar} -C pkg.contrib -xf pkg.contrib/sxnet.tar
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i -e 's@ /lib /usr/lib @ /%{_lib} /usr/%{_lib} @' pkg.sslmod/libssl.module
 %{__sed} -i -e 's,@APACHE_VERSION@,%{APACHEVER},' configure
-%{__tar} -C pkg.contrib -xf pkg.contrib/sxnet.tar
 
 %build
-SSL_BASE=SYSTEM; export SSL_BASE
+export SSL_BASE=SYSTEM
 %configure \
        --with-apxs=%{apxs} \
        --enable-shared=ssl \
@@ -197,21 +199,21 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/mod_%{mod_name},%{_pkglibdir},%{_pkglogdir
        $RPM_BUILD_ROOT%{_includedir}/apache1 \
        $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
 
-install pkg.sslmod/libssl.so $RPM_BUILD_ROOT%{_pkglibdir}
-install pkg.contrib/sxnet/mod_sxnet.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p pkg.sslmod/libssl.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p pkg.contrib/sxnet/mod_sxnet.so $RPM_BUILD_ROOT%{_pkglibdir}
 
-install pkg.contrib/*.sh $RPM_BUILD_ROOT%{_libdir}/mod_%{mod_name}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/40_mod_%{mod_name}.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/server.crt
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/server.key
+install -p pkg.contrib/*.sh $RPM_BUILD_ROOT%{_libdir}/mod_%{mod_name}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/40_mod_%{mod_name}.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/server.crt
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/server.key
 
 cp -a pkg.ssldoc ssl-doc
 
-install %{SOURCE4} sxnet.html
+cp -a %{SOURCE4} sxnet.html
 echo 'LoadModule sxnet_module  modules/mod_sxnet.so' > \
        $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_sxnet.conf
 
-install pkg.sslmod/*.h $RPM_BUILD_ROOT%{_includedir}/apache1
+cp -p pkg.sslmod/*.h $RPM_BUILD_ROOT%{_includedir}/apache1
 
 > $RPM_BUILD_ROOT%{_pkglogdir}/ssl_engine_log
 > $RPM_BUILD_ROOT%{_pkglogdir}/ssl_request_log
@@ -255,7 +257,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE CHANGES CREDITS NEWS README* ssl-doc
+%doc ANNOUNCE CHANGES CREDITS LICENSE NEWS README* ssl-doc
 %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