Author: mwinkler Date: Sat Jun 11 20:22:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new apache install triggers
---- Files affected: SPECS: phpldapadmin.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/phpldapadmin.spec diff -u SPECS/phpldapadmin.spec:1.17 SPECS/phpldapadmin.spec:1.18 --- SPECS/phpldapadmin.spec:1.17 Wed May 18 15:08:05 2005 +++ SPECS/phpldapadmin.spec Sat Jun 11 22:22:40 2005 @@ -10,6 +10,7 @@ Source0: http://dl.sourceforge.net/phpldapadmin/%{name}-%{version}.tar.gz # Source0-md5: 8404fa6f0ad3185cc9353c94bf44ae56 URL: http://phpldapadmin.sourceforge.net/ +BuildRequires: rpmbuild(macros) >= 1.221 Requires: apache Requires: php-ldap Requires: php-pcre @@ -70,30 +71,17 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -if [ -f %{_sysconfdir}/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" %{_sysconfdir}/httpd/httpd.conf; then - echo "Include %{_sysconfdir}/httpd/%{name}.conf" >> %{_sysconfdir}/httpd/httpd.conf -elif [ -d %{_sysconfdir}/httpd/httpd.conf ]; then - ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf -fi -if [ -f /var/lock/subsys/httpd ]; then - %{_sbindir}/apachectl restart 1>&2 -fi - -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then - rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" %{_sysconfdir}/httpd/httpd.conf > \ - %{_sysconfdir}/httpd/httpd.conf.tmp - mv -f %{_sysconfdir}/httpd/httpd.conf.tmp %{_sysconfdir}/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - %{_sbindir}/apachectl restart 1>&2 - fi - fi -fi +%triggerin -- apache1 >= 1.3.0 +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf + +%triggerun -- apache1 >= 1.3.0 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 %files %defattr(644,root,root,755) @@ -109,6 +97,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2005/06/11 20:22:40 mwinkler +- new apache install triggers + Revision 1.17 2005/05/18 13:08:05 mwinkler - up to 0.9.6c ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/phpldapadmin.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
