Compilo fix for wxUSE_INTL=0 and use wxCSConv for broken filenames instead of wxMBCon...

[wxWidgets.git] / wxGTK_RR.spec

diff --git a/wxGTK_RR.spec b/wxGTK_RR.spec
index 20cc84e15288e39df4fb217ed475e0439d89e6ab..e865fac9aa5f31059dc1bfbbb6ae14b7515569e8 100644 (file)
--- a/wxGTK_RR.spec
+++ b/wxGTK_RR.spec
@@ -1,4 +1,4 @@
-%define pref /opt/gnome
+%define _prefix /opt/gnome

 %define ver  2.6.0
 %define ver2 2.6
 %define rel  1
 %define ver  2.6.0
 %define ver2 2.6
 %define rel  1


@@ -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


@@ -60,7 +60,7 @@ Group: X11/Libraries
 Source: wxGTK-%{ver}.tar.gz
 URL: http://www.wxwidgets.org
 Packager: Vadim Zeitlin <vadim@wxwindows.org>
 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
 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
 
 mkdir obj-shared-no-gui
 cd obj-shared-no-gui

-../configure --prefix=%{pref} \
+../configure --prefix=%{_prefix} \

                              --disable-gui \
                              --disable-gui \

-                             --disable-optimise \

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


@@ -165,13 +164,12 @@ cd ..
 
 mkdir obj-shared
 cd obj-shared
 
 mkdir obj-shared
 cd obj-shared

-../configure --prefix=%{pref} \
+../configure --prefix=%{_prefix} \

 %if ! %{gtk2}
 %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


@@ -186,10 +184,9 @@ cd ../../..
 
 mkdir obj-static-no-gui
 cd obj-static-no-gui
 
 mkdir obj-static-no-gui
 cd obj-static-no-gui

-../configure --prefix=%{pref} \
+../configure --prefix=%{_prefix} \

                              --disable-gui \
                              --disable-shared \
                              --disable-gui \
                              --disable-shared \

-                             --disable-optimise \

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


@@ -200,14 +197,13 @@ cd ..
 
 mkdir obj-static
 cd obj-static
 
 mkdir obj-static
 cd obj-static

-../configure --prefix=%{pref} \
+../configure --prefix=%{_prefix} \

 %if ! %{gtk2}
 %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


@@ -222,10 +218,10 @@ cd ../../..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %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
 
 # --- wxBase headers list begins here ---
 cat <<EOF >wxbase-headers.files


@@ -349,6 +345,14 @@ wx/xtixml.h
 wx/db.h
 wx/dbkeyg.h
 wx/dbtable.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
 EOF
 # --- wxBase headers list ends here ---
 cat <<EOF >wxbase-headers.paths


@@ -472,6 +476,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/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 ---
 
 EOF
 # --- wxBase headers list ends here ---
 


@@ -488,8 +500,8 @@ cp -f -r $RPM_BUILD_ROOT/_save_dir/* $RPM_BUILD_ROOT%{_includedir}
 rm -rf $RPM_BUILD_ROOT/_save_dir
 
 # contrib stuff:
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT