]> git.pld-linux.org Git - packages/wxWidgets.git/blobdiff - wxWidgets.spec
- updated to 2.6.3
[packages/wxWidgets.git] / wxWidgets.spec
index 71fab4a85f99d9d64973055658e5d468b9b88f42..1d6c6148eb78c3f674ae88d722477593590cef8d 100644 (file)
@@ -2,47 +2,59 @@
 # Conditional build:
 %bcond_without ansi                    # only unicode packages
 %bcond_without odbc                    # without ODBC support
-%bcond_without x11                     # without wxX11 packages
+%bcond_without x11                     # don't build wxX11 packages
 %bcond_with    debug                   # build with \--enable-debug
                                        # (binary incompatible with non-debug)
+#
+# Unpackaged files:
+#  /usr/bin/wxrc-2.6
+#  /usr/share/bakefile/presets/wx.bkl
+#  /usr/share/bakefile/presets/wx_unix.bkl
+#  /usr/share/bakefile/presets/wx_win32.bkl
+#  /usr/share/locale/it/LC_MESSAGES/wxmsw.mo
+#
 
 Summary:       wxWidgets library
 Summary(pl):   Biblioteka wxWidgets
 Name:          wxWidgets
-Version:       2.5.3
-Release:       1.3
+Version:       2.6.3
+Release:       1
 License:       wxWidgets Licence (LGPL with exception)
 Group:         X11/Libraries
-Source0:       http://dl.sourceforge.net/wxwindows/wxAll-%{version}.tar.gz
-# Source0-md5: 33994e85efc06307977d2ddb9cbd91a1
-#Source1:      ftp://biolpc22.york.ac.uk/pub/%{version}/%{name}-%{version}-Patch02.tar.gz
-Source1:       http://ftp.uoi.gr/mirror/X11/wxWindows/%{version}/%{name}-%{version}-Patch02.tar.gz
-# Source1-md5: 96719aff7f9efa0aeea16e20277dc998
+Source0:       http://dl.sourceforge.net/wxwindows/%{name}-%{version}.tar.bz2
+# Source0-md5: 183a1fe136d7caacb60c717bbbef9788
 Patch0:                %{name}-samples.patch
-Patch1:                %{name}-utils.patch
-Patch2:                %{name}-ogl.patch
+Patch1:                %{name}-ogl.patch
+Patch2:                %{name}-ac.patch
+Patch3:                %{name}-gif0delay.patch
+Patch4:                %{name}-x11unicode.patch
+Patch5:                %{name}-intl.patch
+Patch6:                %{name}-gcc4.patch
 URL:           http://www.wxWidgets.org/
-BuildRequires: OpenGL-devel
-BuildRequires: SDL-devel
-BuildRequires: autoconf
+BuildRequires: OpenGL-GLU-devel
+#BuildRequires:        SDL-devel
+BuildRequires: autoconf >= 2.58
 BuildRequires: automake
-BuildRequires: bakefile >= 0.1.4
-BuildRequires: bakefile < 0.1.5
-BuildRequires: bison
+#BuildRequires:        bakefile >= 0.1.9
 BuildRequires: cppunit-devel
 BuildRequires: esound-devel
 BuildRequires: expat-devel
 BuildRequires: flex
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel
+BuildRequires: gtk+2-devel >= 2.0.0
 BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel
+BuildRequires: libmspack-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool
-BuildRequires: pango-devel
-Obsoletes:     wxwin-common
+BuildRequires: pkgconfig
+%{?with_x11:BuildRequires:     xorg-lib-libXext-devel}
+# these are not supported by wxWidgets
+Obsoletes:     LDAPExplorerTool <= 0.6-1
+Obsoletes:     abridge <= 0.4.0-1
+# and these are replaced
 Obsoletes:     wxGTK
 Obsoletes:     wxGTK-devel
 Obsoletes:     wxGTK-gl
@@ -63,7 +75,13 @@ Obsoletes:   wxMotif
 Obsoletes:     wxMotif-devel
 Obsoletes:     wxMotif-gl
 Obsoletes:     wxMotif-gl-devel
+Obsoletes:     wxWidgets-afm
 Obsoletes:     wxWindows
+Obsoletes:     wxWindows-afm
+Obsoletes:     wxwin-afm
+Obsoletes:     wxwin-common
+Conflicts:     wxGTK2 < 2.6.0
+Conflicts:     wxGTK2-unicode < 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     %{_datadir}
@@ -81,22 +99,6 @@ rozwijanie wieloplatformowych program
 mo¿na tworzyæ aplikacje dla ró¿nych GUI (GTK+, Motif/LessTif, MS
 Windows, Mac) z tego samego kodu ¼ród³owego.
 
-%package afm
-Summary:       Font metrics common for wxGTK, wxGTK2, wxMotif i wxX11
-Summary(pl):   Metryki fontów wspólne dla wxGTK, wxGTK2, wxMotif i wxX11
-Group:         X11/Libraries
-Requires:      %{name} = %{version}-%{release}
-Obsoletes:     wxwin-afm
-Obsoletes:     wxWindows-afm
-
-%description afm
-Font metrics (in AFM format) common for wxGTK, wxGTK2, wxMotif and
-wxX11 libraries.
-
-%description afm -l pl
-Metryki fontów (w formacie AFM) wspólne dla bibliotek wxGTK, wxGTK2,
-wxMotif i wxX11.
-
 %package devel
 Summary:       wxWidgets header files and development documentation
 Summary(pl):   Pliki nag³ówkowe i dokumentacja do wxWidgets
@@ -221,7 +223,6 @@ Summary:    wxGTK2 library
 Summary(pl):   Biblioteka wxGTK2
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-afm = %{version}-%{release}
 Obsoletes:     wxGTK2-univ
 
 %description -n wxGTK2
@@ -249,7 +250,6 @@ Summary:    GL canvas library for wxGTK2
 Summary(pl):   Biblioteka GL dla wxGTK2
 Group:         X11/Libraries
 Requires:      wxGTK2 = %{version}-%{release}
-Requires:      OpenGL
 Obsoletes:     wxGTK2-univ-gl
 
 %description -n wxGTK2-gl
@@ -264,7 +264,7 @@ Summary(pl):        Pliki programistyczne biblioteki GL dla wxGTK2
 Group:         X11/Development/Libraries
 Requires:      wxGTK2-devel = %{version}-%{release}
 Requires:      wxGTK2-gl = %{version}-%{release}
-Requires:      OpenGL-devel
+Requires:      OpenGL-GLU-devel
 Obsoletes:     wxGTK2-univ-gl-devel
 
 %description -n wxGTK2-gl-devel
@@ -278,7 +278,6 @@ Summary:    wxGTK2 library with UNICODE support
 Summary(pl):   Biblioteka wxGTK2 z obs³ug± UNICODE
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-afm = %{version}-%{release}
 Obsoletes:     wxGTK2-univ-unicode
 
 %description -n wxGTK2-unicode
@@ -308,7 +307,6 @@ Summary:    GL canvas library for wxGTK2 with UNICODE support
 Summary(pl):   Biblioteka GL dla wxGTK2 z obs³ug± UNICODE
 Group:         X11/Libraries
 Requires:      wxGTK2-unicode = %{version}-%{release}
-Requires:      OpenGL
 Obsoletes:     wxGTK2-univ-unicode-gl
 
 %description -n wxGTK2-unicode-gl
@@ -323,7 +321,7 @@ Summary(pl):        Pliki programistyczne biblioteki GL dla wxGTK2 z obs
 Group:         X11/Development/Libraries
 Requires:      wxGTK2-unicode-devel = %{version}-%{release}
 Requires:      wxGTK2-unicode-gl = %{version}-%{release}
-Requires:      OpenGL-devel
+Requires:      OpenGL-GLU-devel
 Obsoletes:     wxGTK2-univ-unicode-gl-devel
 
 %description -n wxGTK2-unicode-gl-devel
@@ -351,7 +349,6 @@ Summary:    wxUniversal-based wxX11 library
 Summary(pl):   Oparta na wxUniversal biblioteka wxX11
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-afm = %{version}-%{release}
 Obsoletes:     wxX11-univ
 
 %description -n wxX11
@@ -379,7 +376,6 @@ Summary:    GL canvas library for wxUniversal-based wxX11
 Summary(pl):   Biblioteka GL dla opartej na wxUniversal wxX11
 Group:         X11/Libraries
 Requires:      wxX11 = %{version}-%{release}
-Requires:      OpenGL
 Obsoletes:     wxX11-univ-gl
 
 %description -n wxX11-gl
@@ -394,7 +390,7 @@ Summary(pl):        Pliki programistyczne biblioteki GL dla opartej na wxUniversal wxX1
 Group:         X11/Development/Libraries
 Requires:      wxX11-gl = %{version}-%{release}
 Requires:      wxX11-devel = %{version}-%{release}
-Requires:      OpenGL-devel
+Requires:      OpenGL-GLU-devel
 Obsoletes:     wxX11-univ-gl-devel
 
 %description -n wxX11-gl-devel
@@ -408,7 +404,6 @@ Summary:    wxUniversal-based wxX11 library with UNICODE support
 Summary(pl):   Oparta na wxUniversal biblioteka wxX11 z obs³ug± UNICODE
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-afm = %{version}-%{release}
 Obsoletes:     wxX11-univ-unicode
 
 %description -n wxX11-unicode
@@ -436,7 +431,6 @@ Summary:    GL canvas library for wxUniversal-based wxX11 with UNICODE support
 Summary(pl):   Biblioteka GL dla opartej na wxUniversal wxX11 z obs³ug± UNICODE
 Group:         X11/Libraries
 Requires:      wxX11-unicode = %{version}-%{release}
-Requires:      OpenGL
 Obsoletes:     wxX11-univ-unicode-gl
 
 %description -n wxX11-unicode-gl
@@ -451,7 +445,7 @@ Summary(pl):        Pliki programistyczne biblioteki GL dla wxX11 z obs
 Group:         X11/Development/Libraries
 Requires:      wxX11-unicode-gl = %{version}-%{release}
 Requires:      wxX11-unicode-devel = %{version}-%{release}
-Requires:      OpenGL-devel
+Requires:      OpenGL-GLU-devel
 Obsoletes:     wxX11-univ-unicode-gl-devel
 
 %description -n wxX11-unicode-gl-devel
@@ -463,16 +457,26 @@ Pliki programistyczne biblioteki GL dla opartej na wxUniversal wxX11 z
 obs³ug± UNICODE.
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+#%patch5 -p1
+%patch6 -p1
 
-echo 'AC_DEFUN([AM_PATH_GTK],[$3])' > fake-am_path_gtk.m4
+echo 'AC_DEFUN([AM_PATH_GTK],[:])' > fake-am_path_gtk.m4
 
 %build
+# if bakefiles rebuild is needed:
+#%if "%(rpm -q bakefile --qf '%%{VERSION}')" != "0.1.9"
+#cd build/bakefiles
+#bakefile_gen -f autoconf
+#cd ../..
+#%endif
 cp -f /usr/share/automake/config.sub .
-%{__aclocal} -I .
+%{__aclocal} -I build/aclocal
 %{__autoconf}
 
 CPPFLAGS="%{rpmcflags} -I`pwd`/include -I/usr/X11R6/include"; export CPPFLAGS
@@ -481,13 +485,13 @@ LDFLAGS=" "; export LDFLAGS
 args="%{?with_debug:--enable-debug}%{!?with_debug:--disable-debug} \
        --enable-plugins \
        --enable-std_iostreams \
-       --with-sdl \
+       --without-sdl \
        --with-opengl \
        --enable-calendar \
        --enable-controls \
        --enable-tabdialog"
 
-gui='--with-gtk --enable-gtk2'
+gui='--with-gtk'
 for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
        '--enable-unicode' ; do
        objdir=`echo obj${gui}${unicode}|sed 's/ /_/g'`
@@ -534,7 +538,7 @@ cd locale
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 
-gui='--with-gtk --enable-gtk2'
+gui='--with-gtk'
 for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
        '--enable-unicode' ; do
        objdir=`echo obj${gui}${unicode}|sed 's/ /_/g'`
@@ -645,16 +649,12 @@ rm -rf $RPM_BUILD_ROOT
 %post  -n wxX11-unicode -p /sbin/ldconfig
 %postun -n wxX11-unicode -p /sbin/ldconfig
 
+%define _libf %{?with_debug:d}
+%define _configf %{?with_debug:-debug-2.6}
+
 %files -f wxstd.lang
 %defattr(644,root,root,755)
 %doc docs/{changes,licence,licendoc,preamble,readme,todo}.txt
-%dir %{_datadir}/wx
-%dir %{_datadir}/wx/2.5
-
-%files -n wxWidgets-afm
-%defattr(644,root,root,755)
-%{_datadir}/wx/2.5/afm
-%{_datadir}/wx/2.5/gs_afm
 
 %files devel
 %defattr(644,root,root,755)
@@ -679,70 +679,70 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with ansi}
 %files -n wxBase
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_base-*.so.*.*
-%attr(755,root,root) %{_libdir}/libwx_base_*.so.*.*
-%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdl-*.so
+%attr(755,root,root) %{_libdir}/libwx_base%{_libf}-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_base%{_libf}_*.so.*.*
+#%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdl-*.so
 
 %files -n wxBase-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_base-*.so
-%{_libdir}/libwx_base_*.so
+%{_libdir}/libwx_base%{_libf}-*.so
+%{_libdir}/libwx_base%{_libf}_*.so
 %endif
 
 %files -n wxBase-unicode
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_baseu-*.so.*.*
-%attr(755,root,root) %{_libdir}/libwx_baseu_*.so.*.*
-%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdlu-*.so
+%attr(755,root,root) %{_libdir}/libwx_baseu%{_libf}-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_baseu%{_libf}_*.so.*.*
+#%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdlu-*.so
 
 %files -n wxBase-unicode-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_baseu-*.so
-%{_libdir}/libwx_baseu_*.so
+%{_libdir}/libwx_baseu%{_libf}-*.so
+%{_libdir}/libwx_baseu%{_libf}_*.so
 
 %if %{with ansi}
 %files -n wxGTK2
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2_*.so.*.*
-%exclude %{_libdir}/libwx_gtk2_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_*.so.*.*
+%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.*.*
 
 %files -n wxGTK2-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2_*-*.so
-%exclude %{_libdir}/libwx_gtk2_ogl-*.so
+%{_libdir}/libwx_gtk2%{_libf}_*-*.so
+%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so
 %{_libdir}/wx/config/gtk2-ansi-*
 %{_libdir}/wx/include/gtk2-ansi-*
-%attr(755,root,root) %{_bindir}/wx-gtk2-ansi-config
+%attr(755,root,root) %{_bindir}/wx-gtk2-ansi%{_configf}-config
 
 %files -n wxGTK2-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.*.*
 
 %files -n wxGTK2-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2_ogl-*.so
+%{_libdir}/libwx_gtk2%{_libf}_gl-*.so
 %endif
 
 %files -n wxGTK2-unicode
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2u_*-*.so.*.*
-%exclude %{_libdir}/libwx_gtk2u_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.*.*
+%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.*.*
 
 %files -n wxGTK2-unicode-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2u_*-*.so
-%exclude %{_libdir}/libwx_gtk2u_ogl-*.so
+%{_libdir}/libwx_gtk2u%{_libf}_*-*.so
+%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so
 %{_libdir}/wx/config/gtk2-unicode-*
 %{_libdir}/wx/include/gtk2-unicode-*
-%attr(755,root,root) %{_bindir}/wx-gtk2-unicode-config
+%attr(755,root,root) %{_bindir}/wx-gtk2-unicode%{_configf}-config
 
 %files -n wxGTK2-unicode-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2u_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.*.*
 
 %files -n wxGTK2-unicode-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2u_ogl-*.so
+%{_libdir}/libwx_gtk2u%{_libf}_gl-*.so
 
 %if %{with x11}
 %if %{with ansi}
@@ -751,50 +751,48 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %exclude %{_bindir}/HelpGen
 %exclude %{_bindir}/wx*-config
-#%{_datadir}/wx/makegen
-#%{_datadir}/wx/wxrcedit
 
 %files -n wxX11
 %defattr(644,root,root,755)
 %doc docs/wxX11-readme.txt
-%attr(755,root,root) %{_libdir}/libwx_x11univ_*-*.so.*.*
-%exclude %{_libdir}/libwx_x11univ_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_*-*.so.*.*
+%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.*.*
 
 %files -n wxX11-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univ_*-*.so
-%exclude %{_libdir}/libwx_x11univ_ogl-*.so
+%{_libdir}/libwx_x11univ%{_libf}_*-*.so
+%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so
 %{_libdir}/wx/config/x11univ-ansi-*
 %{_libdir}/wx/include/x11univ-ansi-*
-%attr(755,root,root) %{_bindir}/wx-x11univ-ansi-config
+%attr(755,root,root) %{_bindir}/wx-x11univ-ansi%{_configf}-config
 
 %files -n wxX11-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_x11univ_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.*.*
 
 %files -n wxX11-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univ_ogl-*.so
+%{_libdir}/libwx_x11univ%{_libf}_gl-*.so
 %endif
 
 %files -n wxX11-unicode
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_x11univu_*-*.so.*.*
-%exclude %{_libdir}/libwx_x11univu_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_*-*.so.*.*
+%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.*.*
 
 %files -n wxX11-unicode-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univu_*-*.so
-%exclude %{_libdir}/libwx_x11univu_ogl-*.so
+%{_libdir}/libwx_x11univu%{_libf}_*-*.so
+%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so
 %{_libdir}/wx/config/x11univ-unicode-*
 %{_libdir}/wx/include/x11univ-unicode-*
-%attr(755,root,root) %{_bindir}/wx-x11univ-unicode-config
+%attr(755,root,root) %{_bindir}/wx-x11univ-unicode%{_configf}-config
 
 %files -n wxX11-unicode-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_x11univu_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.*.*
 
 %files -n wxX11-unicode-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univu_ogl-*.so
+%{_libdir}/libwx_x11univu%{_libf}_gl-*.so
 %endif
This page took 0.045052 seconds and 4 git commands to generate.