Author: glen Date: Mon Jul 24 17:31:36 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - add lighttpd configuration, minor fixes
---- Files affected: SPECS: eventum.spec (1.192 -> 1.193) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.192 SPECS/eventum.spec:1.193 --- SPECS/eventum.spec:1.192 Thu Jul 20 20:57:58 2006 +++ SPECS/eventum.spec Mon Jul 24 19:31:31 2006 @@ -12,9 +12,9 @@ %bcond_with qmail # build the router-qmail subpackage %bcond_with order_patch # with custom issue order patch -%define _snap 20060720 +%define _snap 20060724 #define _rc RC3 -%define _rel 2.54 +%define _rel 2.62 %include /usr/lib/rpm/macros.php Summary: Eventum Issue / Bug tracking system @@ -25,7 +25,7 @@ License: GPL Group: Applications/WWW Source0: http://downloads.mysql.com/snapshots/eventum/%{name}-nightly-%{_snap}.tar.gz -# Source0-md5: 56d558dacc7a7b0040874cb27f8667bc +# Source0-md5: fb5e53aa24cff295490ba8f5a058a826 Source1: %{name}-apache.conf Source2: %{name}-mail-queue.cron Source3: %{name}-mail-download.cron @@ -41,6 +41,7 @@ Source13: %{name}-upgrade.sh Source14: %{name}-router-postfix.sh Source15: %{name}.logrotate +Source16: %{name}-lighttpd.conf Patch0: %{name}-lf.patch Patch1: %{name}-perms.patch Patch2: %{name}-cli-wr-separated.patch @@ -68,6 +69,8 @@ Patch24: %{name}-errorhandler.patch Patch25: http://glen.alkohol.ee/pld/eventum/upgrade-2.0.patch Patch26: %{name}-tpl-fixes.patch +Patch27: %{name}-xss.patch +Patch28: %{name}-tpl-fixes2.patch # packaging patches that probably never go upstream Patch100: %{name}-paths.patch Patch101: %{name}-cvs-config.patch @@ -109,6 +112,8 @@ Requires: php-session Requires: smarty-gettext Requires: webapps +Requires: webserver(access) +Requires: webserver(alias) BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -517,6 +522,8 @@ %patch23 -p1 %patch24 -p1 %patch26 -p1 +%patch27 -p1 +%patch28 -p1 # packaging %patch100 -p1 @@ -614,9 +621,11 @@ # private key cp -a private_key.php.in $RPM_BUILD_ROOT%{_webappdir}/private_key.php +touch $RPM_BUILD_ROOT%{_webappdir}/htpasswd install %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf install %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf +install %{SOURCE16} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-queue install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-download install %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/%{name}-reminder @@ -805,6 +814,12 @@ %triggerun -- apache < 2.2.0, apache-base %webapp_unregister httpd %{_webapp} +%triggerin -- lighttpd +%webapp_register lighttpd %{_webapp} + +%triggerun -- lighttpd +%webapp_unregister lighttpd %{_webapp} + # FIXME # only one upgrade trigger is called if you're upgrading over two # versions, say 1.5 to 1.5.3, only 1.5.3 trigger is called. @@ -913,9 +928,11 @@ %attr(751,root,root) %dir %{_webappdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/lighttpd.conf %attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/config.php %attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/private_key.php %attr(660,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/setup.php +%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/htpasswd %attr(640,root,eventum) %config %verify(not mtime) %{_webappdir}/core.php %dir %attr(731,root,eventum) /var/log/%{name} @@ -1040,6 +1057,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.193 2006/07/24 17:31:31 glen +- add lighttpd configuration, minor fixes + Revision 1.192 2006/07/20 18:57:58 glen - update to 20060720 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.192&r2=1.193&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
