ChangeLogTag:Tue Feb 18 21:39:29 UTC 2014 Steve Huston <shuston@riverace.com>

1 files changed, 53 insertions, 66 deletions

diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 3a467ce6b48..9ce0e53bdb7 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -10,7 +10,6 @@
 #                    --with zlib         (Zlib compressor)
 #                    --with bzip2        (Bzip2 compressor)
 #                    --with tao          (TAO/CIAO)
-#                    --without autoconf  (Use MPC to build)
 #                    --without fltk      (No ftlk support)
 #                    --without tk        (No tk support)
 #                    --without xt        (No xt support)
@@ -25,7 +24,7 @@
 %{!?_with_opt: %{!?_without_opt: %define _with_opt --with-opt}}
 %{!?_with_zlib: %{!?_without_zlib: %define _with_zlib --with-zlib}}
 %{!?_with_bzip2: %{!?_without_bzip2: %define _with_bzip2 --with-bzip2}}
-%{!?_with_tao: %{!?_without_tao: %define _with_tao --with-tao}}
+%{!?_with_tao: %{!?_without_tao: %global _with_tao --with-tao}}
 %{!?_with_ftlk: %{!?_without_ftlk: %define _without_ftlk --without-ftlk}}
 %{!?_with_tk: %{!?_without_tk: %define _without_tk --without-tk}}
 %{!?_with_xt: %{!?_without_xt: %define _without_xt --without-xt}}
@@ -48,8 +47,8 @@
 %{?_with_inline: %{?_without_inline: %{error: both _with_inline and _without_inline}}}
 %{?_with_versioned: %{?_without_versioned: %{error: both _with_versioned and _without_versioned}}}
 
-%{!?skip_make:%define skip_make 0}
-%{!?make_nosrc:%define make_nosrc 0}
+%{!?skip_make:%global skip_make 0}
+%{!?make_nosrc:%global make_nosrc 0}
 
 %define have_fox 0
 
@@ -57,12 +56,11 @@
 %define OPTTAG .O0
 %endif
 
-%if 0%{?_without_tao:1}
-Summary:      The ADAPTIVE Communication Environment (ACE)
 Name:         ace-tao
-%else
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 Summary:      The ADAPTIVE Communication Environment (ACE) and The ACE ORB (TAO)
-Name:         ace-tao
+%else
+Summary:      The ADAPTIVE Communication Environment (ACE)
 %endif
 
 Version:      %{ACEVER}
@@ -76,12 +74,12 @@ Release:      1%{?OPTTAG}%{?dist}
 Group:        Development/Libraries/C and C++
 URL:          http://www.cs.wustl.edu/~schmidt/ACE.html
 License:      DOC License
-%if 0%{?_without_tao:1}
-Source0:      http://download.dre.vanderbilt.edu/previous_versions/ACE-src-%{ACEVER}.tar.gz
-%else
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 Source0:      http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-%{ACEVER}.tar.gz
-Source1:      ace-tao-rpmlintrc
+%else
+Source0:      http://download.dre.vanderbilt.edu/previous_versions/ACE-src-%{ACEVER}.tar.gz
 %endif
+Source1:      ace-tao-rpmlintrc
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define _extension .gz
@@ -166,16 +164,16 @@ BuildRequires: fox16-devel
 %endif
 
 %if 0%{?suse_version}
-%define ace_packages ace ace-xml ace-gperf ace-kokyu
-%define tao_packages tao tao-utils tao tao-cosnaming tao-cosevent tao-cosnotification tao-costrading tao-rtevent tao-cosconcurrency
-%define all_ace_packages %{?ace_packages} %{?fltk_pac} %{?tk_pac} %{?qt_pac} %{?fox_pac} %{?xt_pac}
-%if %{?_with_tao:1}%{!?_with_tao:0}
-%define all_tao_packages %{?tao_packages} %{?tao_fl_pac} %{?tao_qt_pac} %{?tao_xt_pac} %{?tao_tk_pac}
+%global ace_packages ace ace-xml ace-gperf ace-kokyu
+%global tao_packages tao tao-utils tao tao-cosnaming tao-cosevent tao-cosnotification tao-costrading tao-rtevent tao-cosconcurrency
+%global all_ace_packages %{?ace_packages} %{?fltk_pac} %{?tk_pac} %{?qt_pac} %{?fox_pac} %{?xt_pac}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
+%global all_tao_packages %{?tao_packages} %{?tao_fl_pac} %{?tao_qt_pac} %{?tao_xt_pac} %{?tao_tk_pac}
 %endif
-%define debug_package_requires %{all_ace_packages} %{all_tao_packages}
+%global debug_package_requires %{all_ace_packages} %{?all_tao_packages}
 %endif
 
-%if %make_nosrc
+%if 0%{?make_nosrc}
 # Leave out the distro for now
 NoSource: 0
 %endif
@@ -193,8 +191,6 @@ service initialization, interprocess communication, shared memory
 management, message routing, dynamic (re)configuration of distributed
 services, concurrent execution and synchronization.
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
-
 TAO is a real-time implementation of CORBA built using the framework
 components and patterns provided by ACE. TAO contains the network
 interface, OS, communication protocol, and CORBA middleware components
@@ -202,8 +198,6 @@ and features. TAO is based on the standard OMG CORBA reference model,
 with the enhancements designed to overcome the shortcomings of
 conventional ORBs for high-performance and real-time applications.
 
-%endif
-
 # ---------------- ace ----------------
 
 %package -n     ace
@@ -521,7 +515,7 @@ needed to generate a "project" file for various build tools. These tools
 include Make, NMake, Visual C++ 6, Visual C++ 7, etc.
 
 # ---------------- tao ----------------
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 
 %package -n     tao
 Summary:        The ACE ORB (TAO)
@@ -828,7 +822,7 @@ using the XtResource_Factory.
 export ACE_ROOT=$(pwd)
 export MPC_ROOT=$ACE_ROOT/MPC
 export LD_LIBRARY_PATH=$ACE_ROOT/lib
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 export TAO_ROOT=$ACE_ROOT/TAO
 export CIAO_ROOT=$TAO_ROOT/CIAO
 export DANCE_ROOT=$TAO_ROOT/DAnCE
@@ -992,18 +986,14 @@ EOF
 %endif
 %endif
 
-# Need to regenerate all of the GNUMakefiles ...
-%if 0%{?_without_tao:1}
-bin/mwc.pl -type gnuace ACE.mwc
-%else
+# Need to regenerate all of the GNUMakefiles
+# then make everything that we have generated for
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 bin/mwc.pl -type gnuace TAO/TAO_ACE.mwc
-%endif
-
-# Make everything that we have generated for
-%if 0%{?_without_tao:1}
-make %{?_smp_mflags} -C $ACE_ROOT
-%else
 make %{?_smp_mflags} -C $TAO_ROOT
+%else
+bin/mwc.pl -type gnuace ACE.mwc
+make %{?_smp_mflags} -C $ACE_ROOT
 %endif
 
 %endif
@@ -1019,7 +1009,7 @@ make %{?_smp_mflags} -C $TAO_ROOT
 %install
 
 export ACE_ROOT=$(pwd)
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 export TAO_ROOT=$ACE_ROOT/TAO
 export CIAO_ROOT=$TAO_ROOT/CIAO
 export DANCE_ROOT=$TAO_ROOT/DAnCE
@@ -1038,7 +1028,7 @@ install $INSTLIBS %{buildroot}%{_libdir}
 INSTLIBS=`ls ${ACE_ROOT}/lib/libKokyu.so.%{ACEVERSO}`
 install $INSTLIBS %{buildroot}%{_libdir}
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 # TAO libraries
 INSTLIBS=`ls ${ACE_ROOT}/lib/libTAO*.so.%{TAOVERSO}`
 install $INSTLIBS %{buildroot}%{_libdir}
@@ -1053,7 +1043,7 @@ install -d %{buildroot}%{_sbindir}
 
 # Rename the TAO service binaries:
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 
 install ${ACE_ROOT}/TAO/orbsvcs/Naming_Service/tao_cosnaming \
     %{buildroot}%{_sbindir}/tao-cosnaming
@@ -1105,7 +1095,7 @@ BASEHDR=`find \
     ACEXML/parser/parser \
     Kokyu \
     -name '*.h' -not -name 'config-*'`
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 TAO_MM_OPTS="-I TAO -I TAO/orbsvcs -I TAO/orbsvcs/orbsvcs"
 BASEHDR="$BASEHDR `find \
     TAO/tao \
@@ -1122,7 +1112,7 @@ for j in $BASEHDR; do
             -x c++ - -MM -MF mmout 2>> rawhdrs.log && cat mmout || true;
 done > mmraw.list
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 # Append IDL headers to the raw list.
 find \
     TAO/tao \
@@ -1145,7 +1135,7 @@ cat mmraw.list |\
 
 # Add missing headers.
 echo ace/QtReactor/QtReactor.h >> allhdrs.list
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 echo TAO/tao/QtResource/QtResource_Factory.h >> allhdrs.list
 echo TAO/tao/QtResource/QtResource_Loader.h >> allhdrs.list
 echo TAO/tao/PortableServer/get_arg.h >> allhdrs.list
@@ -1213,7 +1203,7 @@ echo '%defattr(-,root,root,-)' > kokyu-headers.list
 sort -u < kokyu-headers.tmp >> kokyu-headers.list
 rm -f kokyu-headers.tmp
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 echo '%defattr(-,root,root,-)' > tao-headers.list
 sort -u < tao-headers.tmp >> tao-headers.list
 rm -f tao-headers.tmp
@@ -1224,7 +1214,7 @@ rm -f tao-headers.tmp
 # Will also be needed for mpc.
 install -d %{buildroot}%{_bindir}
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 
 # install the TAO_IDL compiler
 install -d %{buildroot}%{_libdir}
@@ -1277,7 +1267,7 @@ install -d %{buildroot}%{_datadir}/ace
 install -d %{buildroot}%{_datadir}/ace/include
 install -d %{buildroot}%{_datadir}/ace/include/makeinclude
 install -d %{buildroot}%{_datadir}/mpc
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 install -d %{buildroot}%{_datadir}/tao
 install -d %{buildroot}%{_datadir}/tao/orbsvcs
 install -d %{buildroot}%{_datadir}/tao/MPC
@@ -1302,7 +1292,7 @@ for mk_macros in \
         install ${ACE_ROOT}/include/makeinclude/$mk_macros %{buildroot}%{_datadir}/ace/include/makeinclude)
 done
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 install ${TAO_ROOT}/rules.tao.GNU %{buildroot}%{_datadir}/tao
 %endif
 
@@ -1322,13 +1312,13 @@ install ${ACE_ROOT}/bin/add_rel_link.sh %{buildroot}%{_datadir}/ace/bin
 install ${ACE_ROOT}/bin/{ACEutils,Uniqueid}.pm %{buildroot}%{_datadir}/ace/bin
 
 ln -sfn %{_includedir}/ace %{buildroot}%{_datadir}/ace
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 ln -sfn %{_includedir}/tao %{buildroot}%{_datadir}/tao
 ln -sfn %{_includedir}/orbsvcs %{buildroot}%{_datadir}/tao/orbsvcs
 %endif
 ln -sfn %{_libdir} %{buildroot}%{_datadir}/ace/lib
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 cp -a ${TAO_ROOT}/MPC/* %{buildroot}%{_datadir}/tao/MPC
 
 # Set TAO_IDL setting for the user
@@ -1349,7 +1339,7 @@ cat > %{buildroot}%{_sysconfdir}/profile.d/ace-devel.sh <<EOF
 ACE_ROOT=/usr/share/ace
 export ACE_ROOT
 EOF
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 cat > %{buildroot}%{_sysconfdir}/profile.d/tao-devel.sh <<EOF
 TAO_ROOT=/usr/share/tao
 export TAO_ROOT
@@ -1363,14 +1353,14 @@ ln -sfn %{_datadir}/ace/bin/mwc.pl %{buildroot}%{_bindir}/mwc.pl
 # ================================================================
 # Manuals
 # ================================================================
-%if %{?_with_tao:1}%{!?_with_tao:0}
 install -d %{buildroot}%{_mandir}
 install -d %{buildroot}%{_mandir}/man1
-install ${TAO_ROOT}/TAO_IDL/tao_idl.1 %{buildroot}%{_mandir}/man1
 install ${ACE_ROOT}/apps/gperf/ace_gperf.1 %{buildroot}%{_mandir}/man1
+%if 0%{?_with_tao:1}%{?_without_tao:0}
+install ${TAO_ROOT}/TAO_IDL/tao_idl.1 %{buildroot}%{_mandir}/man1
+%endif
 install -d  %{buildroot}%{_infodir}
 install ${ACE_ROOT}/apps/gperf/ace_gperf.info %{buildroot}%{_infodir}
-%endif
 
 # ================================================================
 # Create lists of symlinked so's.  We need two lists because we need
@@ -1403,13 +1393,13 @@ comm -2 -3 all-so.list svc-so.list > nonsvc-so.list
 # Generate file lists.
 grep libACE svc-so.list > ace-svc-so.list
 grep libACE nonsvc-so.list > ace-nonsvc-so.list
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 grep libTAO svc-so.list > tao-svc-so.list
 grep libTAO nonsvc-so.list > tao-nonsvc-so.list
 %endif
 
 # Concatenate file lists as neccessary
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 cat tao-headers.list tao-nonsvc-so.list > tao-devel-files.list
 %endif
 cat ace-headers.list ace-nonsvc-so.list > ace-devel-files.list
@@ -1425,7 +1415,7 @@ rm -rf %{buildroot}
 # pre install
 # ================================================================
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 
 # ---------------- tao-cosnaming ----------------
 
@@ -1560,7 +1550,7 @@ exit 0
 /sbin/ldconfig
 %endif
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 
 # ---------------- tao ----------------
 
@@ -1670,8 +1660,6 @@ exit 0
 # pre uninstall
 # ================================================================
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
-
 # ---------------- ace-gperf ----------------
 
 %preun -n ace-gperf
@@ -1680,6 +1668,9 @@ if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/ace_gperf.info%{_extension} %{_infodir}/dir
 fi
 
+
+%if 0%{?_with_tao:1}%{?_without_tao:0}
+
 # ---------------- tao-cosnaming ----------------
 
 %preun -n tao-cosnaming
@@ -1815,7 +1806,7 @@ fi
 /sbin/ldconfig
 %endif
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 
 # ---------------- tao ----------------
 
@@ -2024,8 +2015,6 @@ fi
 
 # ---------------- ace-gperf ----------------
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
-
 %files -n ace-gperf
 %defattr(-,root,root,-)
 %{_bindir}/ace_gperf
@@ -2038,8 +2027,6 @@ fi
 %doc README
 %doc VERSION
 
-%endif
-
 # ---------------- ace-xml-devel ----------------
 
 %files -n ace-xml-devel -f acexml-headers.list
@@ -2248,7 +2235,7 @@ fi
 
 # ---------------- tao ----------------
 
-%if %{?_with_tao:1}%{!?_with_tao:0}
+%if 0%{?_with_tao:1}%{?_without_tao:0}
 
 # NOTE - Some of the TAO service modules need to be found by dlopen at
 # runtime.  Currently this means these specific .so files need to be
@@ -2656,9 +2643,9 @@ fi
 %endif
 
 %changelog
-* Fri Jan 31 2013 Steve Huston <shuston@riverace.com> 6.2.5
-- Added rpmbuild options "--with-tao" and "--without-tao";l defaults to 'with'.
-  Allows building ACE only (--without-tao)
+* Fri Jan 31 2014 Steve Huston <shuston@riverace.com> 6.2.5
+- Added rpmbuild options "--with tao" and "--without tao"; defaults to 'with'.
+  Allows building ACE only (--without tao)
 
 * Thu Aug 11 2011 Thomas Lockhart <lockhart@fourpalms.org> 6.0.3-54
 - Parameterize code inlining. Defaults to not inlining which was the previous behavior.