X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4eba184013d916b1a6412aa0a0fed036120bace3..3dd4386160b8f6d28ecc4ad2ca308c437721a41f:/wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index 45cc7e5773..71c6232780 100644
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.5.0
+%define ver 2.5.3
 %define ver2 2.5
 %define rel 1
 
@@ -72,11 +72,10 @@ mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{pref} --disable-gui \
 %if %{unicode}
-             --enable-unicode \
+             --enable-unicode
 %else
-             --with-odbc \
+             --with-odbc
 %endif
-             --disable-std_iostreams
 $MAKE
 cd ..
 
@@ -84,11 +83,10 @@ mkdir obj-static
 cd obj-static
 ../configure --prefix=%{pref} --disable-shared --disable-gui \
 %if %{unicode}
-             --enable-unicode \
+             --enable-unicode
 %else
-             --with-odbc \
+             --with-odbc
 %endif
-             --disable-std_iostreams
 $MAKE
 cd ..
 
@@ -108,22 +106,6 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 /sbin/ldconfig
 
-%post devel
-# Install wx-config if there isn't any
-if test ! -f %{_bindir}/wx-config ; then
-    ln -sf wxbase-%{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}/wxbase-%{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
@@ -131,12 +113,13 @@ fi
 
 %files devel
 %defattr (-,root,root)
-%dir %{_includedir}/wx
-%{_includedir}/wx/*
+%dir %{_includedir}/wx-*
+%{_includedir}/wx-*/*
 %{_libdir}/libwx_base*.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
 %{_bindir}/wxbase*-%{ver2}-config
+%{_bindir}/wx-config
 %{_datadir}/aclocal/*.m4
 
 %files static