Author: glen Date: Mon Sep 13 20:16:13 2010 GMT Module: packages Tag: HEAD ---- Log message: - setup to inherit /etc/webapps/trac/trac.ini in new projects you still need to alter existing project youself
---- Files affected: packages/trac: trac.spec (1.92 -> 1.93) , inherit-global-trac.ini.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/trac/trac.spec diff -u packages/trac/trac.spec:1.92 packages/trac/trac.spec:1.93 --- packages/trac/trac.spec:1.92 Mon Sep 13 19:15:46 2010 +++ packages/trac/trac.spec Mon Sep 13 22:16:08 2010 @@ -1,23 +1,12 @@ # $Revision$, $Date$ # TODO # - localization fix in files -# - package global files for inheritance, make initial projects use inherit: -# http://trac.edgewall.org/browser/tags/trac-0.11/RELEASE -- -# [inherit] -# file = /etc/trac/trac.ini -# This will load the configuration from the /etc/trac/trac.ini file, while -# of course allowing to override any global settings in the environment's -# configuration. -# In that global configuration, you can specify shared directories for templates and plugins, e.g.: -# [inherit] -# plugins_dir = /etc/trac/plugins/ -# templates_dir = /etc/trac/templates/ # - 21:07:41 jtiai> set htdocs_location in trac ini to for example /trac-htdocs/ Summary: Integrated SCM, Wiki, Issue tracker and project environment Summary(pl.UTF-8): Zintegrowane scm, wiki, system śledzenia problemów i środowisko projektowe Name: trac Version: 0.12 -Release: 6 +Release: 7 License: BSD-like Group: Applications/WWW Source0: http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz @@ -29,6 +18,7 @@ Source5: %{name}-enableplugin.py Patch0: %{name}-root2http.patch Patch1: %{name}-defaults.patch +Patch2: inherit-global-trac.ini.patch URL: http://trac.edgewall.org/ BuildRequires: python >= 1:2.1 BuildRequires: python-babel >= 0.9.5 @@ -96,6 +86,7 @@ %setup -q -n Trac-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # using system jquery package rm trac/htdocs/js/jquery.js @@ -227,6 +218,9 @@ %dir %{_appdir}/htdocs/js %{_appdir}/htdocs/js/*.js +# keep upgrade data in main pkg only +%{py_sitescriptdir}/trac/upgrades + # project data is stored there %attr(2770,root,http) %dir /var/lib/trac @@ -249,9 +243,6 @@ %{py_sitescriptdir}/trac/web %{py_sitescriptdir}/trac/wiki -# XXX keep in main pkg only? -%{py_sitescriptdir}/trac/upgrades - %{py_sitescriptdir}/%{name}opt %{py_sitescriptdir}/Trac-*.egg-info @@ -261,6 +252,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.93 2010/09/13 20:16:08 glen +- setup to inherit /etc/webapps/trac/trac.ini in new projects + you still need to alter existing project youself + Revision 1.92 2010/09/13 17:15:46 glen - files fix ================================================================ Index: packages/trac/inherit-global-trac.ini.patch diff -u /dev/null packages/trac/inherit-global-trac.ini.patch:1.1 --- /dev/null Mon Sep 13 22:16:13 2010 +++ packages/trac/inherit-global-trac.ini.patch Mon Sep 13 22:16:08 2010 @@ -0,0 +1,16 @@ +--- Trac-0.12/trac/env.py~ 2010-09-13 23:05:21.000000000 +0300 ++++ Trac-0.12/trac/env.py 2010-09-13 23:05:23.812585726 +0300 +@@ -92,6 +92,13 @@ + system_info_providers = ExtensionPoint(ISystemInfoProvider) + setup_participants = ExtensionPoint(IEnvironmentSetupParticipant) + ++ PathOption('inherit', 'file', '/etc/webapps/trac/trac.ini', ++ """This will load the configuration from the /etc/webapps/trac/trac.ini file, ++ while of course allowing to override any global settings in the ++ environment's configuration. ++ ++ (''since 0.11'')""") ++ + shared_plugins_dir = PathOption('inherit', 'plugins_dir', '', + """Path to the //shared plugins directory//. + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/trac/trac.spec?r1=1.92&r2=1.93&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
