Fix mismatches between format strings and arguments.

[wxWidgets.git] / wxBase.spec

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

-%define ver  2.7.0
-%define ver2 2.7
+%define ver  2.9.2
+%define ver2 2.9

 %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):


@@ -73,7 +73,7 @@ cd obj-shared
 %if %{unicode}
                               --enable-unicode
 %else
 %if %{unicode}
                               --enable-unicode
 %else

-                              --with-odbc
+                              --disable-unicode \

 %endif
 $MAKE
 cd ..
 %endif
 $MAKE
 cd ..


@@ -84,7 +84,7 @@ cd obj-static
 %if %{unicode}
                               --enable-unicode
 %else
 %if %{unicode}
                               --enable-unicode
 %else

-                              --with-odbc
+                              --disable-unicode \

 %endif
 $MAKE
 cd ..
 %endif
 $MAKE
 cd ..


@@ -95,6 +95,10 @@ 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
 
 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
 
 %clean
 %find_lang wxstd
 
 %clean