Removed ace-tao-obstack.patch, no longer needed.

Converted ace-tao-config-ipv6.patch into conditional rpm script.
Converted ace-tao-rnq.patch into conditional rpm script.
Converted ace-tao-config-tmplvis.patch and ace-tao-hasicmp.patch
into rpm script.

7 files changed, 61 insertions, 79 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 08788e953a2..be792024101 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,17 @@
+Sun May 25 04:11:37 UTC 2008  Ken Sedgwick  <ken+5a4@bonsai.com>
+
+	* rpmbuild/ace-tao.spec:
+	* rpmbuild/ace-tao-rnq.patch:
+	* rpmbuild/ace-tao-config-tmplvis.patch:
+	* rpmbuild/ace-tao-hasicmp.patch:
+	* rpmbuild/ace-tao-obstack.patch:
+	* rpmbuild/ace-tao-config-ipv6.patch:
+          Removed ace-tao-obstack.patch, no longer needed.
+          Converted ace-tao-config-ipv6.patch into conditional rpm script.
+          Converted ace-tao-rnq.patch into conditional rpm script.
+          Converted ace-tao-config-tmplvis.patch and ace-tao-hasicmp.patch
+          into rpm script.
+
 Sat May 24 19:50:46 UTC 2008  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
diff --git a/ACE/rpmbuild/ace-tao-config-ipv6.patch b/ACE/rpmbuild/ace-tao-config-ipv6.patch
deleted file mode 100644
index 03d3adc3bf6..00000000000
--- a/ACE/rpmbuild/ace-tao-config-ipv6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ACE_wrappers/ace/config.h~	2006-08-22 08:37:47.000000000 -0700
-+++ ACE_wrappers/ace/config.h	2006-10-10 11:59:29.000000000 -0700
-@@ -62,6 +62,9 @@
- // far back this goes.
- #define ACE_HAS_GETIFADDRS
- 
-+#define ACE_HAS_IPV6 // Ken Sedgwick 2006-06-14
-+#define ACE_USES_IPV4_IPV6_MIGRATION // Ken Sedgwick 2006-06-14
-+
- #include /**/ "ace/post.h"
- 
- #endif /* ACE_CONFIG_LINUX_H */
diff --git a/ACE/rpmbuild/ace-tao-config-tmplvis.patch b/ACE/rpmbuild/ace-tao-config-tmplvis.patch
deleted file mode 100644
index a064de379ab..00000000000
--- a/ACE/rpmbuild/ace-tao-config-tmplvis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ACE_wrappers/ace/config.h~	2007-05-05 07:40:55.000000000 -0700
-+++ ACE_wrappers/ace/config.h	2007-05-05 07:54:07.000000000 -0700
-@@ -85,6 +85,8 @@
- 
- #define ACE_HAS_EVENT_POLL 1			// Ken Sedgwick 2006-12-16
- 
-+#define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1  // Ken Sedgwick 2007-05-05
-+
- #include /**/ "ace/post.h"
- 
- #endif /* ACE_CONFIG_LINUX_H */
diff --git a/ACE/rpmbuild/ace-tao-hasicmp.patch b/ACE/rpmbuild/ace-tao-hasicmp.patch
deleted file mode 100644
index 19ed2f71004..00000000000
--- a/ACE/rpmbuild/ace-tao-hasicmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ACE_wrappers/ace/config.h~	2006-09-03 23:02:14.000000000 -0700
-+++ ACE_wrappers/ace/config.h	2006-09-05 11:41:27.000000000 -0700
-@@ -67,6 +67,8 @@
- #define ACE_HAS_IPV6 // Ken Sedgwick 2006-06-14
- #define ACE_USES_IPV4_IPV6_MIGRATION // Ken Sedgwick 2006-06-14
- 
-+#define ACE_HAS_ICMP_SUPPORT 1 // Ken Sedgwick 2006-09-05
-+
- #include /**/ "ace/post.h"
- 
- #endif /* ACE_CONFIG_LINUX_H */
diff --git a/ACE/rpmbuild/ace-tao-obstack.patch b/ACE/rpmbuild/ace-tao-obstack.patch
deleted file mode 100644
index 6777dfd9c6a..00000000000
--- a/ACE/rpmbuild/ace-tao-obstack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ACE_wrappers/ace/Obstack.h~	2005-11-22 01:23:56.000000000 -0800
-+++ ACE_wrappers/ace/Obstack.h	2006-11-20 01:10:18.000000000 -0800
-@@ -21,7 +21,7 @@
- 
- ACE_BEGIN_VERSIONED_NAMESPACE_DECL
- 
--ACE_SINGLETON_DECLARATION (ACE_Obstack_T <char>;)
-+ACE_EXPORT_SINGLETON_DECLARATION (ACE_Obstack_T <char>;)
- 
- typedef ACE_Obstack_T<char> ACE_Obstack;
- 
diff --git a/ACE/rpmbuild/ace-tao-rnq.patch b/ACE/rpmbuild/ace-tao-rnq.patch
deleted file mode 100644
index 0265e2d8753..00000000000
--- a/ACE/rpmbuild/ace-tao-rnq.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ACE_wrappers/ace/config.h~	2006-04-19 13:19:34.000000000 -0700
-+++ ACE_wrappers/ace/config.h	2006-04-19 13:22:10.000000000 -0700
-@@ -21,6 +21,8 @@
- #define ACE_HAS_AUTOMATIC_INIT_FINI
- #define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE
- 
-+#define ACE_HAS_REACTOR_NOTIFICATION_QUEUE  // Ken Sedgwick 2006-04-19
-+
- #if !defined (ACE_MT_SAFE)
- #define ACE_MT_SAFE 1                           // JCEJ 12/22/96        #1
- #endif
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 7c3966eeeac..b3efe49fa0f 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -37,7 +37,7 @@
 Summary: The ADAPTIVE Communication Environment (ACE) and The ACE ORB (TAO)
 Name: ace-tao
 Version: %{ACEVER}
-Release: 2%{?OPTTAG}%{?dist}
+Release: 3%{?OPTTAG}%{?dist}
 Group: Development/Libraries
 URL: http://www.cs.wustl.edu/~schmidt/ACE.html
 License: DOC License
@@ -45,17 +45,7 @@ Source0: http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-%{ACE
 ## Source1: ace-tao-etc.tar.gz
 ## Source2: ace-tao-macros.patch
 ## Patch0: ace-tao-config.patch
-%if %{?_with_ipv6:1}%{!?_with_ipv6:0}
-## Patch1: ace-tao-config-ipv6.patch
-%endif
-%if %{?_with_rnq:1}%{!?_with_rnq:0}
-## Patch2: ace-tao-rnq.patch
-%endif
 ## Patch4: ace-tao-gperf-info.patch
-# Don't use Patch8 (ace-tao-sslverify.patch) until verified it is required.
-## Patch9: ace-tao-hasicmp.patch
-## Patch10: ace-tao-obstack.patch
-## Patch12: ace-tao-config-tmplvis.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info, /sbin/install-info
@@ -637,24 +627,51 @@ cp config-linux.h config.h
 #patch0 -p 1
 cat ${ACE_ROOT}/rpmbuild/ace-tao-config.patch | patch -p 1
 
+# If ipv6 support is indicated insert some lines into the confi.h
+# file, right before the ace/post.h include.
+#
 %if %{?_with_ipv6:1}%{!?_with_ipv6:0}
-#patch1 -p 1
-cat ${ACE_ROOT}/rpmbuild/ace-tao-config-ipv6.patch | patch -p 1
+rm -f $ACE_ROOT/ace/config.h.tmp
+awk 'BEGIN { FLG = 1 }; /ace\/post/ { FLG = 0 }; { if (FLG==1) print }' \
+$ACE_ROOT/ace/config.h >> $ACE_ROOT/ace/config.h.tmp
+cat >> $ACE_ROOT/ace/config.h.tmp <<"EOF"
+#define ACE_HAS_IPV6 // Ken Sedgwick 2006-06-14
+#define ACE_USES_IPV4_IPV6_MIGRATION // Ken Sedgwick 2006-06-14
+EOF
+awk 'BEGIN { FLG = 0 }; /ace\/post/ { FLG = 1 }; { if (FLG==1) print }' \
+$ACE_ROOT/ace/config.h >> $ACE_ROOT/ace/config.h.tmp
+mv $ACE_ROOT/ace/config.h.tmp $ACE_ROOT/ace/config.h
 %endif
 
+# If rnq support is indicated insert some lines into the confi.h
+# file, right before the ace/post.h include.
+#
 %if %{?_with_rnq:1}%{!?_with_rnq:0}
-#patch2 -p 1
-cat ${ACE_ROOT}/rpmbuild/ace-tao-rnq.patch | patch -p 1
+# Insert into the confi.h file, right before the ace/post.h include.
+rm -f $ACE_ROOT/ace/config.h.tmp
+awk 'BEGIN { FLG = 1 }; /ace\/post/ { FLG = 0 }; { if (FLG==1) print }' \
+$ACE_ROOT/ace/config.h >> $ACE_ROOT/ace/config.h.tmp
+cat >> $ACE_ROOT/ace/config.h.tmp <<"EOF"
+#define ACE_HAS_REACTOR_NOTIFICATION_QUEUE  // Ken Sedgwick 2006-04-19
+EOF
+awk 'BEGIN { FLG = 0 }; /ace\/post/ { FLG = 1 }; { if (FLG==1) print }' \
+$ACE_ROOT/ace/config.h >> $ACE_ROOT/ace/config.h.tmp
+mv $ACE_ROOT/ace/config.h.tmp $ACE_ROOT/ace/config.h
 %endif
 
-#patch9 -p 1
-cat ${ACE_ROOT}/rpmbuild/ace-tao-hasicmp.patch | patch -p 1
-
-#patch10 -p 1
-cat ${ACE_ROOT}/rpmbuild/ace-tao-obstack.patch | patch -p 1
-
-#patch12 -p 1
-cat ${ACE_ROOT}/rpmbuild/ace-tao-config-tmplvis.patch | patch -p 1
+# For template instantiation visibility and icmp support insert some
+# lines into the confi.h file, right before the ace/post.h include.
+#
+rm -f $ACE_ROOT/ace/config.h.tmp
+awk 'BEGIN { FLG = 1 }; /ace\/post/ { FLG = 0 }; { if (FLG==1) print }' \
+$ACE_ROOT/ace/config.h >> $ACE_ROOT/ace/config.h.tmp
+cat >> $ACE_ROOT/ace/config.h.tmp <<"EOF"
+#define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1  // Ken Sedgwick 2007-05-05
+#define ACE_HAS_ICMP_SUPPORT 1 // Ken Sedgwick 2006-09-05
+EOF
+awk 'BEGIN { FLG = 0 }; /ace\/post/ { FLG = 1 }; { if (FLG==1) print }' \
+$ACE_ROOT/ace/config.h >> $ACE_ROOT/ace/config.h.tmp
+mv $ACE_ROOT/ace/config.h.tmp $ACE_ROOT/ace/config.h
 
 # platform_macros.GNU
 cat > $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
@@ -2152,6 +2169,13 @@ fi
 # ================================================================
 
 %changelog
+* Sat May 24 2008 Ken Sedgwick <ken+5a4@bonsai.com> - 5.6.5-3
+- Removed obstack patch, no longer needed.
+- Converted ace-tao-config-ipv6.patch into conditional rpm script.
+- Converted ace-tao-rnq.patch into conditional rpm script.
+- Converted ace-tao-config-tmplvis.patch and ace-tao-hasicmp.patch
+  into rpm script.
+
 * Thu May 22 2008 Johnny Willemsen  <jwillemsen@remedy.nl> - 5.6.5-3
 - Removed codeset patch, merged into the distribution