From 4e3dbbda772c68ab8b6d3a421c38a35ca2c67608 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Jul 21 2011 17:02:09 +0000 Subject: Update to 1.0.1.19. Drop patch applied upstream. Update project URL. Update macros, use %global. Update %doc. Do not run tests known to fail. --- diff --git a/.gitignore b/.gitignore index a708fa1..bfb1ed1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ markdown2-1.0.1.17.zip +/markdown2-1.0.1.19.zip diff --git a/python-markdown2-pygments.patch b/python-markdown2-pygments.patch deleted file mode 100644 index 883620b..0000000 --- a/python-markdown2-pygments.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 @@ -

Here is some sample code:

- --
import sys
-+
import sys
- def main(argv=sys.argv):
-     logging.basicConfig()
-     log.info('hi')
-@@ -8,7 +8,7 @@
- 
- 

and:

- --
use 'zlib'
-+
use 'zlib'
- sub main(argv)
-     puts 'hi'
- end
diff --git a/python-markdown2.spec b/python-markdown2.spec
index c9e825b..5aa7c75 100644
--- a/python-markdown2.spec
+++ b/python-markdown2.spec
@@ -1,17 +1,17 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
 
-%define srcname markdown2
+%global srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.17
-Release:        3%{?dist}
+Version:        1.0.1.19
+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}/
+URL:            https://github.com/trentm/python-%{srcname}/
 Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.zip
-# 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,7 +32,6 @@ http://daringfireball.net/projects/markdown/
 
 %prep
 %setup0 -q -n %{srcname}-%{version}
-%patch0 -p1
 
 
 %build
@@ -55,17 +54,25 @@ rm -rf %{buildroot}
 
 %check
 cd test
-%{__python} test.py
+%{__python} test.py -- -knownfailure
 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES.txt LICENSE.txt README.txt TODO.txt
+%doc CHANGES.txt CONTRIBUTORS.txt LICENSE.txt TODO.txt
 %{python_sitelib}/*
 %{_bindir}/markdown2
 
 
 %changelog
+* Thu Jul 21 2011 Thomas Moschny  - 1.0.1.19-1
+- Update to 1.0.1.19.
+  - Drop patch applied upstream.
+  - Update project URL.
+- Update macros, use %%global.
+- Update %%doc.
+- Do not run tests known to fail.
+
 * Tue Feb 08 2011 Fedora Release Engineering  - 1.0.1.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index c970cf1..5990d8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f67ad41e925c4f52bec0b2cd5014002  markdown2-1.0.1.17.zip
+136408ef48d9f0c01f122ceedfb3110f  markdown2-1.0.1.19.zip