Search
j0ke.net Open Build Service
>
Projects
>
multimedia
>
wxWidgets
> Changes
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
Changes of Revision 2
[-]
[+]
Changed
wxWidgets.spec
@@ -5,7 +5,7 @@ %define wx_version 2.8 Name: wxWidgets -Version: 2.8.7.1 +Version: 2.8.8.1 Release: 1 Group: System/Libraries Summary: C++ framework for cross-platform development @@ -13,8 +13,7 @@ URL: http://wxwidgets.org/ # Source from http://www.wxpython.org/ Source0: http://downloads.sourceforge.net/wxpython/wxPython-src-%{version}.tar.bz2 -#Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}-2.8.7-HTML.tar.bz2 +Source1: %{name}-2.8.8-HTML.tar.bz2 Source2: README.unicode Patch: %{name}-2.7.0-no-double-wxyield.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,21 +25,30 @@ BuildRequires: libtiff-devel BuildRequires: gnome-vfs2-devel BuildRequires: libgnomeprintui-devel -%if %suse_version >= 1010 BuildRequires: mDNSResponder-lib -%endif BuildRequires: python-devel BuildRequires: unixODBC-devel +BuildRequires: unzip + %if "%{_with_gst}" == "1" +%if %suse_version >= 1030 +BuildRequires: gstreamer-0_10-devel +BuildRequires: gstreamer-0_10-plugins-base-devel +Requires: gstreamer-0_10 +Requires: gstreamer-0_10-plugins-base +%else BuildRequires: gstreamer010-devel BuildRequires: gstreamer010-plugins-base-devel Requires: gstreamer010 Requires: gstreamer010-plugins-base %endif +%endif + %if "%{_with_sdl}" == "1" BuildRequires: SDL-devel Requires: SDL %endif + %if %suse_version >= 1030 Provides: wxGTK Obsoletes: wxGTK @@ -62,21 +70,26 @@ Requires: %{name}-compat = %{version} Requires: %{name}-gl = %{version} Requires: %{name}-gl-compat = %{version} -Requires: gtk2-devel Requires: gnome-vfs2-devel +%if "%{_with_gst}" == "1" +%if %suse_version >= 1030 +Requires: gstreamer-0_10-devel +Requires: gstreamer-0_10-plugins-base-devel +%else +Requires: gstreamer010-devel +Requires: gstreamer010-plugins-base-devel +%endif +%endif +Requires: gtk2-devel Requires: libgnomeprintui-devel Requires: libpng-devel Requires: libjpeg-devel Requires: libmspack-devel Requires: libtiff-devel -Requires: unixODBC-devel %if "%{_with_sdl}" == "1" Requires: SDL-devel %endif -%if "%{_with_gst}" == "1" -Requires: gstreamer010-devel -Requires: gstreamer010-plugins-base-devel -%endif +Requires: unixODBC-devel %if %suse_version >= 1030 Provides: wxGTK-devel Obsoletes: wxGTK-devel @@ -167,11 +180,17 @@ %prep %setup -q -n wxPython-src-%{version} -a1 -#%setup -q -n %{name}-%{version} -a1 %patch -p1 +# the wxWidgets-docs are repackaged as tar.bz2 +#unzip -q -o %{SOURCE1} + %__install -m 644 %{SOURCE2} . +# fix typo in this source +%__sed -i -e 's|m_gnome_vfs_lib->.Detach();|m_gnome_vfs_lib->Detach();|g' \ + src/gtk/gnome/gvfs.cpp + %build ###################### # non-unicode version: @@ -183,7 +202,9 @@ --libdir='${prefix}/%{_lib}' \ --enable-rpath='${prefix}/%{_lib}' \ --disable-backtrace \ +%if 0 --disable-catch_segvs \ +%endif --disable-debug \ --disable-dialupman \ --disable-gpe \ @@ -557,7 +578,7 @@ %{py_sitedir}/* %endif -%changelog -n wxWidgets +%changelog * Sat May 24 2008 Carsten Schoene <cs@linux-administrator.com> - import for SLE_10 build
Changed
wxPython-src-2.8.8.1.tar.bz2
^
Deleted
wxWidgets-2.8.7-HTML.tar.bz2
^
Added
wxWidgets-2.8.8-HTML.tar.bz2
^
