Warning fixes and source cleaning.

[wxWidgets.git] / wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index bd35c83f3aba4fc06a98531c71d863633b9d6d45..00b11e2b7c608415c5c9e73587a45ddd800455cf 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,6 +1,6 @@
 %define pref /usr
-%define ver  2.6.1
-%define ver2 2.6
+%define ver  2.8.0
+%define ver2 2.8
 %define rel  1
 
 # Configurable settings (use --with(out) unicode on rpmbuild command line):
@@ -91,8 +91,13 @@ 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)