Author: glen Date: Thu Jul 20 18:18:50 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - lighttpd integration, not sure what to do with requires - drop old trigger
---- Files affected: SPECS: trac.spec (1.34 -> 1.35) ---- Diffs: ================================================================ Index: SPECS/trac.spec diff -u SPECS/trac.spec:1.34 SPECS/trac.spec:1.35 --- SPECS/trac.spec:1.34 Fri Apr 21 18:31:20 2006 +++ SPECS/trac.spec Thu Jul 20 20:18:45 2006 @@ -1,17 +1,16 @@ # $Revision$, $Date$ -# TODO -# - lighttpd webapp configuration Summary: Integrated scm, wiki, issue tracker and project environment Summary(pl): Zintegrowane scm, wiki, system śledzenia problemów i środowisko projektowe Name: trac Version: 0.9.5 -Release: 1 +Release: 1.1 License: GPL Group: Applications/WWW Source0: http://ftp.edgewall.com/pub/trac/%{name}-%{version}.tar.gz # Source0-md5: 3b7d708eaf905cc6ba2b6b10a09a8cf4 Source1: %{name}-apache.conf -Source2: %{name}.ico +Source2: %{name}-lighttpd.conf +Source3: %{name}.ico Patch0: %{name}-util.patch URL: http://www.edgewall.com/trac/ BuildRequires: python >= 1:2.1 @@ -25,6 +24,13 @@ Requires: python-subversion >= 1.2.0 Requires: subversion >= 1.0.0 Requires: webapps +# for lighttpd: +Requires: webserver(alias) +#Requires: webserver(rewrite) +# for apache: +#Requires: webserver(auth) +#Requires: webserver(env) +#Suggests: webserver(cgi) #Suggests: apache(mod_env) #Suggests: apache-mod_python >= 3.1.3 BuildArch: noarch @@ -60,7 +66,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf -install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/htdocs/%{name}.ico +install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf +install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/htdocs/%{name}.ico > $RPM_BUILD_ROOT%{_sysconfdir}/htpasswd # compile the scripts @@ -84,6 +91,12 @@ %triggerun -- apache < 2.2.0, apache-base %webapp_unregister httpd %{_webapp} +%triggerin -- lighttpd +%webapp_register lighttpd %{_webapp} + +%triggerun -- lighttpd +%webapp_unregister lighttpd %{_webapp} + %post if [ "$1" = 1 ]; then %banner %{name} -e <<EOF @@ -102,45 +115,6 @@ fi -%triggerpostun -- %{name} < 0.9.2-0.2 -if [ -f /etc/trac/htpasswd.rpmsave ]; then - mv -f %{_sysconfdir}/htpasswd{,.rpmnew} - mv -f /etc/trac/htpasswd.rpmsave %{_sysconfdir}/htpasswd -fi - -# migrate from apache-config macros -if [ -f /etc/trac/apache.conf.rpmsave ]; then - if [ -d /etc/apache/webapps.d ]; then - cp -f %{_sysconfdir}/apache.conf{,.rpmnew} - cp -f /etc/trac/apache.conf.rpmsave %{_sysconfdir}/apache.conf - fi - - if [ -d /etc/httpd/webapps.d ]; then - cp -f %{_sysconfdir}/httpd.conf{,.rpmnew} - cp -f /etc/trac/apache.conf.rpmsave %{_sysconfdir}/httpd.conf - fi - rm -f /etc/trac/apache.conf.rpmsave -fi - -# register webapp on apaches which were registered earlier -if [ -L /etc/apache/conf.d/99_trac.conf ]; then - rm -f /etc/apache/conf.d/99_trac.conf - /usr/sbin/webapp register apache %{_webapp} - apache_reload=1 -fi -if [ -L /etc/httpd/httpd.conf/99_trac.conf ]; then - rm -f /etc/httpd/httpd.conf/99_trac.conf - /usr/sbin/webapp register httpd %{_webapp} - httpd_reload=1 -fi - -if [ "$httpd_reload" ]; then - %service -q httpd reload -fi -if [ "$apache_reload" ]; then - %service -q apache reload -fi - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog INSTALL README THANKS UPGRADE @@ -148,6 +122,7 @@ %dir %attr(750,root,http) %{_sysconfdir} %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}/htpasswd %attr(755,root,root) %{_bindir}/* @@ -172,6 +147,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.35 2006/07/20 18:18:45 glen +- lighttpd integration, not sure what to do with requires +- drop old trigger + Revision 1.34 2006/04/21 16:31:20 deejay1 - up to 0.9.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/trac.spec?r1=1.34&r2=1.35&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
