X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92b3d078ac420dab4149136481c19540aa87aacc..5fae57de3aac82d13204d825e2901cdd45c1adda:/wxGTK_RR.spec

diff --git a/wxGTK_RR.spec b/wxGTK_RR.spec
index 335f67f9e7..2dc9737cba 100644
--- a/wxGTK_RR.spec
+++ b/wxGTK_RR.spec
@@ -19,7 +19,7 @@
 %if %{unicode}
     %define buildname gtk2u
 %else
-    %define buildname gtk2u
+    %define buildname gtk2
 %endif
 %else
     %define gtkver 1.2
@@ -33,7 +33,7 @@
     %define wxconfigstatic	%{portname}-unicode-release-static-%{ver2}
     %define wxconfiglink	wx%{portname}u-%{ver2}-config
 %else
-    %define name		wx-%{portname}
+    %define name		wx-%{portname}-ansi
     %define wxconfig		%{portname}-ansi-release-%{ver2}
     %define wxconfigstatic	%{portname}-ansi-release-static-%{ver2}
     %define wxconfiglink	wx%{portname}-%{ver2}-config
@@ -154,7 +154,6 @@ mkdir obj-shared-no-gui
 cd obj-shared-no-gui
 ../configure --prefix=%{_prefix} \
 			      --disable-gui \
-			      --disable-optimise \
 %if %{unicode}
                               --enable-unicode
 %else
@@ -167,15 +166,15 @@ mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}
-			      --with-gtk1 \
+			      --disable-gtk2 \
 %else
-			      --with-gtk2 \
+			      --enable-gtk2 \
 %endif
-			      --disable-optimise \
 %if %{unicode}
 			      --enable-unicode \
 %else
 			      --disable-unicode \
+			      --with-odbc \
 %endif
 			      --with-opengl
 $MAKE
@@ -189,7 +188,6 @@ cd obj-static-no-gui
 ../configure --prefix=%{_prefix} \
 			      --disable-gui \
       			      --disable-shared \
-			      --disable-optimise \
 %if %{unicode}
                               --enable-unicode
 %else
@@ -202,16 +200,16 @@ mkdir obj-static
 cd obj-static
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}
-			      --with-gtk1 \
+			      --disable-gtk2 \
 %else
-			      --with-gtk2 \
+			      --enable-gtk2 \
 %endif
 			      --disable-shared \
-			      --disable-optimise \
 %if %{unicode}
                 	      --enable-unicode \
 %else
             		      --disable-unicode \
+			      --with-odbc \
 %endif
             		      --with-opengl
 $MAKE
@@ -224,7 +222,7 @@ cd ../../..
 rm -rf $RPM_BUILD_ROOT
 (cd obj-static-no-gui; make DESTDIR=$RPM_BUILD_ROOT install)
 (cd obj-static; make DESTDIR=$RPM_BUILD_ROOT install)
-(cd obj-shared-no-gui; DESTDIR=$RPM_BUILD_ROOT install)
+(cd obj-shared-no-gui; make DESTDIR=$RPM_BUILD_ROOT install)
 (cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT install)
 
 # --- wxBase headers list begins here ---