Index: TracEnFrancais/trac-0.10.4-PKG.patch =================================================================== --- TracEnFrancais/trac-0.10.4-PKG.patch (revision 16) +++ TracEnFrancais/trac-0.10.4-PKG.patch (revision 1) @@ -3906,5 +3906,5 @@ diff --exclude=.svn -Naur trac-0.10.4/trac/db_default.py trac-0.10.4-PKG/trac/db_default.py --- trac-0.10.4/trac/db_default.py 2007-04-20 15:41:51.000000000 +0200 -+++ trac-0.10.4-PKG/trac/db_default.py 2007-10-19 14:43:33.000000000 +0200 ++++ trac-0.10.4-PKG/trac/db_default.py 2007-08-21 16:30:48.000000000 +0200 @@ -117,7 +117,7 @@ Column('description'), @@ -3921,10 +3921,9 @@ return ( -('Active Tickets', --""" ++('Tickets ouverts', + """ - * List all active tickets by priority. - * Color each row based on priority. - * If a ticket has been accepted, a '*' is appended after the owner's name -+('Tickets ouverts', -+u""" + * Liste de tous les tickets ouverts triés par priorité. + * Les couleurs de lignes sont basées sur la priorité. @@ -3947,9 +3946,8 @@ #---------------------------------------------------------------------------- - ('Active Tickets by Version', --""" ++ ('Tickets ouverts par Version', + """ -This report shows how to color results by priority, -while grouping results by version. -+ ('Tickets ouverts par Version', -+u""" +Ce rapport montre comment mettre en valeur avec des couleurs les +résultats triés par priorité, quand ils sont aussi groupés par version. @@ -3977,9 +3975,8 @@ #---------------------------------------------------------------------------- -('Active Tickets by Milestone', --""" ++('Tous les Tickets par Objectif', + """ -This report shows how to color results by priority, -while grouping results by milestone. -+('Tous les Tickets par Objectif', -+u""" +Ce rapport montre comment mettre en valeur avec des couleurs les +résultats triés par priorité, quand ils sont aussi groupés par objectif. @@ -4005,12 +4002,10 @@ + WHERE status IN ('new', 'assigned', 'reopened') ORDER BY (milestone IS NULL),milestone, p.value, t.type, time --""" % (db.concat('milestone', "' Release'"), owner)), -+""" % owner ), + """ % (db.concat('milestone', "' Release'"), owner)), #---------------------------------------------------------------------------- -('Assigned, Active Tickets by Owner', --""" ++('Tickets assignés et ouverts par Propriétaire', + """ -List assigned tickets, group by ticket owner, sorted by priority. -+(u'Tickets assignés et ouverts par Propriétaire', -+u""" +Liste des tickets assignés, groupés par propriétaire et triés par priorité. """, @@ -4022,9 +4017,8 @@ #---------------------------------------------------------------------------- -('Assigned, Active Tickets by Owner (Full Description)', --""" ++('Tickets assignés et ouverts par Propriétaire (Description complète)', + """ -List tickets assigned, group by ticket owner. -This report demonstrates the use of full-row display. -+(u'Tickets assignés et ouverts par Propriétaire (Description complète)', -+u""" +Liste des tickets assignés, groupés par propriétaire et triés par priorité. +Ce rapport démontre l'utilisation de la fonction ligne complète. @@ -4037,8 +4031,7 @@ #---------------------------------------------------------------------------- -('All Tickets By Milestone (Including closed)', --""" ++('Tous les Tickets par Objectif (fermés inclus)', + """ -A more complex example to show how to make advanced reports. -+(u'Tous les Tickets par Objectif (fermés inclus)', -+u""" +Un exemple plus complexe pour démontrer comme faire des rapports avancés. """, @@ -4061,22 +4054,19 @@ LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' - ORDER BY (milestone IS NULL), milestone DESC, (status = 'closed'), -- (CASE status WHEN 'closed' THEN modified ELSE (-1)*p.value END) DESC + ORDER BY (milestone IS NULL), milestone DESC, (status = 'closed'), -+ (CASE status WHEN 'closed' THEN changetime ELSE (-1)*p.value END) DESC + (CASE status WHEN 'closed' THEN modified ELSE (-1)*p.value END) DESC """), #---------------------------------------------------------------------------- -('My Tickets', --""" ++('Mes Tickets', + """ -This report demonstrates the use of the automatically set -USER dynamic variable, replaced with the username of the -logged in user when executed. -+('Mes Tickets', -+u""" +Ce rapport démontre l'utilisation de la variable dynamique +USER définie automatiquement, pour remplacer le nom d'utilisateur +par le nom de l'utilisateur connecté quand la requête est exécutée. """, --""" -+u""" + """ SELECT p.value AS __color__, - (CASE status WHEN 'assigned' THEN 'Assigned' ELSE 'Owned' END) AS __group__, @@ -4090,9 +4080,8 @@ #---------------------------------------------------------------------------- -('Active Tickets, Mine first', --""" ++('Tickets ouverts, les miens d\'abord', + """ - * List all active tickets by priority. - * Show all tickets owned by the logged in user in a group first. -+(u'Tickets ouverts, les miens d\'abord', -+u""" + * Liste de tous les tickets ouverts triés par priorité. + * Montre tous les tickets de l'utilisateur connecté groupés en premier @@ -4410,5 +4399,5 @@ diff --exclude=.svn -Naur trac-0.10.4/trac/mimeview/api.py trac-0.10.4-PKG/trac/mimeview/api.py --- trac-0.10.4/trac/mimeview/api.py 2007-04-20 15:41:45.000000000 +0200 -+++ trac-0.10.4-PKG/trac/mimeview/api.py 2007-10-19 12:57:29.000000000 +0200 ++++ trac-0.10.4-PKG/trac/mimeview/api.py 2007-08-24 11:04:51.000000000 +0200 @@ -80,14 +80,14 @@ 'application/x-csh': ['csh'], @@ -4500,13 +4489,4 @@ def get_annotation_types(self): -@@ -464,7 +464,7 @@ - return Markup(buf.getvalue()) - except Exception, e: - self.log.warning('HTML preview using %s failed (%s)' -- % (renderer, e), exc_info=True) -+ % (renderer, to_unicode(e)), exc_info=True) - - def _annotate(self, lines, annotations): - buf = StringIO() @@ -508,11 +508,11 @@ """Infer the character encoding from the `content` or the `mimetype`. @@ -4566,5 +4546,5 @@ diff --exclude=.svn -Naur trac-0.10.4/trac/mimeview/enscript.py trac-0.10.4-PKG/trac/mimeview/enscript.py --- trac-0.10.4/trac/mimeview/enscript.py 2007-04-20 15:41:45.000000000 +0200 -+++ trac-0.10.4-PKG/trac/mimeview/enscript.py 2007-10-19 12:33:37.000000000 +0200 ++++ trac-0.10.4-PKG/trac/mimeview/enscript.py 2007-08-24 11:05:09.000000000 +0200 @@ -137,8 +137,8 @@ @@ -4962,5 +4942,5 @@ means the permission is denied.""" diff --exclude=.svn -Naur trac-0.10.4/trac/scripts/admin.py trac-0.10.4-PKG/trac/scripts/admin.py ---- trac-0.10.4/trac/scripts/admin.py 2007-10-19 14:48:30.000000000 +0200 +--- trac-0.10.4/trac/scripts/admin.py 2007-09-04 11:32:57.000000000 +0200 +++ trac-0.10.4-PKG/trac/scripts/admin.py 2007-08-24 11:10:28.000000000 +0200 @@ -1200,7 +1200,7 @@ @@ -5552,5 +5532,5 @@ diff --exclude=.svn -Naur trac-0.10.4/trac/ticket/report.py trac-0.10.4-PKG/trac/ticket/report.py --- trac-0.10.4/trac/ticket/report.py 2007-04-20 15:41:46.000000000 +0200 -+++ trac-0.10.4-PKG/trac/ticket/report.py 2007-10-19 12:48:58.000000000 +0200 ++++ trac-0.10.4-PKG/trac/ticket/report.py 2007-08-24 11:41:45.000000000 +0200 @@ -27,7 +27,7 @@ from trac.util.datefmt import format_date, format_time, format_datetime, \ @@ -5558,5 +5538,5 @@ from trac.util.html import html -from trac.util.text import unicode_urlencode -+from trac.util.text import to_unicode, unicode_urlencode, translate ++from trac.util.text import unicode_urlencode, translate from trac.web import IRequestHandler from trac.web.chrome import add_link, add_stylesheet, INavigationContributor @@ -5637,5 +5617,5 @@ except ValueError,e: - raise TracError, 'Report failed: %s' % e -+ raise TracError, u'Échec du rapport: %s' % to_unicode(e.message) ++ raise TracError, u'Échec du rapport: %s' % e.message title, description, sql = self.get_info(db, id, args) @@ -5647,5 +5627,5 @@ - req.hdf['report.message'] = 'Report execution failed: %s' % e + req.hdf['report.message'] = \ -+ u"Échec de l'exécution du rapport: %s" % to_unicode(e.message) ++ u"Échec de l'exécution du rapport: %s" % e.message return 'report.cs', None @@ -7053,14 +7033,5 @@ diff --exclude=.svn -Naur trac-0.10.4/trac/versioncontrol/web_ui/util.py trac-0.10.4-PKG/trac/versioncontrol/web_ui/util.py --- trac-0.10.4/trac/versioncontrol/web_ui/util.py 2007-04-20 15:41:47.000000000 +0200 -+++ trac-0.10.4-PKG/trac/versioncontrol/web_ui/util.py 2007-10-19 12:50:23.000000000 +0200 -@@ -22,7 +22,7 @@ - from trac.core import TracError - from trac.util.datefmt import format_datetime, pretty_timedelta - from trac.util.html import escape, html, Markup --from trac.util.text import shorten_line -+from trac.util.text import to_unicode, shorten_line - from trac.versioncontrol.api import NoSuchNode, NoSuchChangeset - from trac.wiki import wiki_to_html, wiki_to_oneliner - ++++ trac-0.10.4-PKG/trac/versioncontrol/web_ui/util.py 2007-08-24 12:05:49.000000000 +0200 @@ -94,14 +94,14 @@ return path, rev, line @@ -7077,8 +7048,8 @@ - req.href.log(path, rev=rev, - mode='path_history'))) -+ raise TracError(Markup(u'%s

Vous pouvez rechercher ' ++ raise TracError(Markup(u'%s

Vous pouvez rechercher ' + u'dans l\'historique du dépôt pour voir si le ' + u'chemin a existé mais a ensuite été supprimé.

', -+ to_unicode(e.message), req.href.log(path, rev=rev, ++ e.message, req.href.log(path, rev=rev, + mode='path_history'))) @@ -7445,5 +7416,5 @@ diff --exclude=.svn -Naur trac-0.10.4/trac/web/main.py trac-0.10.4-PKG/trac/web/main.py --- trac-0.10.4/trac/web/main.py 2007-04-20 15:41:51.000000000 +0200 -+++ trac-0.10.4-PKG/trac/web/main.py 2007-10-19 12:50:51.000000000 +0200 ++++ trac-0.10.4-PKG/trac/web/main.py 2007-09-04 09:07:27.000000000 +0200 @@ -86,6 +86,9 @@ 'url': env.project_url @@ -7514,12 +7485,5 @@ resp = chosen_handler.process_request(req) if resp: -@@ -256,13 +264,13 @@ - except PermissionError, e: - raise HTTPForbidden(to_unicode(e)) - except TracError, e: -- raise HTTPInternalError(e.message) -+ raise HTTPInternalError(to_unicode(e.message)) - - def _pre_process_request(self, req, chosen_handler): +@@ -262,7 +270,7 @@ for f in self.filters: chosen_handler = f.pre_process_request(req, chosen_handler) Index: TracEnFrancais/trac.spec =================================================================== --- TracEnFrancais/trac.spec (revision 16) +++ (revision ) @@ -1,238 +1,0 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -# PKG -%define _topdir %(echo $PKG_BUILD_ROOT) - -Name: trac -Version: 0.10.4 -Release: 1.6%{?dist} -Summary: Enhanced wiki and issue tracking system -Group: Applications/Internet -License: BSD -URL: http://trac.edgewall.com/ -Source0: http://ftp.edgewall.com/pub/trac/%{name}-%{version}.tar.gz -Source1: trac.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: sed >= 3.95 -BuildRequires: python-devel -Requires: python-clearsilver >= 0.9.3 -Requires: subversion >= 1.1 -Requires: httpd -Requires: python-sqlite - -Patch1: trac-0.10.4-PKG.patch - -%description -Trac is an integrated system for managing software projects, an -enhanced wiki, a flexible web-based issue tracker, and an interface to -the Subversion revision control system. At the core of Trac lies an -integrated wiki and issue/bug database. Using wiki markup, all objects -managed by Trac can directly link to other issues/bug reports, code -changesets, documentation and files. Around the core lies other -modules, providing additional features and tools to make software -development more streamlined and effective. - -%prep -%setup -q -chmod -x contrib/* -sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py -chmod -x htdocs/js/wikitoolbar.js -sed -i -e 's/tracd 1/tracd 8/' scripts/tracd.1 -rm trac/test.py -sed -i -e 's/\r//' contrib/trac-post-commit-hook.cmd -%patch1 -p1 - -%build -%{__python} setup.py build - -%install -rm -rf $RPM_BUILD_ROOT - -# --skip-build causes bad stuff in siteconfig.py as of 0.8.4 -%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT - -install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin -mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.*cgi \ - $RPM_BUILD_ROOT%{_var}/www/cgi-bin -rm -r $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin - -install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf -install -dm 755 $RPM_BUILD_ROOT%{_sbindir} -mv $RPM_BUILD_ROOT{%{_bindir}/tracd,%{_sbindir}/tracd} -install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man8 -mv $RPM_BUILD_ROOT%{_mandir}/{man1/tracd.1,man8/tracd.8} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/ -%{_bindir}/trac-admin -%{_sbindir}/tracd -%dir %{python_sitelib}/trac/ -%{python_sitelib}/trac/*.py -%{python_sitelib}/trac/*.pyc -%{python_sitelib}/trac/*.pyo -%dir %{python_sitelib}/trac/mimeview/ -%{python_sitelib}/trac/mimeview/*.py -%{python_sitelib}/trac/mimeview/*.pyc -%{python_sitelib}/trac/mimeview/*.pyo -%dir %{python_sitelib}/trac/scripts/ -%{python_sitelib}/trac/scripts/*.py -%{python_sitelib}/trac/scripts/*.pyc -%{python_sitelib}/trac/scripts/*.pyo -%dir %{python_sitelib}/trac/ticket/ -%{python_sitelib}/trac/ticket/*.py -%{python_sitelib}/trac/ticket/*.pyc -%{python_sitelib}/trac/ticket/*.pyo -%dir %{python_sitelib}/trac/upgrades/ -%{python_sitelib}/trac/upgrades/*.py -%{python_sitelib}/trac/upgrades/*.pyc -%{python_sitelib}/trac/upgrades/*.pyo -%dir %{python_sitelib}/trac/versioncontrol/ -%{python_sitelib}/trac/versioncontrol/*.py -%{python_sitelib}/trac/versioncontrol/*.pyc -%{python_sitelib}/trac/versioncontrol/*.pyo -%dir %{python_sitelib}/trac/versioncontrol/web_ui/ -%{python_sitelib}/trac/versioncontrol/web_ui/*.py -%{python_sitelib}/trac/versioncontrol/web_ui/*.pyc -%{python_sitelib}/trac/versioncontrol/web_ui/*.pyo -%dir %{python_sitelib}/trac/web/ -%{python_sitelib}/trac/web/*.py -%{python_sitelib}/trac/web/*.pyc -%{python_sitelib}/trac/web/*.pyo -%dir %{python_sitelib}/trac/wiki/ -%{python_sitelib}/trac/wiki/*.py -%{python_sitelib}/trac/wiki/*.pyc -%{python_sitelib}/trac/wiki/*.pyo -%dir %{python_sitelib}/trac/db -%{python_sitelib}/trac/db/*.py -%{python_sitelib}/trac/db/*.pyc -%{python_sitelib}/trac/db/*.pyo -%dir %{python_sitelib}/trac/util -%{python_sitelib}/trac/util/*.py -%{python_sitelib}/trac/util/*.pyc -%{python_sitelib}/trac/util/*.pyo - -%config(noreplace) /etc/httpd/conf.d/trac.conf -%{_datadir}/trac/ -%{_var}/www/cgi-bin/trac.cgi -%{_var}/www/cgi-bin/trac.fcgi -%{_mandir}/man1/trac-admin.1* -%{_mandir}/man8/tracd.8* - -%changelog -* Tue Sep 04 2007 Guillaume Bougard - 0.10.4-1.4 -- minor fixes - -* Tue Aug 21 2007 Guillaume Bougard - 0.10.4.1-1 -- Francisation -- Ajout de fonctions utilisées par PKG.fr -- resynchronisation avec la tracduction officielle - -* Thu May 3 2007 Jeffrey C. Ollie - 0.10.4-1 -- Update to 0.10.4 - -* Mon Mar 12 2007 Jeffrey C. Ollie - 0.10.3.1-2 -- Switch requires back to python-sqlite - -* Sat Mar 10 2007 Jeffrey C. Ollie - 0.10.3.1-1 -- Update to 0.10.3.1 to fix security bug - -* Sun Jan 7 2007 Joost Soeterbroek - 0.10.3-2 -- change req: python-sqlite -> python-sqlite2 - -* Tue Jan 2 2007 Joost Soeterbroek - 0.10.3 -- upstream release 0.10.3 (#221162) - -* Sat Dec 9 2006 Joost Soeterbroek - 0.10.3 -- rebuild for python 2.5, add python-devel to BR - -* Tue Nov 28 2006 Joost Soeterbroek - 0.10.2 -- upstream release 0.10.2 (#217539) - -* Sat Nov 11 2006 Joost Soeterbroek - 0.10.1 -- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077) - -* Thu Sep 28 2006 Joost Soeterbroek - 0.10 -- upstream release 0.10 'Zengia' - -* Wed Aug 30 2006 Joost Soeterbroek - 0.9.6-3 -- remove %%ghost for .pyo files; bugzilla #205439 - -* Wed Aug 30 2006 Joost Soeterbroek - 0.9.6-2 -- rebuild for Fedora Extras 6 - -* Thu Jul 6 2006 Joost Soeterbroek - 0.9.6-1 -- upstream release 0.9.6 - -* Tue Apr 18 2006 Joost Soeterbroek - 0.9.5-1 -- bug fix release 0.9.5 - -* Wed Feb 15 2006 Joost Soeterbroek - 0.9.4-1 -- 0.9.4 - * Deletion of reports has been fixed. - * Various encoding issues with the timeline RSS feed have been fixed. - * Fixed a memory leak when syncing with the repository. - * Milestones in the roadmap are now ordered more intelligently. - * Fixed bugs: - 1064, 1150, 2006, 2253, 2324, 2330, 2408, 2430, 2431, 2459, 2544, - 2459, 2481, 2485, 2536, 2544, 2553, 2580, 2583, 2606, 2613, 2621, - 2664, 2666, 2680, 2706, 2707, 2735 - -* Mon Feb 13 2006 Joost Soeterbroek - 0.9.3-5 -- Rebuild for Fedora Extras 5 - -* Mon Jan 16 2006 Joost Soeterbroek - 0.9.3-4 -- updated trac.conf to allow for trac.*cgi - -* Mon Jan 16 2006 Joost Soeterbroek - 0.9.3-3 -- re-added tracd and trac.fcgi by user request. - -* Tue Jan 10 2006 Joost Soeterbroek - 0.9.3-2 -- removed trac.fcgi (bugzilla #174546, comment #11) -- applied patch (bugzilla #174546, attachment id=123008) - -* Mon Jan 9 2006 Joost Soeterbroek - 0.9.3-1 -- 0.9.3 -- removed tracd (bugzilla #174546, comment #6) -- added trac.conf for httpd -- removed %%{python_sitelib}/trac/test.py -- removed comments - -* Tue Dec 6 2005 Joost Soeterbroek - 0.9.2-2 -- added /etc/init.d/tracd -- added /etc/sysconfig/tracd - -* Tue Dec 6 2005 Joost Soeterbroek - 0.9.2-1 -- 0.9.2 -- fixes SQL Injection Vulnerability in ticket search module. -- fixes broken ticket email notifications. - -* Sat Dec 3 2005 Joost Soeterbroek - 0.9.1-1 -- 0.9.1 -- fixes SQL Injection Vulnerability - -* Tue Nov 29 2005 Joost Soeterbroek - 0.9-1 -- Rebuild for Fedora Extras - -* Tue Nov 1 2005 Ville Skyttä - 0.9-1 -- 0.9. - -* Mon Jun 20 2005 Ville Skyttä - 0.8.4-0.1 -- 0.8.4. -- Move tracd to %%{_sbindir} and man page to section 8. - -* Thu Jun 16 2005 Ville Skyttä - 0.8.3-0.1 -- 0.8.3. - -* Wed Jun 1 2005 Ville Skyttä - 0.8.2-0.1 -- 0.8.2. - -* Sun May 29 2005 Ville Skyttä - 0.8.1-0.2 -- Rebuild for FC4. - -* Fri Apr 8 2005 Ville Skyttä - 0.8.1-0.1 -- First build.