test for wxLog interaction with wxYield better

[wxWidgets.git] / wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index 898787cc03e92c1b6e428c0442c18f1a3898f8f0..ad5752bc72f5e0cf8912afd2a469110c10beb040 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,7 +1,6 @@
-# Note that this is NOT a relocatable package

 %define pref /usr
 %define pref /usr

-%define ver 2.1.14
-%define rel 0
+%define ver 2.3.1
+%define rel 1

 
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit
 Name: wxBase
 
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit
 Name: wxBase


@@ -9,10 +8,11 @@ Version: %{ver}
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: Development/Libraries
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: Development/Libraries

-Source: wxBase-%{ver}.tar.gz
-URL: none
+Source: wxBase-%{ver}.tar.bz2
+URL: http://www.wxwindows.org

 Packager: Vadim Zeitlin <vadim@wxwindows.org>
 Packager: Vadim Zeitlin <vadim@wxwindows.org>

-BuildRoot: /tmp/wxBase_rpm
+Prefix: %{pref}
+BuildRoot: /var/tmp/%{name}-root

 
 %description
 wxBase is a collection of C++ classes providing basic data structures (strings,
 
 %description
 wxBase is a collection of C++ classes providing basic data structures (strings,


@@ -32,7 +32,7 @@ Requires: wxBase
 Header files for wxBase. You need them to develop programs using wxBase.
 
 %prep
 Header files for wxBase. You need them to develop programs using wxBase.
 
 %prep

-%setup -n wxBase
+%setup -n wxBase-%{ver}

 ./configure --prefix=%{pref} --disable-gui --disable-std_iostreams
 
 %build
 ./configure --prefix=%{pref} --disable-gui --disable-std_iostreams
 
 %build


@@ -58,14 +58,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr (644, root, root, 755)
 
 %files
 %defattr (644, root, root, 755)

-%doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
-%attr(755, -, -) %{pref}/lib/libwxbase*
+%doc COPYING.LIB LICENCE.txt README.txt SYMBOLS.txt
+%attr(755, -, -) %{pref}/lib/libwx_base*
+
+%files devel -f src/rpmfiles.lst

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

-%{pref}/lib/wx/include/wx/setup.h
-
-%files devel -f src/rpmfiles.lst
+%dir %{pref}/lib/wx/include/wx/base
+%{pref}/lib/wx/include/wx/base/setup.h

 %defattr (644, root, root, 755)
 %defattr (644, root, root, 755)

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

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