Correct 'markup' for GetResourceHandle after recent change in wx/gdiobj.h.

[wxWidgets.git] / wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index c4433d4dbf353fcbad86738b89736c704e8f6ce5..3f8a054ef3f429b8686a4ef987021cd179e9f4d8 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,6 +1,6 @@
 %define pref /usr
 %define pref /usr

-%define ver  2.6.2
-%define ver2 2.6
+%define ver  2.7.0
+%define ver2 2.7

 %define rel  1
 
 # Configurable settings (use --with(out) unicode on rpmbuild command line):
 %define rel  1
 
 # Configurable settings (use --with(out) unicode on rpmbuild command line):


@@ -91,8 +91,13 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %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
 
 
 %find_lang wxstd
 


@@ -132,12 +137,15 @@ rm -f %{_bindir}/%{wxconfiglink}
 
 %files devel
 %defattr (-,root,root)
 
 %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
 %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)
 
 %files static
 %defattr (-,root,root)