- up to 3.0.0.0

diff --git a/python-wxPython-CFLAGS.patch b/python-wxPython-CFLAGS.patch
index 30a5512f635defbb63e221857e2b2943a6858120..dfef8a56f1498437c0c71a2ab1bd0d06c5eccad4 100644 (file)
--- a/python-wxPython-CFLAGS.patch
+++ b/python-wxPython-CFLAGS.patch
@@ -1,15 +1,14 @@
-diff -Nur o.wxPython-src-2.6.1.0/wxPython/config.py n.wxPython-src-2.6.1.0/wxPython/config.py
---- o.wxPython-src-2.6.1.0/wxPython/config.py  2005-06-04 18:23:06.000000000 +0200
-+++ n.wxPython-src-2.6.1.0/wxPython/config.py  2005-08-19 21:40:48.000000000 +0200
-@@ -758,11 +758,6 @@
+--- wxPython-src-3.0.0.0/wxPython/config.py~   2013-12-16 14:39:50.000000000 +0100
++++ wxPython-src-3.0.0.0/wxPython/config.py    2014-01-15 09:19:01.973976105 +0100
+@@ -1030,11 +1030,6 @@
  
-     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
+     cflags = getWxConfigValue('--cxxflags')
      cflags = cflags.split()
 -    if debug:
--        cflags.append('-g')
+-        cflags.append('-ggdb')
 -        cflags.append('-O0')
 -    else:
 -        cflags.append('-O3')
  
-     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
-     lflags = lflags.split()
+     lflags = getWxConfigValue('--libs')
+     MONOLITHIC = (lflags.find("_xrc") == -1)

diff --git a/python-wxPython-format.patch b/python-wxPython-format.patch
index e8f3f5d27bb84d3a5a7f2ef403899dc097e37692..a1573f2913184d78ca7107ffbc678638a728ce33 100644 (file)
--- a/python-wxPython-format.patch
+++ b/python-wxPython-format.patch
@@ -174,8 +174,8 @@
    }
  }
  
---- wxPython-src-2.8.12.1/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp.orig 2011-07-14 04:25:41.000000000 +0200
-+++ wxPython-src-2.8.12.1/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp      2013-11-03 18:13:51.981832351 +0100
+--- wxPython-src-2.8.12.1/wxPython/src/gtk/glcanvas_wrap.cpp.orig      2011-07-14 04:25:41.000000000 +0200
++++ wxPython-src-2.8.12.1/wxPython/src/gtk/glcanvas_wrap.cpp   2013-11-03 18:13:51.981832351 +0100
 @@ -861,7 +861,7 @@
      Py_DECREF(old_str);
      Py_DECREF(value);
@@ -196,8 +196,41 @@
    }
  }
  
---- wxPython-src-2.8.12.1/wxPython/contrib/stc/gtk/stc_wrap.cpp.orig   2011-07-14 04:25:43.000000000 +0200
-+++ wxPython-src-2.8.12.1/wxPython/contrib/stc/gtk/stc_wrap.cpp        2013-11-03 18:15:21.091828613 +0100
+--- wxPython-src-2.8.12.1/wxPython/src/gtk/stc_wrap.cpp.orig   2011-07-14 04:25:43.000000000 +0200
++++ wxPython-src-2.8.12.1/wxPython/src/gtk/stc_wrap.cpp        2013-11-03 18:15:21.091828613 +0100
+@@ -861,7 +861,7 @@
+     Py_DECREF(old_str);
+     Py_DECREF(value);
+   } else {
+-    PyErr_Format(PyExc_RuntimeError, mesg);
++    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
+   }
+ }
+ 
+--- wxPython-src-3.0.0.0/wxPython/src/gtk/dataview_wrap.cpp~   2013-12-16 14:51:45.000000000 +0100
++++ wxPython-src-3.0.0.0/wxPython/src/gtk/dataview_wrap.cpp    2014-01-15 12:42:47.698683686 +0100
+@@ -861,7 +861,7 @@
+     Py_DECREF(old_str);
+     Py_DECREF(value);
+   } else {
+-    PyErr_Format(PyExc_RuntimeError, mesg);
++    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
+   }
+ }
+ 
+--- wxPython-src-3.0.0.0/wxPython/src/gtk/propgrid_wrap.cpp~   2013-12-16 14:52:01.000000000 +0100
++++ wxPython-src-3.0.0.0/wxPython/src/gtk/propgrid_wrap.cpp    2014-01-15 12:59:30.358303483 +0100
+@@ -861,7 +861,7 @@
+     Py_DECREF(old_str);
+     Py_DECREF(value);
+   } else {
+-    PyErr_Format(PyExc_RuntimeError, mesg);
++    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
+   }
+ }
+ 
+--- wxPython-src-3.0.0.0/wxPython/src/gtk/html2_wrap.cpp~      2013-12-28 10:28:56.000000000 +0100
++++ wxPython-src-3.0.0.0/wxPython/src/gtk/html2_wrap.cpp       2014-01-15 13:09:44.188126337 +0100
 @@ -861,7 +861,7 @@
      Py_DECREF(old_str);
      Py_DECREF(value);

diff --git a/python-wxPython.spec b/python-wxPython.spec
index 67a0466ad7fe7326d3ebe2594fd3139f76d742ec..9169131ad97b9475474bb2506926698a1157db30 100644 (file)
--- a/python-wxPython.spec
+++ b/python-wxPython.spec
@@ -3,12 +3,12 @@
 Summary:       Cross platform GUI toolkit for Python
 Summary(pl.UTF-8):     Wieloplatformowe narzędzie GUI dla Pythona
 Name:          python-%{module}
-Version:       2.8.12.1
-Release:       2
+Version:       3.0.0.0
+Release:       1
 License:       wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:         Libraries/Python
 Source0:       http://downloads.sourceforge.net/wxpython/%{module}-src-%{version}.tar.bz2
-# Source0-md5: 8c06c5941477beee213b4f2fa78be620
+# Source0-md5: f5e32c7d85dc261ba777e113c3b7e365
 Source1:       %{name}-wxversion-null.py
 Patch0:                %{name}-CFLAGS.patch
 Patch1:                %{name}-format.patch
@@ -158,19 +158,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %{py_sitedir}/wxversion.py[co]
 
-%dir %{py_sitedir}/%{module}
-%{py_sitedir}/%{module}/*.py[co]
-%dir %{py_sitedir}/%{module}/lib
-%{py_sitedir}/%{module}/lib/*.py[co]
-%dir %{py_sitedir}/%{module}/lib/colourchooser
-%{py_sitedir}/%{module}/lib/colourchooser/*.py[co]
-%dir %{py_sitedir}/%{module}/lib/editor
-%{py_sitedir}/%{module}/lib/editor/*.py[co]
-%dir %{py_sitedir}/%{module}/lib/mixins
-%{py_sitedir}/%{module}/lib/mixins/*.py[co]
-%dir %{py_sitedir}/%{module}/tools
-%{py_sitedir}/%{module}/tools/*.py[co]
-
 %dir %{py_sitedir}/wx
 %attr(755,root,root) %{py_sitedir}/wx/*.so
 %{py_sitedir}/wx/*.py[co]
@@ -200,12 +187,15 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/wx/lib/ogl/*.py[co]
 %dir %{py_sitedir}/wx/lib/agw
 %{py_sitedir}/wx/lib/agw/*.py[co]
+%{py_sitedir}/wx/lib/agw/data
 %dir %{py_sitedir}/wx/lib/agw/aui
 %{py_sitedir}/wx/lib/agw/aui/*.py[co]
 %dir %{py_sitedir}/wx/lib/agw/persist
 %{py_sitedir}/wx/lib/agw/persist/*.py[co]
 %dir %{py_sitedir}/wx/lib/agw/ribbon
 %{py_sitedir}/wx/lib/agw/ribbon/*.py[co]
+%dir %{py_sitedir}/wx/lib/pdfviewer
+%{py_sitedir}/wx/lib/pdfviewer/*.py[co]
 %dir %{py_sitedir}/wx/lib/pubsub
 %{py_sitedir}/wx/lib/pubsub/*.py[co]
 %dir %{py_sitedir}/wx/lib/pubsub/core
@@ -214,10 +204,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/wx/lib/pubsub/core/arg1/*.py[co]
 %dir %{py_sitedir}/wx/lib/pubsub/core/kwargs
 %{py_sitedir}/wx/lib/pubsub/core/kwargs/*.py[co]
-%dir %{py_sitedir}/wx/lib/pubsub/pubsub2
-%{py_sitedir}/wx/lib/pubsub/pubsub2/*.py[co]
-%dir %{py_sitedir}/wx/lib/pubsub/pubsub1
-%{py_sitedir}/wx/lib/pubsub/pubsub1/*.py[co]
 %dir %{py_sitedir}/wx/lib/pubsub/utils
 %{py_sitedir}/wx/lib/pubsub/utils/*.py[co]
 %dir %{py_sitedir}/wx/py
@@ -235,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/wx-2.8/wx/wxPython
+%{_includedir}/wx-3.0/wx/wxPython
 
 %files editra
 %defattr(644,root,root,755)
@@ -263,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(nn) %{py_sitedir}/wx/tools/Editra/locale/nn_NO
 %lang(pl) %{py_sitedir}/wx/tools/Editra/locale/pl_PL
 %lang(pt_BR) %{py_sitedir}/wx/tools/Editra/locale/pt_BR
+%lang(ro) %{py_sitedir}/wx/tools/Editra/locale/ro_RO
 %lang(ru) %{py_sitedir}/wx/tools/Editra/locale/ru_RU
 %lang(sk) %{py_sitedir}/wx/tools/Editra/locale/sk_SK
 %lang(sl) %{py_sitedir}/wx/tools/Editra/locale/sl_SI
@@ -281,20 +268,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/wx/tools/Editra/src/eclib/*.py[co]
 %dir %{py_sitedir}/wx/tools/Editra/src/extern
 %{py_sitedir}/wx/tools/Editra/src/extern/*.py[co]
-%dir %{py_sitedir}/wx/tools/Editra/src/extern/aui
-%{py_sitedir}/wx/tools/Editra/src/extern/aui/*.py[co]
-%dir %{py_sitedir}/wx/tools/Editra/src/extern/dexml
-%{py_sitedir}/wx/tools/Editra/src/extern/dexml/*.py[co]
-%dir %{py_sitedir}/wx/tools/Editra/src/extern/pygments
-%{py_sitedir}/wx/tools/Editra/src/extern/pygments/*.py[co]
-%dir %{py_sitedir}/wx/tools/Editra/src/extern/pygments/filters
-%{py_sitedir}/wx/tools/Editra/src/extern/pygments/filters/*.py[co]
-%dir %{py_sitedir}/wx/tools/Editra/src/extern/pygments/formatters
-%{py_sitedir}/wx/tools/Editra/src/extern/pygments/formatters/*.py[co]
-%dir %{py_sitedir}/wx/tools/Editra/src/extern/pygments/lexers
-%{py_sitedir}/wx/tools/Editra/src/extern/pygments/lexers/*.py[co]
-%dir %{py_sitedir}/wx/tools/Editra/src/extern/pygments/styles
-%{py_sitedir}/wx/tools/Editra/src/extern/pygments/styles/*.py[co]
 %dir %{py_sitedir}/wx/tools/Editra/src/syntax
 %{py_sitedir}/wx/tools/Editra/src/syntax/*.py[co]
 %dir %{py_sitedir}/wx/tools/Editra/src/ebmlib