SPECS: tupa.spec - added trigger for webapps, removed bashcompletion

[paszczus]

Author: paszczus                     Date: Mon Apr 30 09:29:42 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added trigger for webapps, removed bashcompletion

---- Files affected:
SPECS:
   tupa.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/tupa.spec
diff -u SPECS/tupa.spec:1.2 SPECS/tupa.spec:1.3
--- SPECS/tupa.spec:1.2	Mon Apr 30 11:12:04 2007
+++ SPECS/tupa.spec	Mon Apr 30 11:29:37 2007
@@ -12,57 +12,58 @@
 Source0:	http://dl.sourceforge.net/tupa/%{name}-v%{version}%{_rc}.tgz
 # Source-md5:	cf0d38f296dd5fa65c9087dd08342a22
 Source1:	%{name}.conf
-Source2:	webapp-bash_completion.sh
-Requires:	coreutils
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	webapps
 Requires:	webserver
 Conflicts:	apache < 2.0.55-2.2
 Conflicts:	apache1 < 1.3.34-3.2
-Conflicts:	lighttpd < 1.4.7-2.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _appdir       	/usr/share/%{name}
-%define		_sysconfdir	/etc/webapps/%{name}
-%define		_bashcompletiondir	/etc/bash_completion.d
+%define         _webapps        /etc/webapps
+%define         _webapp         %{name}
+%define         _sysconfdir     %{_webapps}/%{_webapp}
+%define         _appdir         %{_datadir}/%{_webapp}
 
 %description
-TUPA is a webbased PowerDNS administration frontend programed in PHP / Javascript(AJAX) and MySQL. Supports creating of groups, users, templates and a 
-lot more.
-
-%package -n bash-completion-tupa
-Summary:	bash completion for tupa
-Summary(pl.UTF-8):	Dopełnienia basha dlatupa
-Group:		Applications/Shells
-Requires:	%{name} = %{version}-%{release}
-Requires:	bash-completion
-
-%description -n bash-completion-tupa
-Bash completion for TUPA.
+TUPA is a webbased PowerDNS administration frontend programed in PHP /
+Javascript(AJAX) and MySQL. Supports creating of groups, users,
+templates and a lot more.
 
 %prep
 %setup -q -n %{name}-v%{version}%{_rc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},%{_appdir},%{_bashcompletiondir}}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/config
-ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},%{_appdir}}
+install -d $RPM_BUILD_ROOT%{_appdir}/config
 cp -a backup images lib skins stats installer lang $RPM_BUILD_ROOT%{_appdir}
 install *.php $RPM_BUILD_ROOT%{_appdir}
 install *.html $RPM_BUILD_ROOT%{_appdir}
-install config/config_site-dist.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/config/config_site.php
+install config/config_site-dist.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/config_site.inc.php
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bashcompletiondir}/tupa
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- apache1 < 1.3.37-3, apache1-base
+%webapp_register apache %{_webapp}
+
+%triggerun -- apache1 < 1.3.37-3, apache1-base
+%webapp_unregister apache %{_webapp}
+
+%triggerin -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
 %files
 %defattr(644,root,root,755)
 %doc Changelog.txt
 %dir %attr(751,root,http) %{_sysconfdir}
-%attr(640,root,http) %{_sysconfdir}/config/config_site.php
+%attr(640,root,http) %{_sysconfdir}/config_site.inc.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 
@@ -79,16 +80,15 @@
 %{_appdir}/stats
 
 
-%files -n bash-completion-tupa
-%defattr(644,root,root,755)
-%{_bashcompletiondir}/tupa
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/04/30 09:29:37  paszczus
+- added trigger for webapps, removed bashcompletion
+
 Revision 1.2  2007/04/30 09:12:04  paszczus
 - small fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tupa.spec?r1=1.2&r2=1.3&f=u