Author: glen Date: Tue Mar 7 12:15:29 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service, use sed instead of apxs in trigger, rel 2
---- Files affected:
SPECS:
apache1-mod_ssl.spec (1.108 -> 1.109)
---- Diffs:
================================================================
Index: SPECS/apache1-mod_ssl.spec
diff -u SPECS/apache1-mod_ssl.spec:1.108 SPECS/apache1-mod_ssl.spec:1.109
--- SPECS/apache1-mod_ssl.spec:1.108 Tue Dec 13 19:01:46 2005
+++ SPECS/apache1-mod_ssl.spec Tue Mar 7 13:15:23 2006
@@ -24,7 +24,7 @@
Summary(uk): íĎÄŐĚŘ ĐŚÄÔŇÉÍËÉ SSL × Apache
Name: apache1-mod_%{mod_name}
Version: %{SSLVER}_%{APACHEVER}
-Release: 1
+Release: 2
License: BSD
Group: Networking/Daemons
Source0:
http://www.modssl.org/source/mod_%{mod_name}-%{SSLVER}-%{APACHEVER}.tar.gz
@@ -40,16 +40,14 @@
URL: http://www.modssl.org/
BuildRequires: %{apxs}
BuildRequires: apache1-devel = %{APACHEVER}
-BuildRequires: apache1-devel >= 1.3.33-2
BuildRequires: db-devel >= 4.1
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: openssl-tools >= 0.9.7d
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
-Requires(post,preun): apache1
Requires(triggerpostun): grep
Requires(triggerpostun): sed >= 4.0
Requires: apache1 >= %{APACHEVER}
-Requires: apache1 >= 1.3.33-2
# see the config
Requires: apache1-mod_log_config
Requires: apache1-mod_setenvif
@@ -153,9 +151,9 @@
Summary(fr): Module d'Extranet Fort pour Apache et mod_ssl
Summary(pl): Moduł Strong Extranet dla pakietu mod_ssl i serwera WWW Apache
Group: Networking/Daemons
-Requires(triggerpostun): %{apxs}
+Requires(triggerpostun): grep
+Requires(triggerpostun): sed >= 4.0
Requires: apache1(EAPI) >= %{APACHEVER}
-Requires: apache1 >= 1.3.33-2
Obsoletes: apache-mod_sxnet < 2
%description -n apache1-mod_sxnet
@@ -230,17 +228,11 @@
rm -rf $RPM_BUILD_ROOT
%post
-if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP
daemon."
-fi
+%service -q apache restart
%postun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
- fi
+ %service -q apache restart
fi
%triggerpostun -- apache1-mod_ssl < 2.8.22_1.3.33-1.7
@@ -258,19 +250,14 @@
%triggerpostun -- apache1-mod_sxnet < 2.8.22_1.3.33-1.9
# check that they're not using old apache.conf
if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
- %{apxs} -e -A -n sxnet %{_pkglibdir}/mod_sxnet.so 1>&2
+ sed -i -e '/^\(Add\|Load\)Module.*mod_sxnet\.\(so\|c\)/d'
/etc/apache/apache.conf
fi
%post -n apache1-mod_sxnet
-if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
%postun -n apache1-mod_sxnet
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
- fi
+ %service -q apache restart
fi
%files
@@ -303,6 +290,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.109 2006/03/07 12:15:23 glen
+- use %service, use sed instead of apxs in trigger, rel 2
+
Revision 1.108 2005/12/13 18:01:46 glen
- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apache1-mod_ssl.spec?r1=1.108&r2=1.109&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
