Don't hide virtual method in stackwalker. Remove tests implemented now in CppUnit...

[wxWidgets.git] / wxGTK.spec

diff --git a/wxGTK.spec b/wxGTK.spec
index 1ed5fe7bd7ee951004744aeca411e857cee30773..7e64dc299560b3815790bdb39f329eeed9c7f984 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.5.4
+%define ver 2.5.5
 %define ver2 2.5
 %define rel 1
 
@@ -23,7 +23,7 @@
 %if %{unicode}
 %define name        wx-%{portname}-unicode
 %define wxbasename  wx-base-unicode
-%else 
+%else
 %define name        wx-%{portname}
 %define wxbasename  wx-base
 %endif
@@ -203,6 +203,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
@@ -275,6 +276,7 @@ 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
@@ -304,13 +306,16 @@ find $RPM_BUILD_ROOT/usr/include/wx-* -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >c
 
 # 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*
 rm -f $RPM_BUILD_ROOT%{_libdir}/libwxregexu-%{ver2}.a
 rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/*
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/*/*
+%if !%{unicode}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libwxodbc-2.5.a
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -332,7 +337,7 @@ rm -rf $RPM_BUILD_ROOT
 ln -sf %{_libdir}/wx/config/%{wxconfigname} %{_bindir}/wx-config
 # link wx-config with explicit name.
 ln -sf %{_libdir}/wx/config/%{wxconfigname} %{_bindir}/%{wxconfiglinkname}
-                                                                                   
+
 %preun devel
 if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
   SUM1=`md5sum %{_libdir}/wx/config/%{wxconfigname} | cut -c 0-32`
@@ -341,14 +346,12 @@ if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
     rm -f %{_bindir}/wx-config
   fi
 fi
-                                                                                   
+
 rm -f %{_bindir}/%{wxconfiglinkname}
 
 %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.*