- updated to 2.8.8-1.3.24; release 0.1, STBR-test

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

diff --git a/apache1-mod_ssl.spec b/apache1-mod_ssl.spec
index e498c7715065a09eeaf665e5d7cdf3457e340684..7107f97a11e95565df6e88e8f752a44eecb71ce8 100644 (file)
--- a/apache1-mod_ssl.spec
+++ b/apache1-mod_ssl.spec
@@ -1,5 +1,6 @@
-%define                SSLVER 2.8.6
-%define                APACHEVER 1.3.23
+%define                SSLVER 2.8.8
+%define                APACHEVER 1.3.24
+%define        apxs    /usr/sbin/apxs
 Summary:       An SSL module for the Apache Web server
 Summary(cs):   Modul s podporou silného ¹ifrování pro WWW server Apache
 Summary(da):   Krypteringsunderstøttelse for webtjeneren Apache
@@ -19,23 +20,9 @@ Summary(sv): Kryptografist
 Summary(uk):   íÏÄÕÌØ Ð¦ÄÔÒÉÍËÉ SSL × Apache
 Name:          apache-mod_ssl
 Version:       %{SSLVER}_%{APACHEVER}
-Release:       1
+Release:       0.1
 License:       BSD
 Group:         Networking/Daemons
-Group(cs):     Sí»ové/Démoni
-Group(da):     Netværks/Dæmoner
-Group(de):     Netzwerkwesen/Server
-Group(es):     Red/Servidores
-Group(fr):     Réseau/Serveurs
-Group(is):     Net/Púkar
-Group(it):     Rete/Demoni
-Group(no):     Nettverks/Daemoner
-Group(pl):     Sieciowe/Serwery
-Group(pt):     Rede/Servidores
-Group(ru):     óÅÔØ/äÅÍÏÎÙ
-Group(sl):     Omre¾ni/Stre¾niki
-Group(sv):     Nätverk/Demoner
-Group(uk):     íÅÒÅÖÁ/äÅÍÏÎÉ
 Source0:       http://www.modssl.org/source/mod_ssl-%{SSLVER}-%{APACHEVER}.tar.gz
 Source1:       %{name}.conf
 Source2:       %{name}-server.crt
@@ -49,13 +36,13 @@ BuildRequires:      apache(EAPI)-devel = %{APACHEVER}
 BuildRequires: openssl-devel >= 0.9.6a
 BuildRequires: openssl-tools >= 0.9.6a
 BuildRequires: db3-devel
-BuildRequires: apache(EAPI)-devel = %{APACHEVER}
+BuildRequires: %{apxs}
 Requires:      apache(EAPI) >= %{APACHEVER}
 Provides:      mod_ssl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     mod_ssl
 
-%define                _pkglibdir      %(%{_sbindir}/apxs -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
 
 %description
 The mod_ssl project provides strong cryptography for the Apache 1.3
@@ -136,20 +123,6 @@ Summary:   Strong Extranet module for mod_ssl and apache
 Summary(fr):   Module d'Extranet Fort pour Apache et mod_ssl
 Summary(pl):   Modu³ Strong Extranet dla pakietu mod_ssl i webserwera Apache
 Group:         Networking/Daemons
-Group(cs):     Sí»ové/Démoni
-Group(da):     Netværks/Dæmoner
-Group(de):     Netzwerkwesen/Server
-Group(es):     Red/Servidores
-Group(fr):     Réseau/Serveurs
-Group(is):     Net/Púkar
-Group(it):     Rete/Demoni
-Group(no):     Nettverks/Daemoner
-Group(pl):     Sieciowe/Serwery
-Group(pt):     Rede/Servidores
-Group(ru):     óÅÔØ/äÅÍÏÎÙ
-Group(sl):     Omre¾ni/Stre¾niki
-Group(sv):     Nätverk/Demoner
-Group(uk):     íÅÒÅÖÁ/äÅÍÏÎÉ
 Requires:      apache(EAPI) >= %{APACHEVER}
 
 %description -n apache-mod_sxnet
@@ -177,9 +150,9 @@ System.
 
 %build
 SSL_BASE=SYSTEM
-export SSL_BASE 
+export SSL_BASE
 %configure \
-       --with-apxs=%{_sbindir}/apxs \
+       --with-apxs=%{apxs} \
        --enable-shared=ssl \
        --with-ssl=%{_prefix}
 %{__make}
@@ -187,7 +160,7 @@ export SSL_BASE
 cd pkg.contrib
 tar xvf sxnet.tar
 cd sxnet
-/usr/sbin/apxs -I%{_includedir}/openssl/ -L%{_libdir} -l ssl -l crypto -c mod_sxnet.c
+%{apxs} -DMalloc=malloc -DFree=free -I%{_includedir}/openssl -L%{_libdir} -l ssl -l crypto -c mod_sxnet.c
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -231,6 +204,20 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
+%post -n apache-mod_sxnet
+/usr/sbin/apxs -e -a -n sxnet %{_pkglibdir}/mod_sxnet.so 1>&2
+if [ -f /var/lock/subsys/httpd ]; then
+       /etc/rc.d/init.d/httpd restart 1>&2
+fi
+
+%preun -n apache-mod_sxnet
+if [ "$1" = "0" ]; then
+       /usr/sbin/apxs -e -A -n sxnet %{_pkglibdir}/mod_sxnet.so 1>&2
+       if [ -f /var/lock/subsys/httpd ]; then
+               /etc/rc.d/init.d/httpd restart 1>&2
+       fi
+fi
+                                               
 %files
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/mod_ssl.conf