wxUniv compilation fix after last commit

[wxWidgets.git] / wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index 5b38f95a9b180581060b55ae8a20923395344918..efeded2f2eeb013bcbf2c062a431b8426573fc68 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,19 +1,37 @@
 %define pref /usr
 %define pref /usr

-%define ver 2.3.2
-%define ver2 2.3
+%define ver 2.5.1
+%define ver2 2.5

 %define rel 1
 
 %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
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit

-Name: wxBase
+Name:   %{name}

 Version: %{ver}
 Release: %{rel}
 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
 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,
 
 %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
 %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.
 
 %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
 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
 
 %build
 if [ "$SMP" != "" ]; then


@@ -51,13 +70,23 @@ fi
 
 mkdir obj-shared
 cd obj-shared
 
 mkdir obj-shared
 cd obj-shared

-../configure --prefix=%{pref} --enable-soname --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
 $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 ..
 
 $MAKE
 cd ..
 


@@ -105,7 +134,7 @@ fi
 %{_libdir}/libwx_base*.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
 %{_libdir}/libwx_base*.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*

-%{_bindir}/wxbase-%{ver2}-config
+%{_bindir}/wxbase*-%{ver2}-config

 %{_datadir}/aclocal/*.m4
 
 %files static
 %{_datadir}/aclocal/*.m4
 
 %files static