Undid completely wrong patch 1438117: other platforms do _not_ count

[wxWidgets.git] / wxX11.spec

diff --git a/wxX11.spec b/wxX11.spec
index c3add880b9ee9cdbed35120a2c38e54bda4fb94c..7606cd95634cb628d63c8875f7f3f2d6efbfad5a 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,6 +1,6 @@
 %define pref /usr
 %define pref /usr

-%define ver  2.6.2
-%define ver2 2.6
+%define ver  2.7.0
+%define ver2 2.7

 %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):


@@ -134,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 # Remove headers that are part of wx-base-devel:
 
 # --- wxBase headers list begins here ---
 # Remove headers that are part of wx-base-devel:
 
 # --- wxBase headers list begins here ---

-cat <<EOF >wxbase-headers-list
+cat <<EOF >wxbase-headers.files

 wx/afterstd.h
 wx/app.h
 wx/apptrait.h
 wx/afterstd.h
 wx/app.h
 wx/apptrait.h


@@ -149,7 +149,9 @@ wx/clntdata.h
 wx/cmdline.h
 wx/confbase.h
 wx/config.h
 wx/cmdline.h
 wx/confbase.h
 wx/config.h

+wx/convauto.h

 wx/containr.h
 wx/containr.h

+wx/cpp.h

 wx/datetime.h
 wx/datstrm.h
 wx/dde.h
 wx/datetime.h
 wx/datstrm.h
 wx/dde.h


@@ -172,6 +174,8 @@ wx/filename.h
 wx/filesys.h
 wx/fontenc.h
 wx/fontmap.h
 wx/filesys.h
 wx/fontenc.h
 wx/fontmap.h

+wx/fs_arc.h
+wx/fs_filter.h

 wx/fs_mem.h
 wx/fs_zip.h
 wx/hash.h
 wx/fs_mem.h
 wx/fs_zip.h
 wx/hash.h


@@ -187,6 +191,7 @@ wx/ipc.h
 wx/ipcbase.h
 wx/isql.h
 wx/isqlext.h
 wx/ipcbase.h
 wx/isql.h
 wx/isqlext.h

+wx/link.h

 wx/list.h
 wx/listimpl.cpp
 wx/log.h
 wx/list.h
 wx/listimpl.cpp
 wx/log.h


@@ -198,12 +203,14 @@ wx/memtext.h
 wx/mimetype.h
 wx/module.h
 wx/msgout.h
 wx/mimetype.h
 wx/module.h
 wx/msgout.h

-wx/msgout.h

 wx/mstream.h
 wx/object.h
 wx/platform.h
 wx/mstream.h
 wx/object.h
 wx/platform.h

+wx/platinfo.h
+wx/power.h

 wx/process.h
 wx/ptr_scpd.h
 wx/process.h
 wx/ptr_scpd.h

+wx/recguard.h

 wx/regex.h
 wx/scopeguard.h
 wx/snglinst.h
 wx/regex.h
 wx/scopeguard.h
 wx/snglinst.h


@@ -217,6 +224,7 @@ wx/strconv.h
 wx/stream.h
 wx/string.h
 wx/sysopt.h
 wx/stream.h
 wx/string.h
 wx/sysopt.h

+wx/tarstrm.h

 wx/textbuf.h
 wx/textfile.h
 wx/thread.h
 wx/textbuf.h
 wx/textfile.h
 wx/thread.h


@@ -239,20 +247,14 @@ wx/xti.h
 wx/xtistrm.h
 wx/zipstrm.h
 wx/zstream.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/debughlp.h
-wx/msw/gccpriv.h
-wx/msw/mimetype.h
-wx/msw/stackwalk.h
-wx/msw/stdpaths.h
-wx/msw/winundef.h
-wx/msw/wrapcctl.h
-wx/msw/wrapcdlg.h
-wx/msw/wrapwin.h
+wx/unix/apptbase.h
+wx/unix/apptrait.h
+wx/unix/execute.h
+wx/unix/mimetype.h
+wx/unix/pipe.h
+wx/unix/private.h
+wx/unix/stackwalk.h
+wx/unix/stdpaths.h

 wx/fs_inet.h
 wx/gsocket.h
 wx/protocol/file.h
 wx/fs_inet.h
 wx/gsocket.h
 wx/protocol/file.h


@@ -264,7 +266,7 @@ wx/sckipc.h
 wx/sckstrm.h
 wx/socket.h
 wx/url.h
 wx/sckstrm.h
 wx/socket.h
 wx/url.h

-wx/msw/gsockmsw.h
+wx/unix/gsockunx.h

 wx/xml/xml.h
 wx/xtixml.h
 wx/db.h
 wx/xml/xml.h
 wx/xtixml.h
 wx/db.h