compilation fix for anything different from VC++

[wxWidgets.git] / wxGTK.spec

diff --git a/wxGTK.spec b/wxGTK.spec
index 19682dac185a66266ca78c7ea3c424f0d4860cd2..7267e19966b1d024fe900974c34650be8debfd1f 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
 # Note that this is NOT a relocatable package
 %define pref /usr

-%define ver 2.1.10
+%define ver 2.1.14

 %define rel 0
 
 Summary: The GTK+ 1.2 port of the wxWindows library
 %define rel 0
 
 Summary: The GTK+ 1.2 port of the wxWindows library


@@ -9,7 +9,7 @@ Version: %{ver}
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: X11/Libraries
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: X11/Libraries

-Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.10.tgz
+Source: wxGTK-%{ver}.tgz

 URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 BuildRoot: /tmp/wxgtk_root
 URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 BuildRoot: /tmp/wxgtk_root


@@ -30,14 +30,27 @@ Group: X11/Libraries
 Requires: wxGTK
 
 %description devel
 Requires: wxGTK
 
 %description devel

-Header files for the wxGTK, the GTK+ 1.2 port of the wxWindows library.
+Header files for wxGTK, the GTK+ 1.2 port of the wxWindows library.
+
+%package gl
+Summary: The GTK+ 1.2 port of the wxWindows library, OpenGl add-on.
+Group: X11/Libraries
+Requires: wxGTK
+
+%description gl
+OpenGl add-on library for wxGTK, the GTK+ 1.2 port of the wxWindows library.

 
 %prep
 %setup -n wxGTK
 
 %prep
 %setup -n wxGTK

-./configure --prefix=%{pref} --enable-threads --disable-std_iostreams --disable-newgrid
+./configure --prefix=%{pref} --enable-burnt_name --with-odbc --with-opengl

 
 %build
 
 %build

-make
+if [ "$SMP" != "" ]; then
+  export MAKE="make -j$SMP"
+else
+  export MAKE="make"
+fi
+$MAKE

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -65,5 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*

+%attr(755, -, -) %{pref}/bin/wxgtk-config

 %attr(755, -, -) %{pref}/bin/wx-config
 
 %attr(755, -, -) %{pref}/bin/wx-config
 

+%files gl
+%attr(755, -, -) %{pref}/lib/libwx_gtk_gl*