EOVERFLOW is not available on classic Mac OS.

[wxWidgets.git] / wxX11.spec

diff --git a/wxX11.spec b/wxX11.spec
index 405df51ea35fb53caa41d00766e7feb4e48fb66d..5a1bb1cd06bec0617e34737976d2e10734139570 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,5 +1,5 @@
 %define pref /usr
 %define pref /usr

-%define ver 2.5.2
+%define ver 2.5.5

 %define ver2 2.5
 %define rel 1
 
 %define ver2 2.5
 %define rel 1
 


@@ -142,12 +142,14 @@ cat <<EOF >wxbase-headers-list
 wx/afterstd.h
 wx/app.h
 wx/apptrait.h
 wx/afterstd.h
 wx/app.h
 wx/apptrait.h

+wx/archive.h

 wx/arrimpl.cpp
 wx/arrstr.h
 wx/beforestd.h
 wx/buffer.h
 wx/build.h
 wx/chkconf.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/cmdline.h
 wx/confbase.h
 wx/config.h


@@ -180,6 +182,7 @@ wx/fs_zip.h
 wx/hash.h
 wx/hashmap.h
 wx/hashset.h
 wx/hash.h
 wx/hashmap.h
 wx/hashset.h

+wx/html/forcelnk.h

 wx/iconloc.h
 wx/init.h
 wx/intl.h
 wx/iconloc.h
 wx/init.h
 wx/intl.h


@@ -209,7 +212,11 @@ wx/ptr_scpd.h
 wx/regex.h
 wx/scopeguard.h
 wx/snglinst.h
 wx/regex.h
 wx/scopeguard.h
 wx/snglinst.h

+wx/sstream.h

 wx/stack.h
 wx/stack.h

+wx/stackwalk.h
+wx/stdpaths.h
+wx/stockitem.h

 wx/stopwatch.h
 wx/strconv.h
 wx/stream.h
 wx/stopwatch.h
 wx/strconv.h
 wx/stream.h


@@ -223,6 +230,7 @@ wx/timer.h
 wx/tokenzr.h
 wx/txtstrm.h
 wx/types.h
 wx/tokenzr.h
 wx/txtstrm.h
 wx/types.h

+wx/uri.h

 wx/utils.h
 wx/variant.h
 wx/vector.h
 wx/utils.h
 wx/variant.h
 wx/vector.h


@@ -241,10 +249,13 @@ wx/msw/apptbase.h
 wx/msw/chkconf.h
 wx/msw/crashrpt.h
 wx/msw/dde.h
 wx/msw/chkconf.h
 wx/msw/crashrpt.h
 wx/msw/dde.h

+wx/msw/debughlp.h

 wx/msw/gccpriv.h
 wx/msw/mimetype.h
 wx/msw/gccpriv.h
 wx/msw/mimetype.h

+wx/msw/stackwalk.h

 wx/msw/winundef.h
 wx/msw/wrapcctl.h
 wx/msw/winundef.h
 wx/msw/wrapcctl.h

+wx/msw/wrapcdlg.h

 wx/msw/wrapwin.h
 wx/fs_inet.h
 wx/gsocket.h
 wx/msw/wrapwin.h
 wx/fs_inet.h
 wx/gsocket.h


@@ -266,7 +277,7 @@ wx/dbtable.h
 EOF
 # --- wxBase headers list ends here ---
 for f in `cat wxbase-headers-list` ; do
 EOF
 # --- wxBase headers list ends here ---
 for f in `cat wxbase-headers-list` ; do

-  rm -f $RPM_BUILD_ROOT%{_includedir}/$f
+  rm -f $RPM_BUILD_ROOT%{_includedir}/wx-*/$f

 done
 
 # list of all core headers:
 done
 
 # list of all core headers:


@@ -274,7 +285,7 @@ find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >cor
 
 # contrib stuff:
 (cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
 # 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)
+(cd obj-shared/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*
 
 # remove wxBase files so that RPM doesn't complain about unpackaged files:
 rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base*


@@ -296,28 +307,10 @@ 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 %{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}/%{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
-  fi
-fi
-

 
 %files
 %defattr(-,root,root)
 %doc COPYING.LIB *.txt
 
 %files
 %defattr(-,root,root)
 %doc COPYING.LIB *.txt

-%dir %{_datadir}/wx
-%{_datadir}/wx/*

 %{_libdir}/libwx_%{portname}*_core*.so.*
 %{_libdir}/libwx_%{portname}*_html*.so.*
 %{_libdir}/libwx_%{portname}*_adv*.so.*
 %{_libdir}/libwx_%{portname}*_core*.so.*
 %{_libdir}/libwx_%{portname}*_html*.so.*
 %{_libdir}/libwx_%{portname}*_adv*.so.*


@@ -362,42 +355,42 @@ fi
 %files contrib-devel
 %defattr(-,root,root)
 %{_bindir}/wxrc
 %files contrib-devel
 %defattr(-,root,root)
 %{_bindir}/wxrc

-%dir %{_includedir}/wx/animate
-%{_includedir}/wx/animate/*
+%dir %{_includedir}/wx-*/wx/animate
+%{_includedir}/wx-*/wx/animate/*

 %{_libdir}/libwx_%{portname}*_animate*.so
 
 %{_libdir}/libwx_%{portname}*_animate*.so
 

-%dir %{_includedir}/wx/deprecated
-%{_includedir}/wx/deprecated/*
+%dir %{_includedir}/wx-*/wx/deprecated
+%{_includedir}/wx-*/wx/deprecated/*

 %{_libdir}/libwx_%{portname}*_deprecated*.so
 
 %{_libdir}/libwx_%{portname}*_deprecated*.so
 

-%dir %{_includedir}/wx/fl
-%{_includedir}/wx/fl/*
+%dir %{_includedir}/wx-*/wx/fl
+%{_includedir}/wx-*/wx/fl/*

 %{_libdir}/libwx_%{portname}*_fl*.so
 
 %{_libdir}/libwx_%{portname}*_fl*.so
 

-%dir %{_includedir}/wx/gizmos
-%{_includedir}/wx/gizmos/*
+%dir %{_includedir}/wx-*/wx/gizmos
+%{_includedir}/wx-*/wx/gizmos/*

 %{_libdir}/libwx_%{portname}*_gizmos*.so
 
 %{_libdir}/libwx_%{portname}*_gizmos*.so
 

-%dir %{_includedir}/wx/mmedia
-%{_includedir}/wx/mmedia/*
+%dir %{_includedir}/wx-*/wx/mmedia
+%{_includedir}/wx-*/wx/mmedia/*

 %{_libdir}/libwx_%{portname}*_mmedia*.so
 
 %{_libdir}/libwx_%{portname}*_mmedia*.so
 

-%dir %{_includedir}/wx/ogl
-%{_includedir}/wx/ogl/*
+%dir %{_includedir}/wx-*/wx/ogl
+%{_includedir}/wx-*/wx/ogl/*

 %{_libdir}/libwx_%{portname}*_ogl*.so
 
 %{_libdir}/libwx_%{portname}*_ogl*.so
 

-%dir %{_includedir}/wx/plot
-%{_includedir}/wx/plot/*
+%dir %{_includedir}/wx-*/wx/plot
+%{_includedir}/wx-*/wx/plot/*

 %{_libdir}/libwx_%{portname}*_plot*.so
 
 %{_libdir}/libwx_%{portname}*_plot*.so
 

-%dir %{_includedir}/wx/stc
-%{_includedir}/wx/stc/*
+%dir %{_includedir}/wx-*/wx/stc
+%{_includedir}/wx-*/wx/stc/*

 %{_libdir}/libwx_%{portname}*_stc*.so
 
 %{_libdir}/libwx_%{portname}*_stc*.so
 

-%dir %{_includedir}/wx/svg
-%{_includedir}/wx/svg/*
+%dir %{_includedir}/wx-*/wx/svg
+%{_includedir}/wx-*/wx/svg/*

 %{_libdir}/libwx_%{portname}*_svg*.so
 
 %{_libdir}/libwx_%{portname}*_svg*.so
 

-%dir %{_includedir}/wx/xrc
-%{_includedir}/wx/xrc/*
+%dir %{_includedir}/wx-*/wx/xrc
+%{_includedir}/wx-*/wx/xrc/*

 %{_libdir}/libwx_%{portname}*_xrc*.so
 %{_libdir}/libwx_%{portname}*_xrc*.so