patches from Ricky Gonzales <gonzales@pyramid3.net>:

[wxWidgets.git] / wxGTK.spec

diff --git a/wxGTK.spec b/wxGTK.spec
index cdf096bff91490c2bc83a1000805fde05f2fe5a6..7267e19966b1d024fe900974c34650be8debfd1f 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,7 +1,7 @@
 # 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.0
-%define rel 4
+%define ver 2.1.14
+%define rel 0

 
 Summary: The GTK+ 1.2 port of the wxWindows library
 Name: wxGTK
 
 Summary: The GTK+ 1.2 port of the wxWindows library
 Name: wxGTK


@@ -9,10 +9,9 @@ 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.0-b4.tgz
+Source: wxGTK-%{ver}.tgz

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

-Requires: gtk+ >= 1.2.1

 BuildRoot: /tmp/wxgtk_root
 
 # all packages providing an implementation of wxWindows library (regardless of
 BuildRoot: /tmp/wxgtk_root
 
 # all packages providing an implementation of wxWindows library (regardless of


@@ -25,12 +24,33 @@ wxWindows is a free C++ library for cross-platform GUI development.
 With wxWindows, you can create applications for different GUIs (GTK+,
 Motif/LessTif, MS Windows, Mac) from the same source code.
 
 With wxWindows, you can create applications for different GUIs (GTK+,
 Motif/LessTif, MS Windows, Mac) from the same source code.
 

+%package devel
+Summary: The GTK+ 1.2 port of the wxWindows library
+Group: X11/Libraries
+Requires: wxGTK
+
+%description devel
+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} --with-threads
+./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


@@ -48,12 +68,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr (644, root, root, 755)
 %doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
 %files
 %defattr (644, root, root, 755)
 %doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt

+%dir %{pref}/share/wx
+%{pref}/share/wx/*
+%attr(755, -, -) %{pref}/lib/libwx_gtk*
+
+%files devel
+%defattr (644, root, root, 755)

 %dir %{pref}/include/wx
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*
 %dir %{pref}/include/wx
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*

-%attr(755, -, -) %{pref}/lib/libwx_gtk2.so
-%attr(755, -, -) %{pref}/lib/libwx_gtk2.so.1
-%attr(755, -, -) %{pref}/lib/libwx_gtk2.so.1.0
+%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*