- release 7 (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 78ab2a1db648effb9121dacf67321f7ba8817d37..713891ed5568b67d6b83548be9715c8c902b4fdf 100644 (file)
--- a/apache1-mod_ssl.spec
+++ b/apache1-mod_ssl.spec
@@ -21,7 +21,7 @@ Summary(sv.UTF-8):    Kryptografistöd till webbservern Apache
 Summary(uk.UTF-8):     Модуль підтримки SSL в Apache
 Name:          apache1-mod_%{mod_name}
 Version:       %{SSLVER}_%{APACHEVER}
-Release:       4
+Release:       7
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.modssl.org/source/mod_%{mod_name}-%{SSLVER}-%{APACHEVER}.tar.gz
@@ -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,7 +44,6 @@ 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
@@ -171,16 +171,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,17 +198,17 @@ 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