Upgrade bundled zlib to 1.2.8.

[wxWidgets.git] / wxX11.spec

diff --git a/wxX11.spec b/wxX11.spec
index bcec15dff03eb51b297e78a4d281db792e549a6f..51fd9c463acf03eba785cffafd2cbf3f162c39eb 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,6 +1,6 @@
 %define pref /usr
 %define pref /usr

-%define ver  2.9.0
-%define ver2 2.9
+%define ver  3.0.0
+%define ver2 3.0

 %define rel  1
 
 # Configurable settings (use --with(out) unicode on rpmbuild cmd line):
 %define rel  1
 
 # Configurable settings (use --with(out) unicode on rpmbuild cmd line):


@@ -13,12 +13,12 @@
 %if %{unicode}
     %define wxbasename   wx-base-unicode
     %define name         wx-%{portname}-unicode
 %if %{unicode}
     %define wxbasename   wx-base-unicode
     %define name         wx-%{portname}-unicode

-    %define wxconfig     %{portname}-unicode-release-%{ver2}
+    %define wxconfig     %{portname}-unicode-%{ver2}

     %define wxconfiglink wx%{portname}u-%{ver2}-config
 %else
     %define wxbasename   wx-base
     %define name         wx-%{portname}
     %define wxconfiglink wx%{portname}u-%{ver2}-config
 %else
     %define wxbasename   wx-base
     %define name         wx-%{portname}

-    %define wxconfig     %{portname}-ansi-release-%{ver2}
+    %define wxconfig     %{portname}-ansi-%{ver2}

     %define wxconfiglink wx%{portname}-%{ver2}-config
 %endif
 
     %define wxconfiglink wx%{portname}-%{ver2}-config
 %endif
 


@@ -72,23 +72,6 @@ Requires: %{name}-devel = %{ver}
 %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
 %setup -q -n wxX11-%{ver}
 
 %prep
 %setup -q -n wxX11-%{ver}
 


@@ -108,10 +91,7 @@ cd obj-shared
                               --disable-unicode \
 %endif
 $MAKE
                               --disable-unicode \
 %endif
 $MAKE

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

 
 mkdir obj-static
 cd obj-static
 
 mkdir obj-static
 cd obj-static


@@ -135,6 +115,8 @@ rm -rf $RPM_BUILD_ROOT
 # --- wxBase headers list begins here ---
 cat <<EOF >wxbase-headers.files
 wx/afterstd.h
 # --- wxBase headers list begins here ---
 cat <<EOF >wxbase-headers.files
 wx/afterstd.h

+wx/any.h
+wx/anystr.h

 wx/app.h
 wx/apptrait.h
 wx/archive.h
 wx/app.h
 wx/apptrait.h
 wx/archive.h


@@ -146,10 +128,12 @@ wx/beforestd.h
 wx/buffer.h
 wx/build.h
 wx/chartype.h
 wx/buffer.h
 wx/build.h
 wx/chartype.h

+wx/checkeddelete.h

 wx/chkconf.h
 wx/clntdata.h
 wx/cmdargs.h
 wx/cmdline.h
 wx/chkconf.h
 wx/clntdata.h
 wx/cmdargs.h
 wx/cmdline.h

+wx/compiler.h

 wx/confbase.h
 wx/config.h
 wx/convauto.h
 wx/confbase.h
 wx/config.h
 wx/convauto.h


@@ -169,6 +153,8 @@ wx/dynlib.h
 wx/dynload.h
 wx/encconv.h
 wx/event.h
 wx/dynload.h
 wx/encconv.h
 wx/event.h

+wx/eventfilter.h
+wx/evtloop.h

 wx/except.h
 wx/features.h
 wx/flags.h
 wx/except.h
 wx/features.h
 wx/flags.h


@@ -196,6 +182,7 @@ wx/ioswrap.h
 wx/ipc.h
 wx/ipcbase.h
 wx/kbdstate.h
 wx/ipc.h
 wx/ipcbase.h
 wx/kbdstate.h

+wx/language.h

 wx/link.h
 wx/list.h
 wx/listimpl.cpp
 wx/link.h
 wx/list.h
 wx/listimpl.cpp


@@ -209,7 +196,9 @@ wx/mimetype.h
 wx/module.h
 wx/mousestate.h
 wx/msgout.h
 wx/module.h
 wx/mousestate.h
 wx/msgout.h

+wx/msgqueue.h

 wx/mstream.h
 wx/mstream.h

+wx/numformatter.h

 wx/object.h
 wx/platform.h
 wx/platinfo.h
 wx/object.h
 wx/platform.h
 wx/platinfo.h


@@ -219,12 +208,17 @@ wx/ptr_scpd.h
 wx/ptr_shrd.h
 wx/recguard.h
 wx/regex.h
 wx/ptr_shrd.h
 wx/recguard.h
 wx/regex.h

+wx/rtti.h
+wx/scopedarray.h
+wx/scopedptr.h

 wx/scopeguard.h
 wx/scopeguard.h

+wx/sharedptr.h

 wx/snglinst.h
 wx/sstream.h
 wx/stack.h
 wx/stackwalk.h
 wx/stdpaths.h
 wx/snglinst.h
 wx/sstream.h
 wx/stack.h
 wx/stackwalk.h
 wx/stdpaths.h

+wx/stdstream.h

 wx/stockitem.h
 wx/stopwatch.h
 wx/strconv.h
 wx/stockitem.h
 wx/stopwatch.h
 wx/strconv.h


@@ -239,11 +233,14 @@ wx/textbuf.h
 wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp

+wx/time.h

 wx/timer.h
 wx/tls.h
 wx/tokenzr.h
 wx/tracker.h
 wx/timer.h
 wx/tls.h
 wx/tokenzr.h
 wx/tracker.h

+wx/translation.h

 wx/txtstrm.h
 wx/txtstrm.h

+wx/typeinfo.h

 wx/types.h
 wx/unichar.h
 wx/uri.h
 wx/types.h
 wx/unichar.h
 wx/uri.h


@@ -252,6 +249,7 @@ wx/utils.h
 wx/variant.h
 wx/vector.h
 wx/version.h
 wx/variant.h
 wx/vector.h
 wx/version.h

+wx/versioninfo.h

 wx/volume.h
 wx/weakref.h
 wx/wfstream.h
 wx/volume.h
 wx/weakref.h
 wx/wfstream.h


@@ -263,40 +261,48 @@ wx/wxcrtvararg.h
 wx/wxprec.h
 wx/xlocale.h
 wx/xti.h
 wx/wxprec.h
 wx/xlocale.h
 wx/xti.h

+wx/xti2.h

 wx/xtistrm.h
 wx/xtistrm.h

+wx/xtictor.h
+wx/xtihandler.h
+wx/xtiprop.h
+wx/xtitypes.h

 wx/zipstrm.h
 wx/zstream.h
 wx/meta/convertible.h
 wx/meta/if.h
 wx/zipstrm.h
 wx/zstream.h
 wx/meta/convertible.h
 wx/meta/if.h

+wx/meta/implicitconversion.h

 wx/meta/int2type.h
 wx/meta/movable.h
 wx/meta/int2type.h
 wx/meta/movable.h

-wx/private/fdiodispatcher.h
-wx/private/selectdispatcher.h
+wx/meta/pod.h
+wx/meta/removeref.h
+wx/fswatcher.h
+wx/generic/fswatcher.h

 wx/unix/app.h
 wx/unix/apptbase.h
 wx/unix/apptrait.h
 wx/unix/chkconf.h
 wx/unix/evtloop.h
 wx/unix/app.h
 wx/unix/apptbase.h
 wx/unix/apptrait.h
 wx/unix/chkconf.h
 wx/unix/evtloop.h

+wx/unix/evtloopsrc.h

 wx/unix/pipe.h
 wx/unix/stdpaths.h
 wx/unix/stackwalk.h
 wx/unix/tls.h
 wx/unix/pipe.h
 wx/unix/stdpaths.h
 wx/unix/stackwalk.h
 wx/unix/tls.h

+wx/unix/fswatcher_kqueue.h

 wx/unix/execute.h
 wx/unix/mimetype.h
 wx/unix/execute.h
 wx/unix/mimetype.h

-wx/unix/private.h
-wx/private/gsocketiohandler.h
+wx/unix/fswatcher_inotify.h

 wx/fs_inet.h
 wx/fs_inet.h

-wx/gsocket.h

 wx/protocol/file.h
 wx/protocol/ftp.h
 wx/protocol/http.h
 wx/protocol/file.h
 wx/protocol/ftp.h
 wx/protocol/http.h

+wx/protocol/log.h

 wx/protocol/protocol.h
 wx/sckaddr.h
 wx/sckipc.h
 wx/sckstrm.h
 wx/socket.h
 wx/url.h
 wx/protocol/protocol.h
 wx/sckaddr.h
 wx/sckipc.h
 wx/sckstrm.h
 wx/socket.h
 wx/url.h

-wx/unix/gsockunx.h

 wx/xml/xml.h
 wx/xtixml.h
 EOF
 wx/xml/xml.h
 wx/xtixml.h
 EOF


@@ -308,10 +314,6 @@ done
 # list of all core headers:
 find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files
 
 # list of all core headers:
 find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -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/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*
 %if %{unicode}
 # remove wxBase files so that RPM doesn't complain about unpackaged files:
 rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base*
 %if %{unicode}


@@ -355,18 +357,6 @@ rm -f %{_bindir}/%{wxconfiglink}
 %postun gl
 /sbin/ldconfig
 
 %postun gl
 /sbin/ldconfig
 

-%post contrib
-/sbin/ldconfig
-
-%postun contrib
-/sbin/ldconfig
-
-%post contrib-devel
-/sbin/ldconfig
-
-%postun contrib-devel
-/sbin/ldconfig
-

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


@@ -399,52 +389,3 @@ rm -f %{_bindir}/%{wxconfiglink}
 %defattr (-,root,root)
 %{_libdir}/libwx_%{portname}*_*-%{ver2}.a
 
 %defattr (-,root,root)
 %{_libdir}/libwx_%{portname}*_*-%{ver2}.a
 

-%files contrib
-%defattr(-,root,root)
-%{_libdir}/libwx_%{portname}*_animate-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_deprecated-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_fl-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_gizmos-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_mmedia-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_ogl-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_plot-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_stc-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_svg-%{ver2}.so.*
-
-%files contrib-devel
-%defattr(-,root,root)
-%dir %{_includedir}/wx-%{ver2}/wx/animate
-%{_includedir}/wx-%{ver2}/wx/animate/*
-%{_libdir}/libwx_%{portname}*_animate-%{ver2}.so
-
-%dir %{_includedir}/wx-%{ver2}/wx/deprecated
-%{_includedir}/wx-%{ver2}/wx/deprecated/*
-%{_libdir}/libwx_%{portname}*_deprecated-%{ver2}.so
-
-%dir %{_includedir}/wx-%{ver2}/wx/fl
-%{_includedir}/wx-%{ver2}/wx/fl/*
-%{_libdir}/libwx_%{portname}*_fl-%{ver2}.so
-
-%dir %{_includedir}/wx-%{ver2}/wx/gizmos
-%{_includedir}/wx-%{ver2}/wx/gizmos/*
-%{_libdir}/libwx_%{portname}*_gizmos-%{ver2}.so
-
-%dir %{_includedir}/wx-%{ver2}/wx/mmedia
-%{_includedir}/wx-%{ver2}/wx/mmedia/*
-%{_libdir}/libwx_%{portname}*_mmedia-%{ver2}.so
-
-%dir %{_includedir}/wx-%{ver2}/wx/ogl
-%{_includedir}/wx-%{ver2}/wx/ogl/*
-%{_libdir}/libwx_%{portname}*_ogl-%{ver2}.so
-
-%dir %{_includedir}/wx-%{ver2}/wx/plot
-%{_includedir}/wx-%{ver2}/wx/plot/*
-%{_libdir}/libwx_%{portname}*_plot-%{ver2}.so
-
-%dir %{_includedir}/wx-%{ver2}/wx/stc
-%{_includedir}/wx-%{ver2}/wx/stc/*
-%{_libdir}/libwx_%{portname}*_stc-%{ver2}.so
-
-%dir %{_includedir}/wx-%{ver2}/wx/svg
-%{_includedir}/wx-%{ver2}/wx/svg/*
-%{_libdir}/libwx_%{portname}*_svg-%{ver2}.so