Fix for decoding of utf-16 surrogates. Also remove #include that's not needed

[wxWidgets.git] / wxX11.spec

diff --git a/wxX11.spec b/wxX11.spec
index 7eb8aec63cb6223c822c974d6bf977cd1028b59d..5a1bb1cd06bec0617e34737976d2e10734139570 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.5.2
+%define ver 2.5.5
 %define ver2 2.5
 %define rel 1
 
@@ -142,6 +142,7 @@ cat <<EOF >wxbase-headers-list
 wx/afterstd.h
 wx/app.h
 wx/apptrait.h
+wx/archive.h
 wx/arrimpl.cpp
 wx/arrstr.h
 wx/beforestd.h
@@ -181,6 +182,7 @@ wx/fs_zip.h
 wx/hash.h
 wx/hashmap.h
 wx/hashset.h
+wx/html/forcelnk.h
 wx/iconloc.h
 wx/init.h
 wx/intl.h
@@ -210,7 +212,10 @@ wx/ptr_scpd.h
 wx/regex.h
 wx/scopeguard.h
 wx/snglinst.h
+wx/sstream.h
 wx/stack.h
+wx/stackwalk.h
+wx/stdpaths.h
 wx/stockitem.h
 wx/stopwatch.h
 wx/strconv.h
@@ -225,6 +230,7 @@ wx/timer.h
 wx/tokenzr.h
 wx/txtstrm.h
 wx/types.h
+wx/uri.h
 wx/utils.h
 wx/variant.h
 wx/vector.h
@@ -243,10 +249,13 @@ wx/msw/apptbase.h
 wx/msw/chkconf.h
 wx/msw/crashrpt.h
 wx/msw/dde.h
+wx/msw/debughlp.h
 wx/msw/gccpriv.h
 wx/msw/mimetype.h
+wx/msw/stackwalk.h
 wx/msw/winundef.h
 wx/msw/wrapcctl.h
+wx/msw/wrapcdlg.h
 wx/msw/wrapwin.h
 wx/fs_inet.h
 wx/gsocket.h
@@ -276,7 +285,7 @@ find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >cor
 
 # contrib stuff:
 (cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install)
-(cd obj-shared/contrib/utils/wxrc; make prefix=$RPM_BUILD_ROOT%{pref} install)
+(cd obj-shared/utils/wxrc; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
 # remove wxBase files so that RPM doesn't complain about unpackaged files:
 rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base*
@@ -302,8 +311,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc COPYING.LIB *.txt
-%dir %{_datadir}/wx
-%{_datadir}/wx/*
 %{_libdir}/libwx_%{portname}*_core*.so.*
 %{_libdir}/libwx_%{portname}*_html*.so.*
 %{_libdir}/libwx_%{portname}*_adv*.so.*