- up to 2.8.8

[packages/wxWidgets.git] / wxWidgets.spec

diff --git a/wxWidgets.spec b/wxWidgets.spec
index 054adbe01a33f9dfe11115201465afd58fba69ce..2881cace023a73a9d86eeddc18c91213a039fb13 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -7,27 +7,20 @@
 %bcond_with    debug                   # build with \--enable-debug
                                        # (binary incompatible with non-debug)
 #
-# Unpackaged files:
-#  /usr/bin/wxrc-2.8
-#  /usr/share/locale/it/LC_MESSAGES/wxmsw.mo
-#
-
 Summary:       wxWidgets library
 Summary(pl.UTF-8):     Biblioteka wxWidgets
 Name:          wxWidgets
-Version:       2.8.1
-Release:       2
-License:       wxWidgets Licence (LGPL with exception)
+Version:       2.8.8
+Release:       1
+License:       wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:         X11/Libraries
 Source0:       http://ftp.wxwidgets.org/pub/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: fe01afe1c055bc82875682e5905c7378
+# Source0-md5: 647b94f636db8f3e6ba7170d0d691eb6
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-ogl.patch
 Patch2:                %{name}-ac.patch
-Patch3:                %{name}-gif0delay.patch
-Patch4:                %{name}-x11unicode.patch
-Patch5:                %{name}-gcc4.patch
-Patch6:                %{name}-pickerbase.patch
+Patch3:                %{name}-x11unicode.patch
+Patch4:                %{name}-gcc4.patch
 URL:           http://www.wxWidgets.org/
 BuildRequires: OpenGL-GLU-devel
 #BuildRequires:        SDL-devel
@@ -352,10 +345,10 @@ Requires: wxX11 = %{version}-%{release}
 Obsoletes:     wxWindows-utils
 
 %description utils
-Misc utils from wxWidgets project: helpviewer, makegen, etc.
+Misc utils from wxWidgets project: wxemulator, wxrc, etc.
 
 %description utils -l pl.UTF-8
-Różne narzędzia z projektu wxWidgets: helpviewer, makegen itp.
+Różne narzędzia z projektu wxWidgets: wxemulator, wxrc itp.
 
 %package -n wxX11
 Summary:       wxUniversal-based wxX11 library
@@ -477,8 +470,6 @@ obsługą UNICODE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 # if bakefiles rebuild is needed:
@@ -563,7 +554,8 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                datadir=$RPM_BUILD_ROOT%{_datadir} \
                libdir=$RPM_BUILD_ROOT%{_libdir} \
                mandir=$RPM_BUILD_ROOT%{_mandir} \
-               includedir=$RPM_BUILD_ROOT%{_includedir}
+               includedir=$RPM_BUILD_ROOT%{_includedir} \
+               LOCALE_MSW_LINGUAS=
 
        %{__make} -C contrib/src install \
                prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -589,23 +581,15 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                datadir=$RPM_BUILD_ROOT%{_datadir} \
                libdir=$RPM_BUILD_ROOT%{_libdir} \
                mandir=$RPM_BUILD_ROOT%{_mandir} \
-               includedir=$RPM_BUILD_ROOT%{_includedir}
+               includedir=$RPM_BUILD_ROOT%{_includedir} \
+               LOCALE_MSW_LINGUAS=
        if echo $objdir| grep -q disable-unicode ; then
-#              install utils/dialoged/src/DialogEd $RPM_BUILD_ROOT%{_bindir}
                # TODO: install default config files and default backgrouds
                install utils/HelpGen/src/HelpGen $RPM_BUILD_ROOT%{_bindir}
                install utils/emulator/src/wxemulator $RPM_BUILD_ROOT%{_bindir}
                install utils/tex2rtf/src/tex2rtf $RPM_BUILD_ROOT%{_bindir}
                install utils/hhp2cached/hhp2cached $RPM_BUILD_ROOT%{_bindir}
-#              install utils/makegen/makegen $RPM_BUILD_ROOT%{_bindir}
                install utils/wxrc/wxrc $RPM_BUILD_ROOT%{_bindir}
-#              install -d $RPM_BUILD_ROOT%{_datadir}/wx/makegen/templates
-#              install -m644 utils/makegen/templates/* \
-#                      $RPM_BUILD_ROOT%{_datadir}/wx/makegen/templates
-#              install contrib/utils/wxrcedit/wxrcedit $RPM_BUILD_ROOT%{_bindir}
-#              install -d $RPM_BUILD_ROOT%{_datadir}/wx/wxrcedit
-#              install contrib/utils/wxrcedit/df/* \
-#                      $RPM_BUILD_ROOT%{_datadir}/wx/wxrcedit/
        fi
 
        %{__make} -C contrib/src install \
@@ -675,11 +659,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/wx
 %dir %{_libdir}/wx/include
 %dir %{_libdir}/wx/config
-%{_aclocaldir}/*.m4
+%{_aclocaldir}/wxwin.m4
 
 %files -n bakefile-wxWidgets
 %defattr(644,root,root,755)
-%{_datadir}/bakefile/presets/*.bkl
+%{_datadir}/bakefile/presets/wx*.bkl
 
 %files examples
 %defattr(644,root,root,755)
@@ -731,7 +715,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_*-*.so
 %exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so
-%{_libdir}/wx/config/gtk2-ansi-*
+%attr(755,root,root) %{_libdir}/wx/config/gtk2-ansi-*
 %{_libdir}/wx/include/gtk2-ansi-*
 %attr(755,root,root) %{_bindir}/wx-gtk2-ansi%{_configf}-config
 
@@ -756,7 +740,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_*-*.so
 %exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so
-%{_libdir}/wx/config/gtk2-unicode-*
+%attr(755,root,root) %{_libdir}/wx/config/gtk2-unicode-*
 %{_libdir}/wx/include/gtk2-unicode-*
 %attr(755,root,root) %{_bindir}/wx-gtk2-unicode%{_configf}-config
 
@@ -773,9 +757,11 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with ansi}
 %files utils
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%exclude %{_bindir}/HelpGen
-%exclude %{_bindir}/wx*-config
+%attr(755,root,root) %{_bindir}/hhp2cached
+%attr(755,root,root) %{_bindir}/tex2rtf
+%attr(755,root,root) %{_bindir}/wxemulator
+%attr(755,root,root) %{_bindir}/wxrc
+%attr(755,root,root) %{_bindir}/wxrc-*
 
 %files -n wxX11
 %defattr(644,root,root,755)
@@ -789,7 +775,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_*-*.so
 %exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so
-%{_libdir}/wx/config/x11univ-ansi-*
+%attr(755,root,root) %{_libdir}/wx/config/x11univ-ansi-*
 %{_libdir}/wx/include/x11univ-ansi-*
 %attr(755,root,root) %{_bindir}/wx-x11univ-ansi%{_configf}-config
 
@@ -814,7 +800,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_*-*.so
 %exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so
-%{_libdir}/wx/config/x11univ-unicode-*
+%attr(755,root,root) %{_libdir}/wx/config/x11univ-unicode-*
 %{_libdir}/wx/include/x11univ-unicode-*
 %attr(755,root,root) %{_bindir}/wx-x11univ-unicode%{_configf}-config