[python-pycxx] 6.2.4-7.20130805svn280: update to latest SVN for python3 compatibility

[John Morris]

commit 7ffdb3cbb1f8126048d3229ced78cb7c83dd08e0
Author: John Morris <john at zultron.com>
Date:   Tue Aug 6 00:43:25 2013 -0500

    6.2.4-7.20130805svn280:  update to latest SVN for python3 compatibility
    
    - Update to SVN r280 for python3 compatibility
    - Update python-pycxx-6.2.4-setup.py.patch to apply correctly
    - Fix %%setup for SVN zipball
    - Add diff extensions to %%patch macros

 .gitignore                        |   10 +++++++++-
 python-pycxx-6.2.4-setup.py.patch |   26 +++++++++-----------------
 python-pycxx.spec                 |   26 ++++++++++++++++++++------
 sources                           |    2 +-
 4 files changed, 39 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7614f7a..22783e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,9 @@
-/pycxx-6.2.4.tar.gz
+# ignore sources
+/pycxx-6.*.tar.gz
+/cxx-code-*.zip
+
+# ignore fedpkg local build artifacts
+/.build-6.*.log
+/python-pycxx-6.*.src.rpm
+/noarch/
+/cxx-code-*-trunk/
diff --git a/python-pycxx-6.2.4-setup.py.patch b/python-pycxx-6.2.4-setup.py.patch
index 052b614..e227ab5 100644
--- a/python-pycxx-6.2.4-setup.py.patch
+++ b/python-pycxx-6.2.4-setup.py.patch
@@ -7,10 +7,10 @@ This patch makes several changes to setup.py:
 - Convert tabs to spaces (from original RPM)
   - http://www.python.org/dev/peps/pep-0008/#tabs-or-spaces
 
-diff -ruN pycxx-6.2.4.orig/setup.py pycxx-6.2.4/setup.py
---- pycxx-6.2.4.orig/setup.py	2010-05-02 14:10:27.000000000 -0500
-+++ pycxx-6.2.4/setup.py	2012-06-28 03:26:33.000000000 -0500
-@@ -1,35 +1,70 @@
+diff -up cxx-code-280-trunk/CXX/setup.py.setup cxx-code-280-trunk/CXX/setup.py
+--- a/setup.py.setup	2013-06-18 13:20:30.000000000 -0500
++++ b/setup.py	2013-08-06 00:36:16.000000000 -0500
+@@ -1,12 +1,31 @@
  import os, sys
  from glob import glob
  from distutils.command.install import install
@@ -46,19 +46,13 @@ diff -ruN pycxx-6.2.4.orig/setup.py pycxx-6.2.4/setup.py
  
  
  class my_install (install):
- 
-     def finalize_options (self):
--	if not self.install_data or (len(self.install_data) < 8) :
--	    self.install_data = "$base/share/python$py_version_short"
-+        if not self.install_data or (len(self.install_data) < 8):
-+            self.install_data = "$base/share/python$py_version_short"
+@@ -17,10 +36,25 @@ class my_install (install):
          install.finalize_options (self)
  
      def run (self):
--	self.distribution.data_files = [("CXX", sources)]
--	self.distribution.headers = headers
+-        self.distribution.data_files = [("CXX", sources)]
 +        self.distribution.data_files = sources
-+        self.distribution.headers = headers
+         self.distribution.headers = headers
          install.run (self)
  
 +class my_install_headers (install_headers):
@@ -78,10 +72,8 @@ diff -ruN pycxx-6.2.4.orig/setup.py pycxx-6.2.4/setup.py
 +
  
  setup (name             = "CXX",
--       version          = "6.2.0",
-+       version          = "6.2.4",
-        maintainer       = "Barry Scott",
-        maintainer_email = "barry-scott at users.sourceforge.net",
+        version          = "6.2.4",
+@@ -29,7 +63,8 @@ setup (name             = "CXX",
         description      = "Facility for extending Python with C++",
         url              = "http://cxx.sourceforge.net",
         
diff --git a/python-pycxx.spec b/python-pycxx.spec
index 98b676e..5ce7a1c 100644
--- a/python-pycxx.spec
+++ b/python-pycxx.spec
@@ -5,9 +5,13 @@
 
 # Specify '--with=python3' to build the python 3 RPM
 
+%global svn_rev 280
+%global download_date 20130805
+%global vcs_rel %{download_date}svn%{svn_rev}
+
 Name:           python-%{modname}
 Version:        6.2.4
-Release:        6%{?dist}
+Release:        7.%{vcs_rel}%{?dist}
 Summary:        Write Python extensions in C++
 
 Group:          Development/Libraries
@@ -16,7 +20,9 @@ URL:            http://CXX.sourceforge.net/
 
 BuildArch:      noarch
 
-Source0:        http://downloads.sourceforge.net/cxx/%{modname}-%{version}.tar.gz
+# SVN version supports Python3
+#Source0:        http://downloads.sourceforge.net/cxx/%{modname}-%{version}.tar.gz
+Source0:        http://sourceforge.net/code-snapshots/svn/c/cx/cxx/code/cxx-code-%{svn_rev}-trunk.zip
 # Patch0:  remove unnecessary 'Src/' directory from include path in sources
 Patch0:         %{name}-%{version}-change-include-paths.patch
 # Patch1:  fix several problems with install, esp. omitted files, python 
@@ -69,10 +75,12 @@ for Python 3.  There is no non-devel package needed.
 
 
 %prep
-%setup -q -n %{modname}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+# SVN version .zip file unpacks differently
+%setup -q -n cxx-code-%{svn_rev}-trunk/CXX
+#%setup -q -n %{modname}-%{version}
+%patch0 -p1 -b .change-include-paths
+%patch1 -p1 -b .setup
+%patch2 -p1 -b .python3-syntax-fix
 
 
 %build
@@ -143,6 +151,12 @@ test "$(pkg-config --modversion PyCXX)" = "%{version}"
 
 
 %changelog
+* Mon Aug  5 2013 John Morris <john at zultron.com> - 6.2.4-7.280svn20130805
+- Update to SVN r280 for python3 compatibility
+- Update python-pycxx-6.2.4-setup.py.patch to apply correctly
+- Fix %%setup for SVN zipball
+- Add diff extensions to %%patch macros
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 52feb98..3d7c204 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2500da3ab64cdba7ce5756945c30f91  pycxx-6.2.4.tar.gz
+0b79987bb7dbe6265fa2f347a68d16de  cxx-code-280-trunk.zip