Author: amateja Date: Wed May 13 11:50:24 2009 GMT Module: packages Tag: HEAD ---- Log message: - added support for lighttpd
---- Files affected: packages/nocc: nocc.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: packages/nocc/nocc.spec diff -u packages/nocc/nocc.spec:1.45 packages/nocc/nocc.spec:1.46 --- packages/nocc/nocc.spec:1.45 Wed May 13 08:36:04 2009 +++ packages/nocc/nocc.spec Wed May 13 13:50:18 2009 @@ -8,6 +8,8 @@ Group: Applications/Mail Source0: http://dl.sourceforge.net/nocc/%{name}-%{version}.tar.gz # Source0-md5: 4c13e9e3f4e40e2e4420442dbc22bcbd +Source1: %{name}.lighttpd +# Source1-md5: 666d4decce2b150e1399785667bb301d Patch0: %{name}-config.patch URL: http://nocc.sourceforge.net/ BuildRequires: rpmbuild(macros) >= 1.268 @@ -20,8 +22,8 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _webapp %{name} %define _webapps /etc/webapps -%define _webapp nocc %define _sysconfdir %{_webapps}/%{_webapp} %define _appdir %{_datadir}/%{_webapp} @@ -56,6 +58,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{_var}/lib/nocc} install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf install config/conf.php.dist config/conf.php mv config $RPM_BUILD_ROOT%{_sysconfdir}/ @@ -80,6 +83,12 @@ %triggerun -- apache < 2.2.0, apache-base %webapp_unregister httpd %{_webapp} +%triggerin -- lighttpd +%webapp_register lighttpd %{_webapp} + +%triggerun -- lighttpd +%webapp_unregister lighttpd %{_webapp} + %clean rm -rf $RPM_BUILD_ROOT @@ -90,6 +99,7 @@ %dir %attr(750,root,http) %{_sysconfdir}/config %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 +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config/* %attr(770,root,http) %dir %{_var}/lib/nocc %{_appdir} @@ -100,6 +110,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.46 2009/05/13 11:50:18 amateja +- added support for lighttpd + Revision 1.45 2009/05/13 06:36:04 amateja - updated to 1.7 - minor cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nocc/nocc.spec?r1=1.45&r2=1.46&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
