rpms/python-markdown2/F-13 python-markdown2-pygments.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 import.log, 1.8, 1.9 python-markdown2.spec, 1.11, 1.12 sources, 1.8, 1.9 markdown2-old-pygments.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28836/F-13

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Added Files:
	python-markdown2-pygments.patch 
Removed Files:
	markdown2-old-pygments.patch 
Log Message:
Update to 1.0.1.17.

python-markdown2-pygments.patch:
 syntax_color_opts.html |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE python-markdown2-pygments.patch ---
diff --git a/test/tm-cases/syntax_color_opts.html b/test/tm-cases/syntax_color_opts.html
index 07a55fd..7a449e0 100644
--- a/test/tm-cases/syntax_color_opts.html
+++ b/test/tm-cases/syntax_color_opts.html
@@ -1,6 +1,6 @@
 <p>Here is some sample code:</p>
 
-<div class="codehilite"><pre><code><span style="color: #008000; font-weight: bold">import</span> <span style="color: #0000FF; font-weight: bold">sys</span>
+<div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><code><span style="color: #008000; font-weight: bold">import</span> <span style="color: #0000FF; font-weight: bold">sys</span>
 <span style="color: #008000; font-weight: bold">def</span> <span style="color: #0000FF">main</span>(argv<span style="color: #666666">=</span>sys<span style="color: #666666">.</span>argv):
     logging<span style="color: #666666">.</span>basicConfig()
     log<span style="color: #666666">.</span>info(<span style="color: #BA2121">&#39;hi&#39;</span>)
@@ -8,7 +8,7 @@
 
 <p>and:</p>
 
-<div class="codehilite"><pre><code>use <span style="color: #BA2121">&#39;zlib&#39;</span>
+<div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><code>use <span style="color: #BA2121">&#39;zlib&#39;</span>
 <span style="color: #008000">sub</span> main(argv)
     <span style="color: #008000">puts</span> <span style="color: #BA2121">&#39;hi&#39;</span>
 <span style="color: #008000; font-weight: bold">end</span>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	29 Dec 2009 19:42:58 -0000	1.8
+++ .cvsignore	3 Jul 2010 07:59:15 -0000	1.9
@@ -1 +1 @@
-markdown2-1.0.1.16.zip
+markdown2-1.0.1.17.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-13/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	29 Dec 2009 19:42:58 -0000	1.8
+++ import.log	3 Jul 2010 07:59:16 -0000	1.9
@@ -6,3 +6,4 @@ python-markdown2-1_0_1_13-1_fc11:HEAD:py
 python-markdown2-1_0_1_13-3_fc11:HEAD:python-markdown2-1.0.1.13-3.fc11.src.rpm:1251993409
 python-markdown2-1_0_1_15-1_fc11:HEAD:python-markdown2-1.0.1.15-1.fc11.src.rpm:1254989197
 python-markdown2-1_0_1_16-1_fc12:HEAD:python-markdown2-1.0.1.16-1.fc12.src.rpm:1262115710
+python-markdown2-1_0_1_17-1_fc13:F-13:python-markdown2-1.0.1.17-1.fc13.src.rpm:1278143915


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-13/python-markdown2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-markdown2.spec	29 Dec 2009 19:42:58 -0000	1.11
+++ python-markdown2.spec	3 Jul 2010 07:59:16 -0000	1.12
@@ -3,15 +3,15 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.16
+Version:        1.0.1.17
 Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/python-%{srcname}/
 Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.zip
-# needed on rhel with python-pygments 0.9
-Patch0:         markdown2-old-pygments.patch
+# reported upstream as issue #39
+Patch0:         python-markdown2-pygments.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -32,9 +32,7 @@ http://daringfireball.net/projects/markd
 
 %prep
 %setup0 -q -n %{srcname}-%{version}
-%if 0%{?rhel}
 %patch0 -p1
-%endif
 
 
 %build
@@ -68,6 +66,14 @@ cd test
 
 
 %changelog
+* Thu Jun  3 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.17-1
+- Update to 1.0.17.
+- Add patch for failing test.
+
+* Tue Dec 29 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.16-2
+- Patch for older pygments on rhel no longer needed, pygments has been
+  updated in EPEL.
+
 * Fri Dec 18 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.16-1
 - Update to 1.0.1.16.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	29 Dec 2009 19:42:58 -0000	1.8
+++ sources	3 Jul 2010 07:59:16 -0000	1.9
@@ -1 +1 @@
-d04a8e3743134a2800816e88213a1728  markdown2-1.0.1.16.zip
+5f67ad41e925c4f52bec0b2cd5014002  markdown2-1.0.1.17.zip


--- markdown2-old-pygments.patch DELETED ---