X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1cd555d2dea0c7b02abf4edecc76d2ca013e5bd1..05e66a7002abbc726d3aa53fc5cb42ebaf8748e8:/wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index 345752d565..576efab57a 100644
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,6 +1,6 @@
 %define pref /usr
-%define ver  2.5.5
-%define ver2 2.5
+%define ver  2.9.5
+%define ver2 2.9
 %define rel  1
 
 # Configurable settings (use --with(out) unicode on rpmbuild command line):
@@ -73,7 +73,7 @@ cd obj-shared
 %if %{unicode}
                               --enable-unicode
 %else
-                              --with-odbc
+                              --disable-unicode \
 %endif
 $MAKE
 cd ..
@@ -84,15 +84,20 @@ cd obj-static
 %if %{unicode}
                               --enable-unicode
 %else
-                              --with-odbc
+                              --disable-unicode \
 %endif
 $MAKE
 cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-(cd obj-static ; make prefix=$RPM_BUILD_ROOT%{pref} install)
-(cd obj-shared ; make prefix=$RPM_BUILD_ROOT%{pref} install)
+make -C locale allmo
+make -C obj-static DESTDIR=$RPM_BUILD_ROOT prefix=%{pref} install
+make -C obj-shared DESTDIR=$RPM_BUILD_ROOT prefix=%{pref} install
+
+# we need to modify the absolute wx-config link to be relative or rpm complains
+# (and our package wouldn't be relocatable)
+ln -sf ../lib/wx/config/%{wxconfig} $RPM_BUILD_ROOT/%{pref}/bin/wx-config
 
 %find_lang wxstd
 
@@ -132,12 +137,15 @@ rm -f %{_bindir}/%{wxconfiglink}
 
 %files devel
 %defattr (-,root,root)
+%{_bindir}/wx-config
 %dir %{_includedir}/wx-%{ver2}
 %{_includedir}/wx-%{ver2}/*
 %{_libdir}/libwx_base*-%{ver2}.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
 %{_datadir}/aclocal/*.m4
+%{_datadir}/bakefile/presets/*
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
 
 %files static
 %defattr (-,root,root)