Warning fix and source cleaning.

[wxWidgets.git] / wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index c27ad5bcc659fdc6e5cb7f122bf96d6740bc8c26..71c62327808413c008b0784c16dff0650f86d6c7 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,18 +1,37 @@
-# Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.13
-%define rel 0
+%define ver 2.5.3
+%define ver2 2.5
+%define rel 1
+
+# Configurable settings (use --with(out) unicode on rpmbuild command line):
+%define unicode 0
+%{?_with_unicode: %{expand: %%define unicode 1}}
+%{?_without_unicode: %{expand: %%define unicode 0}}
+
+%if %{unicode}
+%define wxconfigname wxbaseu-%{ver2}-config
+%else
+%define wxconfigname wxbase-%{ver2}-config
+%endif
+
+%if %{unicode}
+%define name wx-base-unicode
+%else 
+%define name wx-base
+%endif
 
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit
-Name: wxBase
+Name:   %{name}
 Version: %{ver}
 Release: %{rel}
-Copyright: wxWindows Licence
+License: 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>
-BuildRoot: /tmp/wxBase_rpm
+Prefix: %{pref}
+BuildRoot: /var/tmp/%{name}-root
+Provides: wxBase
 
 %description
 wxBase is a collection of C++ classes providing basic data structures (strings,
@@ -26,14 +45,21 @@ the following platforms: Win32, generic Unix (Linux, FreeBSD, Solaris, HP-UX,
 %package devel
 Summary: wxBase headers needed for developping with wxBase
 Group: Development/Libraries
-Requires: wxBase
+Requires: %{name} = %{ver}
+Provides: wxBase-devel
 
 %description devel
 Header files for wxBase. You need them to develop programs using wxBase.
 
+%package static
+Summary: wxBase static libraries
+Group: Development/Libraries
+
+%description static
+Static libraries for wxBase. You need them if you want to link statically against wxBase.
+
 %prep
-%setup -n wxBase
-./configure --prefix=%{pref} --disable-gui
+%setup -q -n wxBase-%{ver}
 
 %build
 if [ "$SMP" != "" ]; then
@@ -41,11 +67,35 @@ if [ "$SMP" != "" ]; then
 else
   export MAKE="make"
 fi
+
+mkdir obj-shared
+cd obj-shared
+../configure --prefix=%{pref} --disable-gui \
+%if %{unicode}
+             --enable-unicode
+%else
+             --with-odbc
+%endif
 $MAKE
+cd ..
+
+mkdir obj-static
+cd obj-static
+../configure --prefix=%{pref} --disable-shared --disable-gui \
+%if %{unicode}
+             --enable-unicode
+%else
+             --with-odbc
+%endif
+$MAKE
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{pref} install
+(cd obj-static ; make prefix=$RPM_BUILD_ROOT%{pref} install)
+(cd obj-shared ; make prefix=$RPM_BUILD_ROOT%{pref} install)
+
+%find_lang wxstd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,16 +106,22 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 /sbin/ldconfig
 
-%files
-%defattr (644, root, root, 755)
-%doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
-%attr(755, -, -) %{pref}/lib/libwxbase*
-%dir %{pref}/lib/wx
-%dir %{pref}/lib/wx/include
-%dir %{pref}/lib/wx/include/wx
-%{pref}/lib/wx/include/wx/setup.h
+%files -f wxstd.lang
+%defattr (-,root,root)
+%doc COPYING.LIB *.txt
+%{_libdir}/libwx_base*so.*
 
-%files devel -f src/rpmfiles.lst
-%defattr (644, root, root, 755)
-%attr(755, -, -) %{pref}/bin/wx-config
+%files devel
+%defattr (-,root,root)
+%dir %{_includedir}/wx-*
+%{_includedir}/wx-*/*
+%{_libdir}/libwx_base*.so
+%dir %{_libdir}/wx
+%{_libdir}/wx/*
+%{_bindir}/wxbase*-%{ver2}-config
+%{_bindir}/wx-config
+%{_datadir}/aclocal/*.m4
 
+%files static
+%defattr (-,root,root)
+%{_libdir}/lib*.a