X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93f467a3b4d1eda959b44cc01df34b4463383cfe..f36a04a7b6cacf2eb884c8cad981baee9eed0f88:/wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index 66cbd717c0..f467fb5051 100644
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.5.1
+%define ver 2.5.5
 %define ver2 2.5
 %define rel 1
 
@@ -9,9 +9,11 @@
 %{?_without_unicode: %{expand: %%define unicode 0}}
 
 %if %{unicode}
-%define wxconfigname wxbaseu-%{ver2}-config
+%define wxconfigname base-unicode-release-%{ver2}
+%define wxconfiglinkname wxbaseu-%{ver2}-config
 %else
-%define wxconfigname wxbase-%{ver2}-config
+%define wxconfigname base-ansi-release-%{ver2}
+%define wxconfiglinkname wxbase-%{ver2}-config
 %endif
 
 %if %{unicode}
@@ -72,11 +74,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 +85,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 ..
 
@@ -109,20 +109,21 @@ rm -rf $RPM_BUILD_ROOT
 /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
-
+# link wx-config when you install RPM.
+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
-# 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`
+  SUM1=`md5sum %{_libdir}/wx/config/%{wxconfigname} | 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
+                                                                                   
+rm -f %{_bindir}/%{wxconfiglinkname}
 
 %files -f wxstd.lang
 %defattr (-,root,root)
@@ -131,12 +132,11 @@ 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
 %{_datadir}/aclocal/*.m4
 
 %files static