Fri Jun 26 16:10:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * rpmbuild/ace-tao-init-suse/fillup-templates/*:
          Missing files for x.7.0

        * rpmbuild/ace-tao-init-suse/tao:
          Removed, this are Fedora files

        * rpmbuild/ace-tao-ciao.spec:
          Copy the correct files for SuSE and print the g++ version in the
          build log which makes it easier to see which g++ version is
          used

8 files changed, 23 insertions, 4 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f14ad2fa8ec..2716523eeb5 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jun 26 16:10:10 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao-init-suse/fillup-templates/*:
+          Missing files for x.7.0
+
+        * rpmbuild/ace-tao-init-suse/tao:
+          Removed, this are Fedora files
+
+        * rpmbuild/ace-tao-ciao.spec:
+          Copy the correct files for SuSE and print the g++ version in the
+          build log which makes it easier to see which g++ version is
+          used
+
 Fri Jun 26 02:16:10 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * include/makeinclude/platform_linux.GNU:
diff --git a/ACE/rpmbuild/ace-tao-ciao.spec b/ACE/rpmbuild/ace-tao-ciao.spec
index 51f5376e97c..a71487102f5 100644
--- a/ACE/rpmbuild/ace-tao-ciao.spec
+++ b/ACE/rpmbuild/ace-tao-ciao.spec
@@ -973,6 +973,11 @@ export ACE_ROOT=`pwd`
 export TAO_ROOT=$ACE_ROOT/TAO
 export LD_LIBRARY_PATH=$ACE_ROOT/lib
 
+# Dump the g++ versions, in case the g++ version is broken we can
+# easily see this in the build log
+g++ --version
+g++ -dumpversion
+
 %if %skip_make
 cd .. && rm -rf ACE_wrappers && ln -s ACE_wrappers-BUILT ACE_wrappers
 %else
@@ -1290,12 +1295,13 @@ cp -R ${ACE_ROOT}/rpmbuild/tao %{buildroot}%{_sysconfdir}/tao
 
 %if %{defined suse_version}
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
-cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/init.d/* %{buildroot}%{_sysconfdir}/init.d
-cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/tao/* %{buildroot}%{_sysconfdir}/tao
+mkdir -p %{buildroot}%{_localstatedir}/adm
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/init.d/* %{buildroot}%{_sysconfdir}/init.d/
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/fillup-templates/* %{buildroot}%{_localstatedir}/adm/
 %else
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
-cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/rc.d/init.d/* %{buildroot}%{_sysconfdir}/rc.d/init.d
-cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/tao/* %{buildroot}%{_sysconfdir}/tao
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/rc.d/init.d/* %{buildroot}%{_sysconfdir}/rc.d/init.d/
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/tao/* %{buildroot}%{_sysconfdir}/tao/
 %endif
 
 %if %{defined suse_version}
diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosconcurrency.opt b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosconcurrency
index 3db9ca68639..3db9ca68639 100644..100755
--- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosconcurrency.opt
+++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosconcurrency
diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosevent.opt b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosevent
index 4920d28382e..4920d28382e 100644..100755
--- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosevent.opt
+++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosevent
diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming.opt b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnaming
index 1a805f0ebcb..1a805f0ebcb 100644..100755
--- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming.opt
+++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnaming
diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnotification.opt b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnotification
index 3501d02a003..3501d02a003 100644..100755
--- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnotification.opt
+++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnotification
diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-costrading.opt b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-costrading
index edb136a7564..edb136a7564 100644..100755
--- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-costrading.opt
+++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-costrading
diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-rtevent.opt b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-rtevent
index 1939fb54500..1939fb54500 100644..100755
--- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-rtevent.opt
+++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-rtevent