updated the RPMs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxBase.spec b/wxBase.spec
index 2c2806728ebe959f26d89ab981dbfb2d4f401bf1..45cc7e57739699c8272a093ce9e91e200d37513d 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -3,17 +3,35 @@
 %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,25 @@ 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
+             --disable-std_iostreams
 $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
+             --disable-std_iostreams
 $MAKE
 cd ..
 
@@ -105,7 +136,7 @@ fi
 %{_libdir}/libwx_base*.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
-%{_bindir}/wxbase-%{ver2}-config
+%{_bindir}/wxbase*-%{ver2}-config
 %{_datadir}/aclocal/*.m4
 
 %files static

diff --git a/wxGTK.spec b/wxGTK.spec
index 97addbd6f3b7e7e01871331cf3ee3352330a97c9..989f6f2eb98f9da84c339ce238e1e104a5d4f72e 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -3,11 +3,42 @@
 %define ver2 2.5
 %define rel 1
 
-Summary: The GTK+ 1.2 port of the wxWindows library
-Name: wxGTK
+# Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line):
+%define unicode 0
+%{?_with_unicode: %{expand: %%define unicode 1}}
+%{?_without_unicode: %{expand: %%define unicode 0}}
+
+%define gtk2 0
+%{?_with_gtk2: %{expand: %%define gtk2 1}}
+%{?_without_gtk2: %{expand: %%define gtk2 0}}
+
+%if %{gtk2}
+%define gtkver   2
+%define portname gtk2
+%else
+%define gtkver   1.2
+%define portname gtk
+%endif
+
+%if %{unicode}
+%define name        wx-%{portname}-unicode
+%define wxbasename  wx-base-unicode
+%else 
+%define name        wx-%{portname}
+%define wxbasename  wx-base
+%endif
+
+%if %{unicode}
+%define wxconfigname wx%{portname}u-%{ver2}-config
+%else
+%define wxconfigname wx%{portname}-%{ver2}-config
+%endif
+
+Name:    %{name}
+Summary: The GTK+ %{gtkver} port of the wxWindows library
 Version: %{ver}
 Release: %{rel}
-Copyright: wxWindows Licence
+License: wxWindows Licence
 Group: X11/Libraries
 Source: wxGTK-%{ver}.tar.bz2
 URL: http://www.wxwindows.org
@@ -19,42 +50,66 @@ BuildRoot: /var/tmp/%{name}-root
 # the toolkit used) should provide the (virtual) wxwin package, this makes it
 # possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
 Provides: wxwin
+Provides: wxGTK
 
 # in addition, we should provide libwx_gtk as automatic generator only notices
 # libwx_gtk-%{ver}-%{rel}
 Provides: libwx_gtk.so
 Provides: libwx_gtk-%{ver2}.so
 
+Requires: %{wxbasename} = %{ver}
+BuildRequires: %{wxbasename}-devel = %{ver}
+
 %description
 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.
 
 %package devel
-Summary: The GTK+ 1.2 port of the wxWindows library
+Summary: The GTK+ %{gtkver} port of the wxWindows library
 Group: X11/Libraries
-Requires: wxGTK = %{ver}
+Requires: %{name} = %{ver}
+Requires: %{wxbasename}-devel = %{ver}
+Provides: wxGTK-devel
 
 %description devel
-Header files for wxGTK, the GTK+ 1.2 port of the wxWindows library.
+Header files for wxGTK, the GTK+ %{gtkver} port of the wxWindows library.
 
 %package gl
-Summary: The GTK+ 1.2 port of the wxWindows library, OpenGL add-on.
+Summary: The GTK+ %{gtkver} port of the wxWindows library, OpenGL add-on.
 Group: X11/Libraries
-Requires: wxGTK = %{ver}
+Requires: %{name} = %{ver}
 
 %description gl
-OpenGL add-on library for wxGTK, the GTK+ 1.2 port of the wxWindows library.
+OpenGL add-on library for wxGTK, the GTK+ %{gtkver} port of the wxWindows library.
 
 %package static
 Summary: wxGTK static libraries
 Group: Development/Libraries
+Requires: %{wxbasename}-static
 
 %description static
 Static libraries for wxGTK. You need them if you want to link statically against wxGTK.
 
+%package contrib
+Summary: The GTK+ %{gtkver} port of the wxWindows library, contributed libraries.
+Group: X11/Libraries
+Requires: %{name} = %{ver}
+
+%description contrib
+Contributed libraries for wxGTK, the GTK+ %{gtkver} port of the wxWindows library.
+
+%package contrib-devel
+Summary: The GTK+ %{gtkver} port of the wxWindows library
+Group: X11/Libraries
+Requires: %{name}-contrib = %{ver}
+Requires: %{name}-devel = %{ver}
+
+%description contrib-devel
+Header files for contributed libraries for wxGTK, the GTK+ %{gtkver} port of the wxWindows library.
+
 %prep
-%setup -n wxGTK-%{ver}
+%setup -q -n wxGTK-%{ver}
 
 %build
 if [ "$SMP" != "" ]; then
@@ -65,13 +120,33 @@ fi
 
 mkdir obj-shared
 cd obj-shared
-../configure --prefix=%{pref} --with-odbc --with-opengl
+../configure --prefix=%{pref} \
+%if %{unicode}
+             --enable-unicode \
+%else
+             --with-odbc \
+%endif
+%if %{gtk2}
+             --enable-gtk2 \
+%endif
+             --with-opengl
 $MAKE
-cd ..
+cd contrib/src
+$MAKE
+cd ../../..
 
 mkdir obj-static
 cd obj-static
-../configure --prefix=%{pref} --disable-shared --with-odbc --with-opengl
+../configure --prefix=%{pref} --disable-shared \
+%if %{unicode}
+             --enable-unicode \
+%else
+             --with-odbc \
+%endif
+%if %{gtk2}
+             --enable-gtk2 \
+%endif
+             --with-opengl
 $MAKE
 cd ..
 
@@ -80,7 +155,20 @@ rm -rf $RPM_BUILD_ROOT
 (cd obj-static; make prefix=$RPM_BUILD_ROOT%{pref} install)
 (cd obj-shared; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
-%find_lang wxstd
+# Remove headers that are part of wx-base-devel:
+(
+cd $RPM_BUILD_ROOT
+for f in  `rpm -ql %{wxbasename}-devel | sed -e 's,\(.*\),.\1,g'` ; do
+  if test -f $f ; then rm -f $f ; fi
+done
+)
+
+# list of all core headers:
+find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files
+
+# contrib stuff:
+(cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install)
+(cd obj-shared/contrib/utils/wxrc; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,13 +188,13 @@ rm -rf $RPM_BUILD_ROOT
 %post devel
 # Install wx-config if there isn't any
 if test ! -f %{_bindir}/wx-config ; then
-    ln -sf wxgtk-%{ver2}-config %{_bindir}/wx-config
+    ln -sf %{wxconfigname} %{_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}/wxgtk-%{ver2}-config | cut -c 0-32`
+  SUM1=`md5sum %{_bindir}/%{wxconfigname} | 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
@@ -114,27 +202,95 @@ if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
 fi
 
 
-%files -f wxstd.lang
+%files
 %defattr(-,root,root)
 %doc COPYING.LIB *.txt
 %dir %{_datadir}/wx
 %{_datadir}/wx/*
-%{_libdir}/libwx_gtk-%{ver2}*.so.*
+%{_libdir}/libwx_%{portname}*_core*.so.*
+%{_libdir}/libwx_%{portname}*_html*.so.*
+%{_libdir}/libwx_%{portname}*_adv*.so.*
+%if !%{unicode}
+%{_libdir}/libwx_%{portname}*_dbgrid*.so.*
+%endif
 
-%files devel
+%files devel -f core-headers.files
 %defattr(-,root,root)
-%{_libdir}/libwx_gtk-%{ver2}*.so
-%dir %{_includedir}/wx
-%{_includedir}/wx/*
+%{_libdir}/libwx_%{portname}*_core*.so
+%{_libdir}/libwx_%{portname}*_html*.so
+%{_libdir}/libwx_%{portname}*_adv*.so
+%if !%{unicode}
+%{_libdir}/libwx_%{portname}*_dbgrid*.so
+%endif
+%{_libdir}/libwx_%{portname}*_gl*.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
-%{_bindir}/wxgtk-%{ver2}-config
-%{_datadir}/aclocal/*.m4
+%{_bindir}/%{wxconfigname}
 
 %files gl
 %defattr(-,root,root)
-%{_libdir}/libwx_gtk_gl*
+%{_libdir}/libwx_%{portname}*_gl*.so.*
 
 %files static
 %defattr (-,root,root)
-%{_libdir}/lib*.a
+%{_libdir}/libwx_gtk*.a
+
+%files contrib
+%defattr(-,root,root)
+%{_libdir}/libwx_%{portname}*_animate*.so.*
+%{_libdir}/libwx_%{portname}*_deprecated*.so.*
+%{_libdir}/libwx_%{portname}*_fl*.so.*
+%{_libdir}/libwx_%{portname}*_gizmos*.so.*
+%{_libdir}/libwx_%{portname}*_mmedia*.so.*
+%if !%{unicode}
+%{_libdir}/libwx_%{portname}*_ogl*.so.*
+%endif
+%{_libdir}/libwx_%{portname}*_plot*.so.*
+%{_libdir}/libwx_%{portname}*_stc*.so.*
+%{_libdir}/libwx_%{portname}*_svg*.so.*
+%{_libdir}/libwx_%{portname}*_xrc*.so.*
+
+%files contrib-devel
+%defattr(-,root,root)
+%{_bindir}/wxrc
+%dir %{_includedir}/wx/animate
+%{_includedir}/wx/animate/*
+%{_libdir}/libwx_%{portname}*_animate*.so
+
+%dir %{_includedir}/wx/deprecated
+%{_includedir}/wx/deprecated/*
+%{_libdir}/libwx_%{portname}*_deprecated*.so
+
+%dir %{_includedir}/wx/fl
+%{_includedir}/wx/fl/*
+%{_libdir}/libwx_%{portname}*_fl*.so
+
+%dir %{_includedir}/wx/gizmos
+%{_includedir}/wx/gizmos/*
+%{_libdir}/libwx_%{portname}*_gizmos*.so
+
+%dir %{_includedir}/wx/mmedia
+%{_includedir}/wx/mmedia/*
+%{_libdir}/libwx_%{portname}*_mmedia*.so
+
+%if !%{unicode}
+%dir %{_includedir}/wx/ogl
+%{_includedir}/wx/ogl/*
+%{_libdir}/libwx_%{portname}*_ogl*.so
+%endif
+
+%dir %{_includedir}/wx/plot
+%{_includedir}/wx/plot/*
+%{_libdir}/libwx_%{portname}*_plot*.so
+
+%dir %{_includedir}/wx/stc
+%{_includedir}/wx/stc/*
+%{_libdir}/libwx_%{portname}*_stc*.so
+
+%dir %{_includedir}/wx/svg
+%{_includedir}/wx/svg/*
+%{_libdir}/libwx_%{portname}*_svg*.so
+
+%dir %{_includedir}/wx/xrc
+%{_includedir}/wx/xrc/*
+%{_libdir}/libwx_%{portname}*_xrc*.so

diff --git a/wxMotif.spec b/wxMotif.spec
index 2d89438a5ccb597198a7d3a8af2bcbffd8bde49e..17b1ff4dfc863f20132d3334cd94c6df00a63a72 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -7,11 +7,16 @@
 %define ver2 2.5
 %define rel 1
 
+%define portname    motif
+%define name        wx-%{portname}
+%define wxbasename  wx-base
+%define wxconfigname wx%{portname}-%{ver2}-config
+
 Summary: The Motif/Lesstif port of the wxWindows library
-Name: wxMotif
+Name: %{name}
 Version: %{ver}
 Release: %{rel}
-Copyright: wxWindows Licence
+License: wxWindows Licence
 Group: X11/Libraries
 Source: wxMOTIF-%{ver}.tar.bz2
 URL: http://www.wxwindows.org
@@ -23,6 +28,11 @@ BuildRoot: /tmp/wxmotif_root
 # possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
 Provides: wxwin
 
+Provides: wxMotif
+
+Requires:      %{wxbasename} = %{ver}
+BuildRequires: %{wxbasename}-devel = %{ver}
+
 %description
 wxWindows is a free C++ library for cross-platform GUI development.
 With wxWindows, you can create applications for different GUIs (GTK+,
@@ -31,7 +41,8 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
 %package devel
 Summary: The Motif/Lesstif port of the wxWindows library
 Group: X11/Libraries
-Requires: wxMotif = %{ver}
+Requires: %{name} = %{ver}
+Requires: %{wxbasename}-devel = %{ver}
 
 %description devel
 Header files for wxMotif, the Motif/Lesstif port of the wxWindows library.
@@ -39,7 +50,7 @@ Header files for wxMotif, the Motif/Lesstif port of the wxWindows library.
 %package gl
 Summary: The Motif/Lesstif port of the wxWindows library, OpenGL add-on.
 Group: X11/Libraries
-Requires: wxMotif = %{ver}
+Requires: %{name} = %{ver}
 
 %description gl
 OpenGL add-on library for wxMotif, the Motif/Lesstif port of the wxWindows library.
@@ -51,9 +62,8 @@ Group: Development/Libraries
 %description static
 Static libraries for wxMotif. You need them if you want to link statically against wxMotif.
 
-
 %prep
-%setup -n wxMOTIF-%{ver}
+%setup -q -n wxMOTIF-%{ver}
 
 %build
 if [ "$SMP" != "" ]; then
@@ -79,7 +89,17 @@ rm -rf $RPM_BUILD_ROOT
 (cd obj-static; make prefix=$RPM_BUILD_ROOT%{pref} install)
 (cd obj-shared; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
-%find_lang wxstd
+# Remove headers that are part of wx-base-devel:
+(
+cd $RPM_BUILD_ROOT
+for f in  `rpm -ql %{wxbasename}-devel | sed -e 's,\(.*\),.\1,g'` ; do
+  if test -f $f ; then rm -f $f ; fi
+done
+)
+
+# list of all core headers:
+find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,13 +119,13 @@ rm -rf $RPM_BUILD_ROOT
 %post devel
 # Install wx-config if there isn't any
 if test ! -f %{_bindir}/wx-config ; then
-    ln -sf wxmotif-%{ver2}-config %{_bindir}/wx-config
+    ln -sf %{wxconfigname} %{_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}/wxmotif-%{ver2}-config | cut -c 0-32`
+  SUM1=`md5sum %{_bindir}/%{wxconfigname} | 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
@@ -113,27 +133,31 @@ if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
 fi
 
 
-%files -f wxstd.lang
-%defattr (-,root,root)
+%files
+%defattr(-,root,root)
 %doc COPYING.LIB *.txt
 %dir %{_datadir}/wx
 %{_datadir}/wx/*
-%{_libdir}/libwx_motif-%{ver2}*.so.*
+%{_libdir}/libwx_%{portname}*_core*.so.*
+%{_libdir}/libwx_%{portname}*_html*.so.*
+%{_libdir}/libwx_%{portname}*_adv*.so.*
+%{_libdir}/libwx_%{portname}*_dbgrid*.so.*
 
-%files devel
-%defattr (-,root,root)
-%{_libdir}/libwx_motif-%{ver2}*.so
-%dir %{_includedir}/wx
-%{_includedir}/wx/*
+%files devel -f core-headers.files
+%defattr(-,root,root)
+%{_libdir}/libwx_%{portname}*_core*.so
+%{_libdir}/libwx_%{portname}*_html*.so
+%{_libdir}/libwx_%{portname}*_adv*.so
+%{_libdir}/libwx_%{portname}*_dbgrid*.so
+%{_libdir}/libwx_%{portname}*_gl*.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
-%{_bindir}/wxmotif-%{ver2}-config
-%{_datadir}/aclocal/*.m4
+%{_bindir}/%{wxconfigname}
 
 %files gl
 %defattr(-,root,root)
-%{_libdir}/libwx_motif_gl*
+%{_libdir}/libwx_%{portname}*_gl*.so.*
 
 %files static
 %defattr (-,root,root)
-%{_libdir}/lib*.a
+%{_libdir}/libwx_%{portname}*.a

diff --git a/wxX11.spec b/wxX11.spec
index 9b0f49bf0aefe31dbfc27646bb0c3b53d5784f5f..1007ae38f9401d96ed96eddc7af14b89c5439016 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -3,11 +3,31 @@
 %define ver2 2.5
 %define rel 1
 
+# Configurable settings (use --with(out) unicode on rpmbuild cmd line):
+%define unicode 0
+%{?_with_unicode: %{expand: %%define unicode 1}}
+%{?_without_unicode: %{expand: %%define unicode 0}}
+
+%define portname    x11
+%if %{unicode}
+%define name        wx-%{portname}-unicode
+%define wxbasename  wx-base-unicode
+%else 
+%define name        wx-%{portname}
+%define wxbasename  wx-base
+%endif
+
+%if %{unicode}
+%define wxconfigname wx%{portname}univu-%{ver2}-config
+%else
+%define wxconfigname wx%{portname}univ-%{ver2}-config
+%endif
+
 Summary: The X11 port of the wxWindows library
-Name: wxX11
+Name:    %{name}
 Version: %{ver}
 Release: %{rel}
-Copyright: wxWindows Licence
+License: wxWindows Licence
 Group: X11/Libraries
 Source: wxX11-%{ver}.tar.bz2
 URL: http://www.wxwindows.org
@@ -24,6 +44,10 @@ Provides: wxwin
 # libwx_gtk-%{ver}-%{rel}
 Provides: libwx_x11.so
 Provides: libwx_x11-%{ver2}.so
+Provides: wxX11
+
+Requires:      %{wxbasename} = %{ver}
+BuildRequires: %{wxbasename}-devel = %{ver}
 
 %description
 wxWindows is a free C++ library for cross-platform GUI development.
@@ -33,7 +57,8 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
 %package devel
 Summary: The X11 port of the wxWindows library
 Group: X11/Libraries
-Requires: wxX11 = %{ver}
+Requires: %{name} = %{ver}
+Requires: %{wxbasename}-devel = %{ver}
 
 %description devel
 Header files for wxX11, the X11 port of the wxWindows library.
@@ -41,7 +66,7 @@ Header files for wxX11, the X11 port of the wxWindows library.
 %package gl
 Summary: The X11 port of the wxWindows library, OpenGL add-on.
 Group: X11/Libraries
-Requires: wxX11 = %{ver}
+Requires: %{name} = %{ver}
 
 %description gl
 OpenGL add-on library for wxX11, the X11 port of the wxWindows library.
@@ -53,8 +78,25 @@ Group: Development/Libraries
 %description static
 Static libraries for wxX11. You need them if you want to link statically against wxX11.
 
+%package contrib
+Summary: Contrib libraries for wxX11.
+Group: X11/Libraries
+Requires: %{name} = %{ver}
+
+%description contrib
+Contributed libraries for wxX11.
+
+%package contrib-devel
+Summary: Contrib libraries for wxX11.
+Group: X11/Libraries
+Requires: %{name}-contrib = %{ver}
+Requires: %{name}-devel = %{ver}
+
+%description contrib-devel
+Header files for contributed libraries for wxX11.
+
 %prep
-%setup -n wxX11-%{ver}
+%setup -q -n wxX11-%{ver}
 
 %build
 if [ "$SMP" != "" ]; then
@@ -65,13 +107,27 @@ fi
 
 mkdir obj-shared
 cd obj-shared
-../configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl
+../configure --prefix=%{pref} --with-x11 \
+%if %{unicode}
+                              --enable-unicode \
+%else
+                              --with-odbc \
+%endif
+                              --with-opengl
 $MAKE
-cd ..
+cd contrib/src
+$MAKE
+cd ../../..
 
 mkdir obj-static
 cd obj-static
-../configure --prefix=%{pref} --disable-shared --with-odbc --with-opengl
+../configure --prefix=%{pref} --with-x11 --disable-shared \
+%if %{unicode}
+                              --enable-unicode \
+%else
+                              --with-odbc \
+%endif
+                              --with-opengl
 $MAKE
 cd ..
 
@@ -80,7 +136,20 @@ rm -rf $RPM_BUILD_ROOT
 (cd obj-static; make prefix=$RPM_BUILD_ROOT%{pref} install)
 (cd obj-shared; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
-%find_lang wxstd
+# Remove headers that are part of wx-base-devel:
+(
+cd $RPM_BUILD_ROOT
+for f in  `rpm -ql %{wxbasename}-devel | sed -e 's,\(.*\),.\1,g'` ; do
+  if test -f $f ; then rm -f $f ; fi
+done
+)
+
+# list of all core headers:
+find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files
+
+# contrib stuff:
+(cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install)
+(cd obj-shared/contrib/utils/wxrc; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,13 +169,13 @@ rm -rf $RPM_BUILD_ROOT
 %post devel
 # Install wx-config if there isn't any
 if test ! -f %{_bindir}/wx-config ; then
-    ln -sf wxx11-%{ver2}-config %{_bindir}/wx-config
+    ln -sf %{wxconfigname} %{_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}/wxx11-%{ver2}-config | cut -c 0-32`
+  SUM1=`md5sum %{_bindir}/%{wxconfigname} | 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
@@ -114,27 +183,95 @@ if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
 fi
 
 
-%files -f wxstd.lang
+%files
 %defattr(-,root,root)
 %doc COPYING.LIB *.txt
 %dir %{_datadir}/wx
 %{_datadir}/wx/*
-%{_libdir}/libwx_x11-%{ver2}*.so.*
+%{_libdir}/libwx_%{portname}*_core*.so.*
+%{_libdir}/libwx_%{portname}*_html*.so.*
+%{_libdir}/libwx_%{portname}*_adv*.so.*
+%if !%{unicode}
+%{_libdir}/libwx_%{portname}*_dbgrid*.so.*
+%endif
 
-%files devel
+%files devel -f core-headers.files
 %defattr(-,root,root)
-%{_libdir}/libwx_x11-%{ver2}*.so
-%dir %{_includedir}/wx
-%{_includedir}/wx/*
+%{_libdir}/libwx_%{portname}*_core*.so
+%{_libdir}/libwx_%{portname}*_html*.so
+%{_libdir}/libwx_%{portname}*_adv*.so
+%if !%{unicode}
+%{_libdir}/libwx_%{portname}*_dbgrid*.so
+%endif
+%{_libdir}/libwx_%{portname}*_gl*.so
 %dir %{_libdir}/wx
 %{_libdir}/wx/*
-%{_bindir}/wxx11-%{ver2}-config
-%{_datadir}/aclocal/*.m4
+%{_bindir}/%{wxconfigname}
 
 %files gl
 %defattr(-,root,root)
-%{_libdir}/libwx_x11_gl*
+%{_libdir}/libwx_%{portname}*_gl*.so.*
 
 %files static
 %defattr (-,root,root)
-%{_libdir}/lib*.a
+%{_libdir}/libwx_%{portname}*.a
+
+%files contrib
+%defattr(-,root,root)
+%{_libdir}/libwx_%{portname}*_animate*.so.*
+%{_libdir}/libwx_%{portname}*_deprecated*.so.*
+%{_libdir}/libwx_%{portname}*_fl*.so.*
+%{_libdir}/libwx_%{portname}*_gizmos*.so.*
+%{_libdir}/libwx_%{portname}*_mmedia*.so.*
+%if !%{unicode}
+%{_libdir}/libwx_%{portname}*_ogl*.so.*
+%endif
+%{_libdir}/libwx_%{portname}*_plot*.so.*
+%{_libdir}/libwx_%{portname}*_stc*.so.*
+%{_libdir}/libwx_%{portname}*_svg*.so.*
+%{_libdir}/libwx_%{portname}*_xrc*.so.*
+
+%files contrib-devel
+%defattr(-,root,root)
+%{_bindir}/wxrc
+%dir %{_includedir}/wx/animate
+%{_includedir}/wx/animate/*
+%{_libdir}/libwx_%{portname}*_animate*.so
+
+%dir %{_includedir}/wx/deprecated
+%{_includedir}/wx/deprecated/*
+%{_libdir}/libwx_%{portname}*_deprecated*.so
+
+%dir %{_includedir}/wx/fl
+%{_includedir}/wx/fl/*
+%{_libdir}/libwx_%{portname}*_fl*.so
+
+%dir %{_includedir}/wx/gizmos
+%{_includedir}/wx/gizmos/*
+%{_libdir}/libwx_%{portname}*_gizmos*.so
+
+%dir %{_includedir}/wx/mmedia
+%{_includedir}/wx/mmedia/*
+%{_libdir}/libwx_%{portname}*_mmedia*.so
+
+%if !%{unicode}
+%dir %{_includedir}/wx/ogl
+%{_includedir}/wx/ogl/*
+%{_libdir}/libwx_%{portname}*_ogl*.so
+%endif
+
+%dir %{_includedir}/wx/plot
+%{_includedir}/wx/plot/*
+%{_libdir}/libwx_%{portname}*_plot*.so
+
+%dir %{_includedir}/wx/stc
+%{_includedir}/wx/stc/*
+%{_libdir}/libwx_%{portname}*_stc*.so
+
+%dir %{_includedir}/wx/svg
+%{_includedir}/wx/svg/*
+%{_libdir}/libwx_%{portname}*_svg*.so
+
+%dir %{_includedir}/wx/xrc
+%{_includedir}/wx/xrc/*
+%{_libdir}/libwx_%{portname}*_xrc*.so