Author: glen Date: Wed Feb 16 21:20:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - apache version independance
---- Files affected: SPECS: imp.spec (1.58 -> 1.59) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.58 SPECS/imp.spec:1.59 --- SPECS/imp.spec:1.58 Wed Feb 16 22:04:44 2005 +++ SPECS/imp.spec Wed Feb 16 22:20:30 2005 @@ -5,7 +5,7 @@ Summary(pt_BR): Programa de Mail via Web Name: imp Version: 4.0.2 -Release: 1.1 +Release: 1.3 License: GPL v2 Group: Applications/Mail Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz @@ -18,17 +18,17 @@ Source6: %{name}-trans.mo Patch0: %{name}-path.patch URL: http://www.horde.org/imp/ -PreReq: apache -Requires(post): grep +PreReq: apache >= 1.3.33-2 Requires: horde >= 3.0 Requires: php-imap Requires: php-ctype BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define apachedir /etc/httpd %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org +%define _apache1dir /etc/apache +%define _apache2dir /etc/httpd %description IMP is the Internet Messaging Program, one of the Horde components. It @@ -58,7 +58,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{apachedir},/etc/cron.daily,%{_sysconfdir}/imp} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/imp} \ $RPM_BUILD_ROOT%{hordedir}/imp/{lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/imp @@ -78,7 +78,7 @@ ln -sf %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{hordedir}/%{name}/config -install %{SOURCE1} $RPM_BUILD_ROOT%{apachedir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-imp.conf install %{SOURCE6} $RPM_BUILD_ROOT%{hordedir}/imp/locale/pl_PL/LC_MESSAGES/imp.mo cd $RPM_BUILD_ROOT%{_sysconfdir}/imp @@ -88,30 +88,36 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 +# apache1 +if [ -d %{_apache1dir}/conf.d ]; then + ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache1dir}/conf.d/99_%{name}.conf + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi -elif [ -d /etc/httpd/httpd.conf ]; then - ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf +fi +# apache2 +if [ -d %{_apache2dir}/httpd.conf ]; then + ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache2dir}/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 + /etc/rc.d/init.d/httpd restart 1>&2 fi fi %preun if [ "$1" = "0" ]; then - umask 027 - if [ -d /etc/httpd/httpd.conf ]; then - rm -f /etc/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf + # apache1 + if [ -d %{_apache1dir}/conf.d ]; then + rm -f %{_apache1dir}/conf.d/99_%{name}.conf + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 + fi fi - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 + # apache2 + if [ -d %{_apache2dir}/httpd.conf ]; then + rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf + if [ -f /var/lock/subsys/httpd ]; then + /etc/rc.d/init.d/httpd restart 1>&2 + fi fi fi @@ -123,6 +129,16 @@ fi done +%triggerpostun -- imp <= 4.0.2-1 +if [ -f %{_apache2dir}/imp.conf.rpmsave ]; then + cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} + mv -f %{_apache2dir}/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf +fi + +if [ -f /var/lock/subsys/httpd ]; then + /etc/rc.d/init.d/httpd restart 1>&2 +fi + %files %defattr(644,root,root,755) %doc README docs/* scripts/*.reg @@ -139,7 +155,7 @@ %attr(640,root,http) %{_sysconfdir}/%{name}/*.dist %attr(640,root,http) %{_sysconfdir}/%{name}/*.xml %attr(640,root,http) %{_sysconfdir}/%{name}/.htaccess -%attr(640,root,http) %config(noreplace) %{apachedir}/%{name}.conf +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf %attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.php %attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.txt @@ -149,6 +165,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.59 2005/02/16 21:20:30 glen +- apache version independance + Revision 1.58 2005/02/16 21:04:44 glen - use _sysconfdir macro - description cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.58&r2=1.59&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
