From 45a74fec3f8c1cc92c331f6edf70e13dbb63faf8 Mon Sep 17 00:00:00 2001
From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Wed, 3 Aug 2005 13:36:07 +0000
Subject: [PATCH] Set PLATFORM_UNIX for the rpmspec format

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/files.bkl           | 8 ++++----
 build/bakefiles/formats/rpmspec.bkl | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index c95548b348..2ea3f9da4e 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2788,8 +2788,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
     </set>
     <set var="BASE_PLATFORM_HDR" hints="files">
-        <if cond="PLATFORM_UNIX=='1' or FORMAT=='rpmspec'">$(BASE_UNIX_HDR)</if>
-        <if cond="PLATFORM_WIN32=='1' and FORMAT!='rpmspec'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
+        <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
+        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
@@ -2813,8 +2813,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
     </set>
     <set var="NET_PLATFORM_HDR" hints="files">
-        <if cond="PLATFORM_UNIX=='1' or FORMAT=='rpmspec'">$(NET_UNIX_HDR)</if>
-        <if cond="PLATFORM_WIN32=='1' and FORMAT!='rpmspec'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
+        <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
+        <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
         <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_HDR)</if>
diff --git a/build/bakefiles/formats/rpmspec.bkl b/build/bakefiles/formats/rpmspec.bkl
index fd9e9830b3..b0f35aad49 100644
--- a/build/bakefiles/formats/rpmspec.bkl
+++ b/build/bakefiles/formats/rpmspec.bkl
@@ -6,6 +6,10 @@
     <include file="presets/fake.bkl"/>
     <set var="COMPILER">gcc</set>
 
+    <!-- fake.bkl defaults to win32 platform -->
+    <set var="PLATFORM_UNIX">1</set>
+    <set var="PLATFORM_WIN32">0</set>
+
     <set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>
 
     <output file="../../wxGTK.spec"
-- 
2.45.2