Logoj0ke.net Open Build Service > Projects > multimedia > wxWidgets > Changes
Sign Up | Log In

Changes of Revision 2

[-] Changed wxWidgets.spec
​x
 
1
@@ -5,7 +5,7 @@
2
 %define wx_version 2.8
3
4
 Name:          wxWidgets
5
-Version:       2.8.7.1
6
+Version:       2.8.8.1
7
 Release:       1
8
 Group:         System/Libraries
9
 Summary:       C++ framework for cross-platform development
10
@@ -13,8 +13,7 @@
11
 URL:           http://wxwidgets.org/
12
 # Source from http://www.wxpython.org/
13
 Source0:        http://downloads.sourceforge.net/wxpython/wxPython-src-%{version}.tar.bz2
14
-#Source0:      %{name}-%{version}.tar.bz2
15
-Source1:       %{name}-2.8.7-HTML.tar.bz2
16
+Source1:       %{name}-2.8.8-HTML.tar.bz2
17
 Source2:       README.unicode
18
 Patch:         %{name}-2.7.0-no-double-wxyield.diff
19
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
20
@@ -26,21 +25,30 @@
21
 BuildRequires: libtiff-devel
22
 BuildRequires: gnome-vfs2-devel
23
 BuildRequires: libgnomeprintui-devel
24
-%if %suse_version >= 1010
25
 BuildRequires: mDNSResponder-lib
26
-%endif
27
 BuildRequires: python-devel
28
 BuildRequires: unixODBC-devel
29
+BuildRequires: unzip
30
+
31
 %if "%{_with_gst}" == "1"
32
+%if %suse_version >= 1030
33
+BuildRequires: gstreamer-0_10-devel
34
+BuildRequires: gstreamer-0_10-plugins-base-devel
35
+Requires:      gstreamer-0_10
36
+Requires:      gstreamer-0_10-plugins-base
37
+%else
38
 BuildRequires: gstreamer010-devel
39
 BuildRequires: gstreamer010-plugins-base-devel
40
 Requires:      gstreamer010
41
 Requires:      gstreamer010-plugins-base
42
 %endif
43
+%endif
44
+
45
 %if "%{_with_sdl}" == "1"
46
 BuildRequires: SDL-devel
47
 Requires:      SDL
48
 %endif
49
+
50
 %if %suse_version >= 1030
51
 Provides:      wxGTK
52
 Obsoletes:     wxGTK
53
@@ -62,21 +70,26 @@
54
 Requires:  %{name}-compat = %{version}
55
 Requires:  %{name}-gl = %{version}
56
 Requires:  %{name}-gl-compat = %{version}
57
-Requires:  gtk2-devel
58
 Requires:  gnome-vfs2-devel
59
+%if "%{_with_gst}" == "1"
60
+%if %suse_version >= 1030
61
+Requires:  gstreamer-0_10-devel
62
+Requires:  gstreamer-0_10-plugins-base-devel
63
+%else
64
+Requires:  gstreamer010-devel
65
+Requires:  gstreamer010-plugins-base-devel
66
+%endif
67
+%endif
68
+Requires:  gtk2-devel
69
 Requires:  libgnomeprintui-devel
70
 Requires:  libpng-devel
71
 Requires:  libjpeg-devel
72
 Requires:  libmspack-devel
73
 Requires:  libtiff-devel
74
-Requires:  unixODBC-devel
75
 %if "%{_with_sdl}" == "1"
76
 Requires:  SDL-devel
77
 %endif
78
-%if "%{_with_gst}" == "1"
79
-Requires:  gstreamer010-devel
80
-Requires:  gstreamer010-plugins-base-devel
81
-%endif
82
+Requires:  unixODBC-devel
83
 %if %suse_version >= 1030
84
 Provides:  wxGTK-devel
85
 Obsoletes: wxGTK-devel
86
@@ -167,11 +180,17 @@
87
88
 %prep
89
 %setup -q -n wxPython-src-%{version} -a1
90
-#%setup -q -n %{name}-%{version} -a1
91
 %patch -p1
92
93
+# the wxWidgets-docs are repackaged as tar.bz2
94
+#unzip -q -o %{SOURCE1}
95
+
96
 %__install -m 644 %{SOURCE2} .
97
98
+# fix typo in this source
99
+%__sed -i -e 's|m_gnome_vfs_lib->.Detach();|m_gnome_vfs_lib->Detach();|g' \
100
+   src/gtk/gnome/gvfs.cpp
101
+
102
 %build
103
 ######################
104
 # non-unicode version:
105
@@ -183,7 +202,9 @@
106
        --libdir='${prefix}/%{_lib}' \
107
        --enable-rpath='${prefix}/%{_lib}' \
108
        --disable-backtrace \
109
+%if 0
110
        --disable-catch_segvs \
111
+%endif
112
        --disable-debug \
113
        --disable-dialupman \
114
        --disable-gpe \
115
@@ -557,7 +578,7 @@
116
 %{py_sitedir}/*
117
 %endif
118
119
-%changelog -n wxWidgets
120
+%changelog
121
 * Sat May 24 2008 Carsten Schoene <cs@linux-administrator.com>
122
 - import for SLE_10 build
123
124
​
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 ^

Cancel