Corrected two typos.

  Back to disable-enable-gtk2 as without-gtk1 has been
    implemented yet.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxGTK_RR.spec b/wxGTK_RR.spec
index 335f67f9e7877c19d5d3f7cca202eae96019bfd9..e865fac9aa5f31059dc1bfbbb6ae14b7515569e8 100644 (file)
--- a/wxGTK_RR.spec
+++ b/wxGTK_RR.spec
@@ -19,7 +19,7 @@
 %if %{unicode}
     %define buildname gtk2u
 %else
 %if %{unicode}
     %define buildname gtk2u
 %else

-    %define buildname gtk2u
+    %define buildname gtk2

 %endif
 %else
     %define gtkver 1.2
 %endif
 %else
     %define gtkver 1.2


@@ -154,7 +154,6 @@ mkdir obj-shared-no-gui
 cd obj-shared-no-gui
 ../configure --prefix=%{_prefix} \
                              --disable-gui \
 cd obj-shared-no-gui
 ../configure --prefix=%{_prefix} \
                              --disable-gui \

-                             --disable-optimise \

 %if %{unicode}
                               --enable-unicode
 %else
 %if %{unicode}
                               --enable-unicode
 %else


@@ -167,11 +166,10 @@ mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}
 cd obj-shared
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}

-                             --with-gtk1 \
+                             --disable-gtk2 \

 %else
 %else

-                             --with-gtk2 \
+                             --enable-gtk2 \

 %endif
 %endif

-                             --disable-optimise \

 %if %{unicode}
                              --enable-unicode \
 %else
 %if %{unicode}
                              --enable-unicode \
 %else


@@ -189,7 +187,6 @@ cd obj-static-no-gui
 ../configure --prefix=%{_prefix} \
                              --disable-gui \
                              --disable-shared \
 ../configure --prefix=%{_prefix} \
                              --disable-gui \
                              --disable-shared \

-                             --disable-optimise \

 %if %{unicode}
                               --enable-unicode
 %else
 %if %{unicode}
                               --enable-unicode
 %else


@@ -202,12 +199,11 @@ mkdir obj-static
 cd obj-static
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}
 cd obj-static
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}

-                             --with-gtk1 \
+                             --disable-gtk2 \

 %else
 %else

-                             --with-gtk2 \
+                             --enable-gtk2 \

 %endif
                              --disable-shared \
 %endif
                              --disable-shared \

-                             --disable-optimise \

 %if %{unicode}
                              --enable-unicode \
 %else
 %if %{unicode}
                              --enable-unicode \
 %else


@@ -224,7 +220,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)
 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 ---
 (cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT install)
 
 # --- wxBase headers list begins here ---