replaced wxControl with wxWindow in 2 methods

[wxWidgets.git] / wxX11.spec

diff --git a/wxX11.spec b/wxX11.spec
index d987a06e68218107deac27c4dde868a7d724bca9..22efc08f0f281093cb4006d96e58315191ad8d7a 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,13 +1,33 @@
 %define pref /usr
 %define pref /usr

-%define ver 2.3.4
-%define ver2 2.3
+%define ver 2.5.2
+%define ver2 2.5

 %define rel 1
 
 %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
 Summary: The X11 port of the wxWindows library

-Name: wxX11
+Name:    %{name}

 Version: %{ver}
 Release: %{rel}
 Version: %{ver}
 Release: %{rel}

-Copyright: wxWindows Licence
+License: wxWindows Licence

 Group: X11/Libraries
 Source: wxX11-%{ver}.tar.bz2
 URL: http://www.wxwindows.org
 Group: X11/Libraries
 Source: wxX11-%{ver}.tar.bz2
 URL: http://www.wxwindows.org


@@ -24,6 +44,9 @@ Provides: wxwin
 # libwx_gtk-%{ver}-%{rel}
 Provides: libwx_x11.so
 Provides: libwx_x11-%{ver2}.so
 # libwx_gtk-%{ver}-%{rel}
 Provides: libwx_x11.so
 Provides: libwx_x11-%{ver2}.so

+Provides: wxX11
+
+Requires:      %{wxbasename} = %{ver}

 
 %description
 wxWindows is a free C++ library for cross-platform GUI development.
 
 %description
 wxWindows is a free C++ library for cross-platform GUI development.


@@ -33,7 +56,8 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
 %package devel
 Summary: The X11 port of the wxWindows library
 Group: X11/Libraries
 %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.
 
 %description devel
 Header files for wxX11, the X11 port of the wxWindows library.


@@ -41,7 +65,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
 %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.
 
 %description gl
 OpenGL add-on library for wxX11, the X11 port of the wxWindows library.


@@ -53,8 +77,25 @@ Group: Development/Libraries
 %description static
 Static libraries for wxX11. You need them if you want to link statically against wxX11.
 
 %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
 %prep

-%setup -n wxX11-%{ver}
+%setup -q -n wxX11-%{ver}

 
 %build
 if [ "$SMP" != "" ]; then
 
 %build
 if [ "$SMP" != "" ]; then


@@ -65,13 +106,27 @@ fi
 
 mkdir obj-shared
 cd obj-shared
 
 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
 $MAKE

-cd ..
+cd contrib/src
+$MAKE
+cd ../../..

 
 mkdir obj-static
 cd obj-static
 
 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 ..
 
 $MAKE
 cd ..
 


@@ -80,7 +135,152 @@ 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)
 
 (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:
+
+# --- wxBase headers list begins here ---
+cat <<EOF >wxbase-headers-list
+wx/afterstd.h
+wx/app.h
+wx/apptrait.h
+wx/arrimpl.cpp
+wx/arrstr.h
+wx/beforestd.h
+wx/buffer.h
+wx/build.h
+wx/chkconf.h
+wx/clntdata.h
+wx/cmdline.h
+wx/confbase.h
+wx/config.h
+wx/containr.h
+wx/datetime.h
+wx/datetime.inl
+wx/datstrm.h
+wx/dde.h
+wx/debug.h
+wx/defs.h
+wx/dir.h
+wx/dlimpexp.h
+wx/dynarray.h
+wx/dynlib.h
+wx/dynload.h
+wx/encconv.h
+wx/event.h
+wx/except.h
+wx/features.h
+wx/ffile.h
+wx/file.h
+wx/fileconf.h
+wx/filefn.h
+wx/filename.h
+wx/filesys.h
+wx/fontenc.h
+wx/fontmap.h
+wx/fs_mem.h
+wx/fs_zip.h
+wx/hash.h
+wx/hashmap.h
+wx/hashset.h
+wx/iconloc.h
+wx/init.h
+wx/intl.h
+wx/iosfwrap.h
+wx/ioswrap.h
+wx/ipc.h
+wx/ipcbase.h
+wx/isql.h
+wx/isqlext.h
+wx/list.h
+wx/listimpl.cpp
+wx/log.h
+wx/longlong.h
+wx/math.h
+wx/memconf.h
+wx/memory.h
+wx/memtext.h
+wx/mimetype.h
+wx/module.h
+wx/msgout.h
+wx/msgout.h
+wx/mstream.h
+wx/object.h
+wx/platform.h
+wx/process.h
+wx/ptr_scpd.h
+wx/regex.h
+wx/scopeguard.h
+wx/snglinst.h
+wx/stack.h
+wx/stopwatch.h
+wx/strconv.h
+wx/stream.h
+wx/string.h
+wx/sysopt.h
+wx/textbuf.h
+wx/textfile.h
+wx/thread.h
+wx/thrimpl.cpp
+wx/timer.h
+wx/tokenzr.h
+wx/txtstrm.h
+wx/types.h
+wx/utils.h
+wx/variant.h
+wx/vector.h
+wx/version.h
+wx/volume.h
+wx/wfstream.h
+wx/wx.h
+wx/wxchar.h
+wx/wxprec.h
+wx/xti.h
+wx/xtistrm.h
+wx/zipstrm.h
+wx/zstream.h
+wx/msw/apptrait.h
+wx/msw/apptbase.h
+wx/msw/chkconf.h
+wx/msw/crashrpt.h
+wx/msw/dde.h
+wx/msw/gccpriv.h
+wx/msw/mimetype.h
+wx/msw/winundef.h
+wx/msw/wrapcctl.h
+wx/msw/wrapwin.h
+wx/fs_inet.h
+wx/gsocket.h
+wx/protocol/file.h
+wx/protocol/ftp.h
+wx/protocol/http.h
+wx/protocol/protocol.h
+wx/sckaddr.h
+wx/sckipc.h
+wx/sckstrm.h
+wx/socket.h
+wx/url.h
+wx/msw/gsockmsw.h
+wx/xml/xml.h
+wx/xtixml.h
+wx/db.h
+wx/dbkeyg.h
+wx/dbtable.h
+EOF
+# --- wxBase headers list ends here ---
+for f in `cat wxbase-headers-list` ; do
+  rm -f $RPM_BUILD_ROOT%{_includedir}/wx-*/$f
+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)
+
+# remove wxBase files so that RPM doesn't complain about unpackaged files:
+rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base*
+rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/*
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/*/*

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -97,44 +297,92 @@ rm -rf $RPM_BUILD_ROOT
 %postun gl
 /sbin/ldconfig
 
 %postun gl
 /sbin/ldconfig
 

-%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
-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`
-  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
+%files

 %defattr(-,root,root)
 %doc COPYING.LIB *.txt
 %dir %{_datadir}/wx
 %{_datadir}/wx/*
 %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)
 %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/*
 %dir %{_libdir}/wx
 %{_libdir}/wx/*

-%{_bindir}/wxx11-%{ver2}-config
-%{_datadir}/aclocal/*.m4
+%{_bindir}/%{wxconfigname}

 
 %files gl
 %defattr(-,root,root)
 
 %files gl
 %defattr(-,root,root)

-%{_libdir}/libwx_x11_gl*
+%{_libdir}/libwx_%{portname}*_gl*.so.*

 
 %files static
 %defattr (-,root,root)
 
 %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.*
+%{_libdir}/libwx_%{portname}*_ogl*.so.*
+%{_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-*/wx/animate
+%{_includedir}/wx-*/wx/animate/*
+%{_libdir}/libwx_%{portname}*_animate*.so
+
+%dir %{_includedir}/wx-*/wx/deprecated
+%{_includedir}/wx-*/wx/deprecated/*
+%{_libdir}/libwx_%{portname}*_deprecated*.so
+
+%dir %{_includedir}/wx-*/wx/fl
+%{_includedir}/wx-*/wx/fl/*
+%{_libdir}/libwx_%{portname}*_fl*.so
+
+%dir %{_includedir}/wx-*/wx/gizmos
+%{_includedir}/wx-*/wx/gizmos/*
+%{_libdir}/libwx_%{portname}*_gizmos*.so
+
+%dir %{_includedir}/wx-*/wx/mmedia
+%{_includedir}/wx-*/wx/mmedia/*
+%{_libdir}/libwx_%{portname}*_mmedia*.so
+
+%dir %{_includedir}/wx-*/wx/ogl
+%{_includedir}/wx-*/wx/ogl/*
+%{_libdir}/libwx_%{portname}*_ogl*.so
+
+%dir %{_includedir}/wx-*/wx/plot
+%{_includedir}/wx-*/wx/plot/*
+%{_libdir}/libwx_%{portname}*_plot*.so
+
+%dir %{_includedir}/wx-*/wx/stc
+%{_includedir}/wx-*/wx/stc/*
+%{_libdir}/libwx_%{portname}*_stc*.so
+
+%dir %{_includedir}/wx-*/wx/svg
+%{_includedir}/wx-*/wx/svg/*
+%{_libdir}/libwx_%{portname}*_svg*.so
+
+%dir %{_includedir}/wx-*/wx/xrc
+%{_includedir}/wx-*/wx/xrc/*
+%{_libdir}/libwx_%{portname}*_xrc*.so