commit cb048f163ebae8ad37dba3f33b8ab80382e6e171
Merge: b2638b8 07e498f
Author: Elan Ruusamäe <[email protected]>
Date:   Sat Jan 18 00:13:14 2014 +0000

    update to Trac 1.0.1
    
    Merge branch 'DEVEL'
    
    Conflicts:
        trac.spec

 pyc.patch                             |  21 ++++++++++++++
 silvercity-javascript-mimetypes.patch |  22 +++++++++++++--
 trac-defaults.patch                   |   8 +++---
 trac-upgrade.py                       |   3 ++
 trac.ico                              | Bin 3638 -> 0 bytes
 trac.spec                             |  51 ++++++++++++++++++----------------
 6 files changed, 75 insertions(+), 30 deletions(-)
---
diff --cc trac.spec
index a66600e,8829dbd..e86b6b3
--- a/trac.spec
+++ b/trac.spec
@@@ -4,16 -5,14 +5,14 @@@
  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
- # NOTE 1.x is on DEVEL branch, finish it there and then merge
- Version:      0.12.5
- Release:      5
+ Version:      1.0.1
 -Release:      0.1
++Release:      1
  License:      BSD-like
  Group:                Applications/WWW
- Source0:      http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz
- # Source0-md5:        9ff5adef035fc8f88cc54a714288ee9b
+ Source0:      http://download.edgewall.org/trac/Trac-%{version}.tar.gz
+ # Source0-md5:        c869fa40e29fa4597e2c9c960de9f2f3
  Source1:      %{name}-apache.conf
  Source2:      %{name}-lighttpd.conf
- Source3:      %{name}.ico
  Source4:      %{name}.ini
  Source5:      %{name}-enableplugin.py
  Source6:      %{name}-upgrade.py
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/trac.git/commitdiff/cb048f163ebae8ad37dba3f33b8ab80382e6e171

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to