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

Changes of Revision 6

[-] Changed wxWidgets.spec
x
 
1
@@ -1,48 +1,54 @@
2
+# Copyright (c) 2007-2009 oc2pus
3
+# This file and all modifications and additions to the pristine
4
+# package are under the same license as the package itself.
5
+#
6
+# Please submit bugfixes or comments to toni@links2linux.de
7
+
8
 # norootforbuild
9
 
10
 %define _with_gst  0
11
 %define _with_sdl  1
12
 %define wx_version 2.8
13
+%define wx_rel     10.1
14
+# see Changelog
15
+%define Editra_ver 0.4.88
16
 
17
 Name:          wxWidgets
18
-Version:       2.8.8.1
19
-Release:       1
20
+Version:       %{wx_version}.%{wx_rel}
21
+Release:       0.pm.1
22
 Group:         System/Libraries
23
 Summary:       C++ framework for cross-platform development
24
 License:       wxWidgets
25
 URL:           http://wxwidgets.org/
26
 # Source from http://www.wxpython.org/
27
 Source0:        http://downloads.sourceforge.net/wxpython/wxPython-src-%{version}.tar.bz2
28
-Source1:       %{name}-2.8.8-HTML.tar.bz2
29
+Source1:       http://downloads.sourceforge.net/wxpython/wxPython-docs-%{version}.tar.bz2
30
 Source2:       README.unicode
31
-Source3:       wxWidgets-rpmlintrc
32
+# the release tarball is missing ebmlib
33
+# svn co http://svn.wxwidgets.org/svn/wx/wxPython/3rdParty/Editra Editra
34
+Source3:       Editra.tar.bz2
35
+Source90:      %{name}-rpmlintrc
36
 Patch:         %{name}-2.7.0-no-double-wxyield.diff
37
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
38
-BuildRequires: expat
39
 BuildRequires: gcc-c++
40
+BuildRequires: gnome-vfs2-devel
41
 BuildRequires: gtk2-devel
42
+BuildRequires: libexpat-devel
43
+BuildRequires: libgnomeprintui-devel
44
 BuildRequires: libjpeg-devel
45
 BuildRequires: libmspack-devel
46
 BuildRequires: libtiff-devel
47
-BuildRequires: gnome-vfs2-devel
48
-BuildRequires: libgnomeprintui-devel
49
 BuildRequires: mDNSResponder-lib
50
 BuildRequires: python-devel
51
 BuildRequires: unixODBC-devel
52
 BuildRequires: unzip
53
+BuildRequires: update-desktop-files
54
 
55
 %if "%{_with_gst}" == "1"
56
-%if %suse_version >= 1030
57
 BuildRequires: gstreamer-0_10-devel
58
 BuildRequires: gstreamer-0_10-plugins-base-devel
59
 Requires:      gstreamer-0_10
60
 Requires:      gstreamer-0_10-plugins-base
61
-%else
62
-BuildRequires: gstreamer010-devel
63
-BuildRequires: gstreamer010-plugins-base-devel
64
-Requires:      gstreamer010
65
-Requires:      gstreamer010-plugins-base
66
-%endif
67
 %endif
68
 
69
 %if "%{_with_sdl}" == "1"
70
@@ -50,10 +56,11 @@
71
 Requires:      SDL
72
 %endif
73
 
74
-%if %suse_version >= 1030
75
 Provides:      wxGTK
76
 Obsoletes:     wxGTK
77
-%endif
78
+
79
+# pmbs ...
80
+BuildRequires: liboil-0_3-0
81
 
82
 %description
83
 wxWidgets is a free C++ library for cross-platform GUI development.
84
@@ -64,6 +71,9 @@
85
 
86
 This package contains the thread- and unicode enabled libraries.
87
 
88
+%debug_package
89
+%lang_package
90
+
91
 %package devel
92
 Summary:   Include files and libraries for wxWidgets development
93
 Group:     Development/Libraries/C and C++
94
@@ -73,40 +83,38 @@
95
 Requires:  %{name}-gl-compat = %{version}
96
 Requires:  gnome-vfs2-devel
97
 %if "%{_with_gst}" == "1"
98
-%if %suse_version >= 1030
99
 Requires:  gstreamer-0_10-devel
100
 Requires:  gstreamer-0_10-plugins-base-devel
101
-%else
102
-Requires:  gstreamer010-devel
103
-Requires:  gstreamer010-plugins-base-devel
104
-%endif
105
 %endif
106
 Requires:  gtk2-devel
107
+Requires:  libexpat-devel
108
 Requires:  libgnomeprintui-devel
109
-Requires:  libpng-devel
110
 Requires:  libjpeg-devel
111
 Requires:  libmspack-devel
112
+Requires:  libpng-devel
113
 Requires:  libtiff-devel
114
 %if "%{_with_sdl}" == "1"
115
 Requires:  SDL-devel
116
 %endif
117
 Requires:  unixODBC-devel
118
-%if %suse_version >= 1030
119
 Provides:  wxGTK-devel
120
 Obsoletes: wxGTK-devel
121
-%endif
122
 
123
 %description devel
124
-Development package for wxWidgets.
125
+wxWidgets is a free C++ library for cross-platform GUI development.
126
+
127
+With wxWidgets, you can create applications for different GUIs
128
+(GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same
129
+source code.
130
+
131
+Development package for package wxWidgets.
132
 
133
 %package compat
134
-Summary:   Compatibility Package for wxWidgets
135
+Summary:   WxWidgets Compatibility Package
136
 Group:     System/Libraries
137
 Requires:  %{name} = %{version}
138
-%if %suse_version >= 1030
139
 Provides:  wxGTK-compat
140
 Obsoletes: wxGTK-compat
141
-%endif
142
 
143
 %description compat
144
 wxWidgets is a free C++ library for cross-platform GUI development.
145
@@ -119,9 +127,10 @@
146
 which is needed for some improperly written applications.
147
 
148
 %package docs
149
-Summary:   HTML documentations for wxWidgets
150
+Summary:   WxWidgets html documentations
151
 Group:     Documentation/HTML
152
 Requires:  %{name} = %{version}
153
+Requires:  python-wxGTK
154
 
155
 %description docs
156
 wxWidgets is a free C++ library for cross-platform GUI development.
157
@@ -136,10 +145,8 @@
158
 Summary:   OpenGL add-on for wxWidgets
159
 Group:     System/Libraries
160
 Requires:  %{name} = %{version}
161
-%if %suse_version >= 1030
162
 Provides:  wxGTK-gl
163
 Obsoletes: wxGTK-gl
164
-%endif
165
 
166
 %description gl
167
 OpenGL add-on library for wxGTK, the GTK+ port of the wxWidgets
168
@@ -149,18 +156,15 @@
169
 Summary:   OpenGL add-on for wxWidgets
170
 Group:     System/Libraries
171
 Requires:  %{name} = %{version}
172
-#Requires: %{name}-compat = %{version}
173
 
174
 %description gl-compat
175
 OpenGL add-on library for wxGTK, the GTK+ port of the wxWidgets
176
 library compiled without Unicode support.
177
 
178
-%if %suse_version >= 1030
179
 %package -n python-wxGTK
180
 Summary:   Cross Platform GUI Toolkit for Python Using wxGTK
181
 Group:     Development/Libraries/Python
182
-Url:       http://www.wxpython.org/
183
-%{py_requires}
184
+Requires:  python >= %{py_ver}
185
 Requires:  wxWidgets
186
 Provides:  wxPython
187
 
188
@@ -175,26 +179,87 @@
189
 and demos and examples are in package python-wxGTK-examples.
190
 
191
 Authors: Robin Dunn <robin@alldunn.com>
192
-%endif
193
 
194
-%debug_package
195
+%package -n python-Editra
196
+Summary:   Editra is a multi-platform text editor
197
+Group:     Productivity/Text/Editors
198
+#Version:  %{Editra_ver}
199
+Requires:  python >= %{py_ver}
200
+Requires:  python-wxGTK = %{version}
201
Added Editra.tar.bz2 ^
Added wxPython-docs-2.8.10.1.tar.bz2 ^
Changed wxPython-src-2.8.10.1.tar.bz2 ^
Deleted wxWidgets-2.8.8-HTML.tar.bz2 ^
[+] Changed wxWidgets-rpmlintrc ^