don't build wxBase separately here, this is probably an artefact of monolithic build...

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

diff --git a/wxGTK.spec b/wxGTK.spec
index 6d06ff66e450fe31f6c2b9b291dfeae3a35b5822..8d0343bec3506e05bd215d5d7f07d8b990d5e3c7 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -157,18 +157,6 @@ else
     export MAKE="make"
 fi
 
     export MAKE="make"
 fi
 

-mkdir obj-shared-no-gui
-cd obj-shared-no-gui
-../configure --prefix=%{_prefix} \
-                             --disable-gui \
-%if %{unicode}
-                              --enable-unicode
-%else
-                              --disable-unicode
-%endif
-$MAKE
-cd ..
-

 mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{_prefix} \
 mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{_prefix} \


@@ -190,19 +178,6 @@ cd contrib/src
 $MAKE
 cd ../../..
 
 $MAKE
 cd ../../..
 

-mkdir obj-static-no-gui
-cd obj-static-no-gui
-../configure --prefix=%{_prefix} \
-                             --disable-gui \
-                             --disable-shared \
-%if %{unicode}
-                              --enable-unicode
-%else
-                              --disable-unicode
-%endif
-$MAKE
-cd ..
-

 mkdir obj-static
 cd obj-static
 ../configure --prefix=%{_prefix} \
 mkdir obj-static
 cd obj-static
 ../configure --prefix=%{_prefix} \


@@ -227,10 +202,8 @@ cd ../../..
 
 %install
 rm -rf $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; make DESTDIR=$RPM_BUILD_ROOT install)
-(cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT install)
+(cd obj-static; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install)
+(cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install)

 
 # --- wxBase headers list begins here ---
 cat <<EOF >wxbase-headers.files
 
 # --- wxBase headers list begins here ---
 cat <<EOF >wxbase-headers.files