Author: glen Date: Wed Feb 16 18:51:55 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- cleanup
---- Files affected:
SPECS:
horde.spec (1.62 -> 1.63)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.62 SPECS/horde.spec:1.63
--- SPECS/horde.spec:1.62 Wed Feb 16 19:49:36 2005
+++ SPECS/horde.spec Wed Feb 16 19:51:50 2005
@@ -41,14 +41,11 @@
%define _noautoreq 'pear(XML/WBXML.*)' 'pear(Horde.*)'
'pear(Text/.*)' 'pear(Net/IMSP.*)'
+%define _sysconfdir /etc/horde.org
%define hordedir /usr/share/horde
-%define confdir /etc/horde.org
-%define _apache2 %{?with_apache1:0}%{?!with_apache1:1}
-%if %{_apache2}
-%define apachedir /etc/httpd
-%else
-%define apachedir /etc/apache
-%endif
+%define _apache1dir /etc/apache
+%define _apache2dir /etc/httpd
+
%define _php5 %(rpm -q php | awk -F- '{print $2}' |
awk -F. '{print $1}')
%if "%{_php5}" == "5"
Requires: php-dom
@@ -56,9 +53,6 @@
Requires: php-domxml
%endif
-%define _apache1dir /etc/apache
-%define _apache2dir /etc/httpd
-%define _sysconfdir /etc/horde.org
%description
The Horde Framework provides a common structure and interface for
@@ -176,7 +170,6 @@
done
%triggerpostun -- horde <= 3.0.3-2
-set -x
# apache1 confdir
if [ -f /etc/apache/apache.conf ] && grep -q '^Include conf\.d'
/etc/apache/apache.conf; then
sed -i -e '
@@ -221,6 +214,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.63 2005/02/16 18:51:50 glen
+- cleanup
+
Revision 1.62 2005/02/16 18:49:36 glen
- needs apache >= 1.3.33-3 for real apache version independance
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.62&r2=1.63&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
