Avoid crash when wxGUIAppTraits::GetToolkitInfo is called too

[wxWidgets.git] / wxMGL.spec

diff --git a/wxMGL.spec b/wxMGL.spec
index ac43b5fd7018d1fea019bdab70294561cda6fc10..a1f763aa06c48bbbe84e97d1e30f738f12173b97 100644 (file)
--- a/wxMGL.spec
+++ b/wxMGL.spec
@@ -1,6 +1,6 @@
 %define pref /usr
 %define pref /usr

-%define ver 2.5.1
-%define ver2 2.5
+%define ver 2.6.2
+%define ver2 2.6

 %define rel 1
 
 Summary: The SciTech MGL port of the wxWindows library
 %define rel 1
 
 Summary: The SciTech MGL port of the wxWindows library


@@ -84,35 +84,16 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 /sbin/ldconfig
 
 %postun
 /sbin/ldconfig
 

-%post devel
-# Install wx-config if there isn't any
-if test ! -f %{_bindir}/wx-config ; then
-    ln -sf wxmgl-%{ver2}-config %{_bindir}/wx-config
-fi
-
-%preun devel
-# Remove wx-config if it points to this package
-if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
-  SUM1=`md5sum %{_bindir}/wxmgl-%{ver2}-config | cut -c 0-32`
-  SUM2=`md5sum %{_bindir}/wx-config | cut -c 0-32`
-  if test "x$SUM1" = "x$SUM2" ; then
-    rm -f %{_bindir}/wx-config
-  fi
-fi
-
-

 %files -f wxstd.lang
 %defattr(-,root,root)
 %doc COPYING.LIB *.txt
 %files -f wxstd.lang
 %defattr(-,root,root)
 %doc COPYING.LIB *.txt

-%dir %{_datadir}/wx
-%{_datadir}/wx/*

 %{_libdir}/libwx_mgl*-%{ver2}*.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libwx_mgl*-%{ver2}*.so
 %{_libdir}/libwx_mgl*-%{ver2}*.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libwx_mgl*-%{ver2}*.so

-%dir %{_includedir}/wx
-%{_includedir}/wx/*
+%dir %{_includedir}/wx-*
+%{_includedir}/wx-*/*

 %dir %{_libdir}/wx
 %{_libdir}/wx/*
 %{_bindir}/wxmgl*-config
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
 %{_bindir}/wxmgl*-config