Author: andree Date: Sat Mar 5 16:15:45 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed apache1,2 support
- rel. 2 STBR
---- Files affected:
SPECS:
verliadmin.spec (1.12 -> 1.13)
---- Diffs:
================================================================
Index: SPECS/verliadmin.spec
diff -u SPECS/verliadmin.spec:1.12 SPECS/verliadmin.spec:1.13
--- SPECS/verliadmin.spec:1.12 Thu Dec 2 00:46:31 2004
+++ SPECS/verliadmin.spec Sat Mar 5 17:15:40 2005
@@ -3,7 +3,7 @@
Summary(pl): Interfejs PHP dla verlihub
Name: verliadmin
Version: 0.3
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: Networking/Admin
@@ -19,6 +19,8 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _verliadmindir %{_datadir}/%{name}
+%define _apache1dir /etc/apache
+%define _apache2dir /etc/httpd
%description
Verliadmin is administration tool for verlihub written in php.
@@ -47,35 +49,45 @@
ln -sf %{_sysconfdir}/verliadmin/config.php
$RPM_BUILD_ROOT%{_verliadmindir}/config.php
# for apache
-echo "Alias /verliadmin /usr/share/%{name}" >%{name}.conf
-install %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd
+echo "Alias /verliadmin /usr/share/%{name}" >apache-%{name}.conf
+install apache-%{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf"
/etc/httpd; then
- echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
-elif [ -d /etc/httpd/httpd.conf ]; then
- ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
+# apache1
+if [ -d %{_apache1dir}/conf.d ]; then
+ ln -sf %{_sysconfdir}/%{name}/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
fi
-if [ -f /var/lock/subsys/httpd ]; then
- /usr/sbin/apachectl restart 1>&2
+# apache2
+if [ -d %{_apache2dir}/httpd.conf ]; then
+ ln -sf %{_sysconfdir}/%{name}/apache-%{name}.conf
%{_apache2dir}/httpd.conf/99_%{name}.conf
+ if [ -f /var/lock/subsys/httpd ]; then
+ /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
- if [ -f /var/lock/subsys/httpd ]; then
- /usr/sbin/apachectl restart 1>&2
- fi
- fi
+ # 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
+ # 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
%triggerin -- verliadmin = 0.3_RC1
@@ -87,7 +99,7 @@
%{_verliadmindir}
%attr(750,root,http) %dir %{_sysconfdir}/verliadmin/
%attr(640,root,http) %verify(not md5 size mtime) %config(noreplace)
%{_sysconfdir}/verliadmin/config.php
-%config(noreplace) %verify(not size mtime md5) /etc/httpd/%{name}.conf
+%config(noreplace) %verify(not size mtime md5)
%{_sysconfdir}/verliadmin/apache-%{name}.conf
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -95,6 +107,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2005/03/05 16:15:40 andree
+- fixed apache1,2 support
+- rel. 2 STBR
+
Revision 1.12 2004/12/01 23:46:31 andree
- updated to 0.3
- added -lang.patch - pl fixes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/verliadmin.spec?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
