rpms/python-markdown2/F-11 markdown2-old-pygments.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.4, 1.5 python-markdown2.spec, 1.6, 1.7 sources, 1.5, 1.6

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13721/F-11

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

markdown2-old-pygments.patch:
 syntax_color.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE markdown2-old-pygments.patch ---
diff -up markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig markdown2-1.0.1.13/test/tm-cases/syntax_color.html
--- markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig	2009-04-07 16:39:22.000000000 +0200
+++ markdown2-1.0.1.13/test/tm-cases/syntax_color.html	2009-09-02 22:19:38.000000000 +0200
@@ -1,6 +1,6 @@
 <p>Here is some sample code:</p>
 
-<div class="codehilite"><pre><code><span class="kn">import</span> <span class="nn">sys</span>
+<div class="codehilite"><pre><code><span class="k">import</span> <span class="nn">sys</span>
 <span class="k">def</span> <span class="nf">main</span><span class="p">(</span><span class="n">argv</span><span class="o">=</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">):</span>
     <span class="n">logging</span><span class="o">.</span><span class="n">basicConfig</span><span class="p">()</span>
     <span class="n">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">'hi'</span><span class="p">)</span>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Oct 2008 21:58:30 -0000	1.5
+++ .cvsignore	8 Oct 2009 08:17:21 -0000	1.6
@@ -1 +1 @@
-markdown2-1.0.1.11.tar.gz
+markdown2-1.0.1.15.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	2 Oct 2008 21:58:30 -0000	1.4
+++ import.log	8 Oct 2009 08:17:21 -0000	1.5
@@ -2,3 +2,4 @@ python-markdown2-1_0_1_7-1_fc9:HEAD:pyth
 python-markdown2-1_0_1_8-1_fc9:HEAD:python-markdown2-1.0.1.8-1.fc9.src.rpm:1221168324
 python-markdown2-1_0_1_9-1_fc9:HEAD:python-markdown2-1.0.1.9-1.fc9.src.rpm:1221203243
 python-markdown2-1_0_1_11-1_fc9:HEAD:python-markdown2-1.0.1.11-1.fc9.src.rpm:1222984575
+python-markdown2-1_0_1_15-1_fc11:F-11:python-markdown2-1.0.1.15-1.fc11.src.rpm:1254989653


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/python-markdown2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-markdown2.spec	26 Feb 2009 22:16:13 -0000	1.6
+++ python-markdown2.spec	8 Oct 2009 08:17:21 -0000	1.7
@@ -3,13 +3,15 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.11
-Release:        3%{?dist}
+Version:        1.0.1.15
+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}.tar.gz
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -30,6 +32,9 @@ http://daringfireball.net/projects/markd
 
 %prep
 %setup0 -q -n %{srcname}-%{version}
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 
 
 %build
@@ -63,6 +68,19 @@ cd test
 
 
 %changelog
+* Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.15-1
+- Update to 1.0.1.15. Fixes three issues, two of them being
+  security-related.
+
+* Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-3
+- Patch syntax_color test case for older pygments version on rhel.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 11 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-1
+- Update to 1.0.1.13.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Oct 2008 21:58:30 -0000	1.5
+++ sources	8 Oct 2009 08:17:21 -0000	1.6
@@ -1 +1 @@
-dbeb26dd3b03a1a2ec8b46fa243b3331  markdown2-1.0.1.11.tar.gz
+b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip