- adapter'ized a little

- descriptions -l pl
- /home/httpd/html/* -> /home/httpd/html/docs (as in php4?)

Changed files:
    apache1-mod_ssl.spec -> 1.10

diff --git a/apache1-mod_ssl.spec b/apache1-mod_ssl.spec
index 5c4f169cfbd9c06b3915ca0faa97c717464ed659..ca7d31f3e847035990913273bfd0f4eeb1c9f31e 100644 (file)
--- a/apache1-mod_ssl.spec
+++ b/apache1-mod_ssl.spec
@@ -3,11 +3,13 @@
 Summary:       An SSL module for the Apache Web server
 Summary(de):   SSL-Modul fuer den Apache-Webserver
 Summary(fr):   Un module SSL pour le serveur Web Apache
+Summary(pl):   Modu³ SSL dla webserwera Apache
 Name:          apache-mod_ssl
 Version:       %{SSLVER}_%{APACHEVER}
 Release:       1
-Group:         System Environment/Daemons
-Copyright:     BSD
+Group:         Networking/Daemons
+Group(pl):     Sieciowe/Serwery
+License:       BSD
 Source0:       http://www.modssl.org/source/mod_ssl-%{SSLVER}-%{APACHEVER}.tar.gz
 Source1:       apache-mod_ssl.conf
 Source2:       apache-mod_ssl-server.crt
@@ -19,19 +21,19 @@ BuildRequires:      openssl-devel
 Requires:      apache(EAPI) = 1.3.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(/usr/sbin/apxs -q LIBEXECDIR)
+%define                _pkglibdir      %(%{_sbindir}/apxs -q LIBEXECDIR)
 
 %description
-The mod_ssl project provides strong cryptography for the Apache 1.3 webserver 
-via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
-protocols by the help of the Open Source SSL/TLS toolkit OpenSSL, which is 
-based on SSLeay from Eric A. Young and Tim J. Hudson. 
+The mod_ssl project provides strong cryptography for the Apache 1.3
+webserver via the Secure Sockets Layer (SSL v2/v3) and Transport Layer
+Security (TLS v1) protocols by the help of the Open Source SSL/TLS toolkit
+OpenSSL, which is based on SSLeay from Eric A. Young and Tim J. Hudson. 
 
-The mod_ssl package was created in April 1998 by Ralf S. Engelschall and was 
-originally derived from software developed by Ben Laurie for use in the 
-Apache-SSL HTTP server project. The mod_ssl package is licensed under a 
-BSD-style licence, which basically means that you are free to get and use it 
-for commercial and non-commercial purposes. 
+The mod_ssl package was created in April 1998 by Ralf S. Engelschall and
+was originally derived from software developed by Ben Laurie for use in the
+Apache-SSL HTTP server project. The mod_ssl package is licensed under a
+BSD-style licence, which basically means that you are free to get and use
+it for commercial and non-commercial purposes. 
 
 %description -l de
 Das mod_ssl-Projekt stellt kryptographie für den Apache 1.3-Webserver über
@@ -41,14 +43,23 @@ OpenSSL, das auf SSLeay basiert, verwendet.
 
 %description -l fr
 Le projet mod_ssl fournit de la forte cryptographie pour le serveur web
-Apache 1.3 via les protocoles Secure Sockets Layer (SSL v2/v3) et Transport Layer
-Security (TLS v1) avec l'aide du kit d'outils Open Source SSL/TLS, OpenSSL,
-base sur SSLeay d'Eric A. Young et Tim J. Hudson.
+Apache 1.3 via les protocoles Secure Sockets Layer (SSL v2/v3) et Transport
+Layer Security (TLS v1) avec l'aide du kit d'outils Open Source SSL/TLS,
+OpenSSL, base sur SSLeay d'Eric A. Young et Tim J. Hudson.
+
+%description -l pl
+Projekt mod_ssl ma za zadanie zapewniæ serwerowi www Apache 1.3 wysoki
+poziom szyfrowania dziêki protoko³om Secure Sockets Layer (SSL v2/v3)
+i Transport Layer Security (TLS v1) przy pomocy pakiety narzêdziowego
+Open Source SSL/TSL -- OpenSSL, stworzonego na podstawie SSLeay Erica
+A.Younga i Tima J.Hudsona.
 
 %package -n apache-mod_sxnet
 Summary:       Strong Extranet module for mod_ssl and apache
 Summary(fr):   Module d'Extranet Fort pour Apache et mod_ssl
-Group:         System Environment/Daemons
+Summary(pl):   Modu³ Strong Extranet dla pakietu mod_ssl i webserwera Apache
+Group:         Networking/Daemons
+Group(pl):     Sieciowe/Serwery
 Requires:      apache = %{APACHEVER}
 
 %description -n apache-mod_sxnet
@@ -62,6 +73,11 @@ authentifier les usagers sur votre serveur web. Typiquement, vos usagers
 s'enrolent dans votre Extranet Fort, sous votre controle, a travers le
 Thawte Personal Cert System.
 
+%description -l pl -n apache-mod_sxnet
+Pakiet Strong Extranet umo¿liwia u¿ywanie cyfrowych certyfikatów dla
+uwierzytleniania u¿ytkowników serwera www. Zwykle u¿ytkownicy rejestruj±
+siê pod opiek± administratora poprzez Thawte Personal Cert System.
+
 %prep
 %setup -q -n mod_ssl-%{SSLVER}-%{APACHEVER}
 
@@ -70,64 +86,71 @@ SSL_BASE=SYSTEM
 LDFLAGs="-s"
 export SSL_BASE LDFLAGS
 %configure \
-       --with-apxs=/usr/sbin/apxs \
+       --with-apxs=%{_sbindir}/apxs \
        --enable-shared=ssl \
-       --with-ssl=/usr
+       --with-ssl=%{_prefix}
 make
 
 cd pkg.contrib
 tar xvf sxnet.tar
 cd sxnet
-/usr/sbin/apxs -I/usr/include/openssl/ -L/usr/lib -l ssl -l crypto -c mod_sxnet.c
+%{_sbindir}/apxs -I%{_includedir}/openssl/ -L%{_libdir} -l ssl -l crypto -c mod_sxnet.c
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir}/mod_ssl,%{_pkglibdir}} \
-       $RPM_BUILD_ROOT/etc/httpd \
-       $RPM_BUILD_ROOT/home/httpd/html/{ssl-doc,sxnet}
+       $RPM_BUILD_ROOT%{_sysconfdir}/httpd \
+       $RPM_BUILD_ROOT/home/httpd/html/docs/{ssl-doc,sxnet}
 
 install pkg.sslmod/libssl.so $RPM_BUILD_ROOT%{_pkglibdir}
 install pkg.contrib/sxnet/mod_sxnet.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 install pkg.contrib/*.sh $RPM_BUILD_ROOT%{_libdir}/mod_ssl
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/mod_ssl.conf
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/httpd/server.crt
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/httpd/server.key
-install $RPM_BUILD_DIR/mod_ssl-%{SSLVER}-%{APACHEVER}/pkg.ssldoc/* $RPM_BUILD_ROOT/home/httpd/html/ssl-doc 
-install %{SOURCE4} $RPM_BUILD_ROOT/home/httpd/html/sxnet/index.html
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_ssl.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/server.crt
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/server.key
+install $RPM_BUILD_DIR/mod_ssl-%{SSLVER}-%{APACHEVER}/pkg.ssldoc/* $RPM_BUILD_ROOT/home/httpd/html/docs/ssl-doc 
+install %{SOURCE4} $RPM_BUILD_ROOT/home/httpd/html/docs/sxnet/index.html
 
 strip --strip-unneeded $RPM_BUILD_ROOT%{_pkglibdir}/*.so
 
 gzip -9nf ANNOUNCE CHANGES CREDITS NEWS README*
 
 %post
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*/mod_ssl.conf" /etc/httpd/httpd.conf; then
-       echo "Include mod_ssl.conf" >> /etc/httpd/httpd.conf
+if [ -f %{_sysconfdir}/httpd/httpd.conf ] && ! grep -q "^Include.*/mod_ssl.conf" %{_sysconfdir}/httpd/httpd.conf; then
+       echo "Include mod_ssl.conf" >> %{_sysconfdir}/httpd/httpd.conf
+fi
+if [ -f /var/lock/subsys/httpd ]; then
+        /etc/rc.d/init.d/httpd restart 1>&2
+else
+        echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
 fi
-/etc/rc.d/init.d/httpd restart
 
 %postun
 grep -v -q "^Include.*mod_ssl.conf" /etc/httpd/httpd.conf > \
        /etc/httpd/httpd.conf.tmp
 mv /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
-/etc/rc.d/init.d/httpd restart
+if [ -f /var/lock/subsys/httpd ]; then
+        /etc/rc.d/init.d/httpd restart 1>&2
+fi
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) /etc/httpd/mod_ssl.conf
-%config(noreplace) /etc/httpd/server.crt
-%config(noreplace) /etc/httpd/server.key
+%config(noreplace) %{_sysconfdir}/httpd/mod_ssl.conf
+%config(noreplace) %{_sysconfdir}/httpd/server.crt
+%config(noreplace) %{_sysconfdir}/httpd/server.key
 %doc *.gz
 
-/home/httpd/html/ssl-doc
+/home/httpd/html/docs/ssl-doc
 
 %attr(755,root,root) %{_pkglibdir}/libssl.so
 
 %{_libdir}/mod_ssl/*.sh
 
 %files -n apache-mod_sxnet
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_pkglibdir}/mod_sxnet.so
-/home/httpd/html/sxnet
+/home/httpd/html/docs/sxnet
 
 %clean
 rm -rf $RPM_BUILD_ROOT