undid the last patch: set wxUSE_XXX to 0 in setup.h.in instead of having to do it...

[wxWidgets.git] / wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index 2c2806728ebe959f26d89ab981dbfb2d4f401bf1..71c62327808413c008b0784c16dff0650f86d6c7 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,19 +1,37 @@
 %define pref /usr
-%define ver 2.5.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.bz2
 URL: http://www.wxwindows.org
 Packager: Vadim Zeitlin <vadim@wxwindows.org>
 Prefix: %{pref}
 BuildRoot: /var/tmp/%{name}-root
+Provides: wxBase
 
 %description
 wxBase is a collection of C++ classes providing basic data structures (strings,
@@ -27,7 +45,8 @@ 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 = %{ver}
+Requires: %{name} = %{ver}
+Provides: wxBase-devel
 
 %description devel
 Header files for wxBase. You need them to develop programs using wxBase.
@@ -40,7 +59,7 @@ Group: Development/Libraries
 Static libraries for wxBase. You need them if you want to link statically against wxBase.
 
 %prep
-%setup -n wxBase-%{ver}
+%setup -q -n wxBase-%{ver}
 
 %build
 if [ "$SMP" != "" ]; then
@@ -51,13 +70,23 @@ fi
 
 mkdir obj-shared
 cd obj-shared
-../configure --prefix=%{pref} --disable-gui --disable-std_iostreams
+../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 --disable-std_iostreams
+../configure --prefix=%{pref} --disable-shared --disable-gui \
+%if %{unicode}
+             --enable-unicode
+%else
+             --with-odbc
+%endif
 $MAKE
 cd ..
 
@@ -77,22 +106,6 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 /sbin/ldconfig
 
-%post devel
-# Install wx-config if there isn't any
-if test ! -f %{_bindir}/wx-config ; then
-    ln -sf wxbase-%{ver2}-config %{_bindir}/wx-config
-fi
-
-%preun devel
-# Remove wx-config if it points to this package
-if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
-  SUM1=`md5sum %{_bindir}/wxbase-%{ver2}-config | cut -c 0-32`
-  SUM2=`md5sum %{_bindir}/wx-config | cut -c 0-32`
-  if test "x$SUM1" = "x$SUM2" ; then
-    rm -f %{_bindir}/wx-config
-  fi
-fi
-
 %files -f wxstd.lang
 %defattr (-,root,root)
 %doc COPYING.LIB *.txt
@@ -100,12 +113,13 @@ fi
 
 %files devel
 %defattr (-,root,root)
-%dir %{_includedir}/wx
-%{_includedir}/wx/*
+%dir %{_includedir}/wx-*
+%{_includedir}/wx-*/*
 %{_libdir}/libwx_base*.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
-%{_bindir}/wxbase-%{ver2}-config
+%{_bindir}/wxbase*-%{ver2}-config
+%{_bindir}/wx-config
 %{_datadir}/aclocal/*.m4
 
 %files static