- merge DEVEL

diff --cc wxWidgets.spec
index 98f8a6f8eed48b6b5037b4785ad303e2969ea193,c821e6c366f6826815662dfee9a0a8458d72b8f8..29c1ba847642079eaa926b9d6bef0840444c1042
--- 1/wxWidgets.spec
--- 2/wxWidgets.spec
+++ b/wxWidgets.spec
@@@ -44,11 -39,9 +39,12 @@@ BuildRequires:      libpng-deve
  BuildRequires:        libstdc++-devel
  BuildRequires:        libtiff-devel
  BuildRequires:        libtool
 +%{?with_x11:BuildRequires:    pangox-compat-devel}
+ BuildRequires:        p7zip-standalone
  BuildRequires:        pkgconfig
 +%{?with_odbc:BuildRequires:   unixODBC-devel}
  %{?with_x11:BuildRequires:    xorg-lib-libXext-devel}
 +%{?with_x11:BuildRequires:    xorg-lib-libXt-devel}
  # these are not supported by wxWidgets
  Obsoletes:    LDAPExplorerTool <= 0.6-1
  Obsoletes:    abridge <= 0.4.0-1
@@@ -470,20 -452,14 +468,21 @@@ Pliki programistyczne biblioteki GL dl
  obsługą UNICODE.
  
  %prep
- %setup -q
+ %setup -q -c
  %patch0 -p1
- # is this still needed?
- #%patch1 -p1
+ %patch1 -p1
  %patch2 -p1
  %patch3 -p1
 +%patch4 -p1
 +%patch5 -p1
 +%patch6 -p1
 +%patch7 -p1
 +%patch8 -p1
 +
 +%{__rm} build/aclocal/bakefile*.m4
  
+ %undos src/stc/gen_iface.py
+ 
  %build
  # if bakefiles rebuild is needed:
  #%if "%(rpm -q bakefile --qf '%%{VERSION}')" != "0.2.1"
@@@ -518,12 -492,12 +517,14 @@@ for unicode in %{?with_ansi:'--disable-
        ../%configure \
                ${args} \
                ${gui} \
 +              --enable-graphics_ctx \
                --disable-universal \
                ${unicode} \
+               --enable-printarch \
+               --with-gtkprint \
                %{!?with_gnomeprint:--without-gnomeprint}
        %{__make}
 +      %{__make} -C contrib/src
        cd ..
  done