X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0edf099e29bd34ede3d83c1353cc35a0d8e43ca5..15c8d3b6c81fea1a53f536b712aef3d325b5d1f4:/wxGTK_RR.spec

diff --git a/wxGTK_RR.spec b/wxGTK_RR.spec
index 02b78d9b64..2dc9737cba 100644
--- a/wxGTK_RR.spec
+++ b/wxGTK_RR.spec
@@ -1,7 +1,7 @@
-%define pref /opt/gnome
+%define _prefix /opt/gnome
 %define ver  2.6.0
 %define ver2 2.6
-%define rel  0
+%define rel  1
 
 # Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line):
 %define unicode 1
@@ -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
@@ -60,7 +60,7 @@ Group: X11/Libraries
 Source: wxGTK-%{ver}.tar.gz
 URL: http://www.wxwidgets.org
 Packager: Vadim Zeitlin <vadim@wxwindows.org>
-Prefix: %{pref}
+Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: %{wxbasename} = %{ver}
 %if %{portname} == gtk2
@@ -152,9 +152,8 @@ fi
 
 mkdir obj-shared-no-gui
 cd obj-shared-no-gui
-../configure --prefix=%{pref} \
+../configure --prefix=%{_prefix} \
 			      --disable-gui \
-			      --disable-optimise \
 %if %{unicode}
                               --enable-unicode
 %else
@@ -165,17 +164,17 @@ cd ..
 
 mkdir obj-shared
 cd obj-shared
-../configure --prefix=%{pref} \
+../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
@@ -186,10 +185,9 @@ cd ../../..
 
 mkdir obj-static-no-gui
 cd obj-static-no-gui
-../configure --prefix=%{pref} \
+../configure --prefix=%{_prefix} \
 			      --disable-gui \
       			      --disable-shared \
-			      --disable-optimise \
 %if %{unicode}
                               --enable-unicode
 %else
@@ -200,18 +198,18 @@ cd ..
 
 mkdir obj-static
 cd obj-static
-../configure --prefix=%{pref} \
+../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
@@ -222,10 +220,10 @@ cd ../../..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-(cd obj-static-no-gui; make prefix=$RPM_BUILD_ROOT/usr install)
-(cd obj-static; make prefix=$RPM_BUILD_ROOT/usr install)
-(cd obj-shared-no-gui; make prefix=$RPM_BUILD_ROOT/usr install)
-(cd obj-shared; make prefix=$RPM_BUILD_ROOT/usr install)
+(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)
 
 # --- wxBase headers list begins here ---
 cat <<EOF >wxbase-headers.files
@@ -349,6 +347,14 @@ wx/xtixml.h
 wx/db.h
 wx/dbkeyg.h
 wx/dbtable.h
+wx/unix/apptbase.h
+wx/unix/apptrait.h
+wx/unix/execute.h
+wx/unix/gsockunx.h
+wx/unix/mimetype.h
+wx/unix/pipe.h
+wx/unix/stackwalk.h
+wx/unix/stdpaths.h
 EOF
 # --- wxBase headers list ends here ---
 cat <<EOF >wxbase-headers.paths
@@ -472,6 +478,14 @@ cat <<EOF >wxbase-headers.paths
 %{_includedir}/wx-%{ver2}/wx/db.h
 %{_includedir}/wx-%{ver2}/wx/dbkeyg.h
 %{_includedir}/wx-%{ver2}/wx/dbtable.h
+%{_includedir}/wx-%{ver2}/wx/unix/apptbase.h
+%{_includedir}/wx-%{ver2}/wx/unix/apptrait.h
+%{_includedir}/wx-%{ver2}/wx/unix/execute.h
+%{_includedir}/wx-%{ver2}/wx/unix/gsockunx.h
+%{_includedir}/wx-%{ver2}/wx/unix/mimetype.h
+%{_includedir}/wx-%{ver2}/wx/unix/pipe.h
+%{_includedir}/wx-%{ver2}/wx/unix/stackwalk.h
+%{_includedir}/wx-%{ver2}/wx/unix/stdpaths.h
 EOF
 # --- wxBase headers list ends here ---
 
@@ -488,8 +502,8 @@ cp -f -r $RPM_BUILD_ROOT/_save_dir/* $RPM_BUILD_ROOT%{_includedir}
 rm -rf $RPM_BUILD_ROOT/_save_dir
 
 # contrib stuff:
-(cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT/usr install)
-(cd obj-shared/utils/wxrc; make prefix=$RPM_BUILD_ROOT/usr install)
+(cd obj-shared/contrib/src; make DESTDIR=$RPM_BUILD_ROOT install)
+(cd obj-shared/utils/wxrc; make DESTDIR=$RPM_BUILD_ROOT install)
 
 %clean
 rm -rf $RPM_BUILD_ROOT