- BR: pkgconfig

[packages/wxWidgets.git] / wxWidgets.spec

diff --git a/wxWidgets.spec b/wxWidgets.spec
index 2a40496eba9faf12e83e331df74f3eda6334e179..4ab8f61a182f3a6c1e396e0f117c9a4412690d19 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -2,19 +2,19 @@
 # Conditional build:
 %bcond_without ansi                    # only unicode packages
 %bcond_without odbc                    # without ODBC support
-%bcond_without x11                     # without wxX11 packages
+%bcond_with    x11                     # with wxX11 packages (broken)
 %bcond_with    debug                   # build with \--enable-debug
                                        # (binary incompatible with non-debug)
 
 Summary:       wxWidgets library
 Summary(pl):   Biblioteka wxWidgets
 Name:          wxWidgets
-Version:       2.5.4
+Version:       2.5.5
 Release:       0.1
 License:       wxWidgets Licence (LGPL with exception)
 Group:         X11/Libraries
-Source0:       http://dl.sourceforge.net/wxwindows/wxAll-%{version}.tar.gz
-# Source0-md5: 14b76e3774cdc59dd47655e6fac034ad
+Source0:       http://dl.sourceforge.net/wxwindows/wxAll-%{version}.tar.bz2
+# Source0-md5: 108ab356e7ea5c495e1c1b2a2e803ba6
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-utils.patch
 Patch2:                %{name}-ogl.patch
@@ -28,7 +28,6 @@ BuildRequires:        automake
 BuildRequires: bakefile >= 0.1.7
 BuildRequires: cppunit-devel
 BuildRequires: esound-devel
-BuildRequires: expat-devel
 BuildRequires: flex
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel
@@ -38,7 +37,7 @@ BuildRequires:        libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool
-BuildRequires: pango-devel
+BuildRequires: pkgconfig
 Obsoletes:     wxwin-common
 Obsoletes:     wxGTK
 Obsoletes:     wxGTK-devel
@@ -218,7 +217,7 @@ Summary:    wxGTK2 library
 Summary(pl):   Biblioteka wxGTK2
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-afm = %{version}-%{release}
+#Requires:     %{name}-afm = %{version}-%{release}
 Obsoletes:     wxGTK2-univ
 
 %description -n wxGTK2
@@ -275,7 +274,7 @@ 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}
+#Requires:     %{name}-afm = %{version}-%{release}
 Obsoletes:     wxGTK2-univ-unicode
 
 %description -n wxGTK2-unicode
@@ -348,7 +347,7 @@ Summary:    wxUniversal-based wxX11 library
 Summary(pl):   Oparta na wxUniversal biblioteka wxX11
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-afm = %{version}-%{release}
+#Requires:     %{name}-afm = %{version}-%{release}
 Obsoletes:     wxX11-univ
 
 %description -n wxX11
@@ -405,7 +404,7 @@ 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}
+#Requires:     %{name}-afm = %{version}-%{release}
 Obsoletes:     wxX11-univ-unicode
 
 %description -n wxX11-unicode
@@ -468,9 +467,11 @@ obs
 %patch4 -p1
 
 echo 'AC_DEFUN([AM_PATH_GTK],[:])' > fake-am_path_gtk.m4
+echo 'AC_DEFUN([AC_BAKEFILE_PROG_CC],[:])' > fake-ac_bakefile_prog_cc.m4
+echo 'AC_DEFUN([AC_BAKEFILE_PROG_CXX],[:])' > fake-ac_bakefile_prog_cxx.m4
 
 # bakefile.m4 from 0.1.7
-tail -n +722 aclocal.m4 | head -n 1427 > bakefile.m4
+tail -n +1481 aclocal.m4 | head -n 1396 > bakefile.m4
 
 %build
 # if bakefiles rebuild is needed:
@@ -489,7 +490,7 @@ 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 \
@@ -656,13 +657,13 @@ rm -rf $RPM_BUILD_ROOT
 %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
+#%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 -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)
@@ -689,7 +690,7 @@ rm -rf $RPM_BUILD_ROOT
 %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}/wx/%{version}/sound_sdl-*.so
 
 %files -n wxBase-devel
 %defattr(644,root,root,755)
@@ -701,7 +702,7 @@ rm -rf $RPM_BUILD_ROOT
 %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}/wx/%{version}/sound_sdlu-*.so
 
 %files -n wxBase-unicode-devel
 %defattr(644,root,root,755)