packages: apache1-mod_ssl/apache1-mod_ssl.spec - not so strict apache dep, ...

[glen]

Author: glen                         Date: Mon Apr 26 11:01:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- not so strict apache dep, but needs openssl 1.0 fix

---- Files affected:
packages/apache1-mod_ssl:
   apache1-mod_ssl.spec (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: packages/apache1-mod_ssl/apache1-mod_ssl.spec
diff -u packages/apache1-mod_ssl/apache1-mod_ssl.spec:1.131 packages/apache1-mod_ssl/apache1-mod_ssl.spec:1.132
--- packages/apache1-mod_ssl/apache1-mod_ssl.spec:1.131	Wed Apr 21 18:59:44 2010
+++ packages/apache1-mod_ssl/apache1-mod_ssl.spec	Mon Apr 26 13:01:33 2010
@@ -35,7 +35,7 @@
 Patch2:		mod_%{mod_name}-db3.patch
 Patch3:		%{name}-nohttpd.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
@@ -44,7 +44,6 @@
 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
@@ -198,17 +197,17 @@
 	$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
 
@@ -283,6 +282,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2010/04/26 11:01:33  glen
+- not so strict apache dep, but needs openssl 1.0 fix
+
 Revision 1.131  2010/04/21 16:59:44  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache1-mod_ssl/apache1-mod_ssl.spec?r1=1.131&r2=1.132&f=u