diff options
Diffstat (limited to 'ACE/rpmbuild/ace-tao-ciao.spec')
| -rw-r--r-- | ACE/rpmbuild/ace-tao-ciao.spec | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/ACE/rpmbuild/ace-tao-ciao.spec b/ACE/rpmbuild/ace-tao-ciao.spec index f4e3d2ed84e..a6bc9baeee2 100644 --- a/ACE/rpmbuild/ace-tao-ciao.spec +++ b/ACE/rpmbuild/ace-tao-ciao.spec @@ -1,7 +1,9 @@ # Set the version number here. -%define ACEVER 5.7.0 -%define TAOVER 1.7.0 -%define CIAOVER 0.7.0 +%define ACEVER 5.7 +%define TAOVER 1.7 +%define CIAOVER 0.7 +# Set is_major_ver if the version is X.Y instead X.Y.Z +%define is_major_ver 1 # TODO # Test whether a TAO app with MPC can be build against MPC installed version @@ -49,6 +51,7 @@ %{!?skip_make:%define skip_make 0} %{!?make_nosrc:%define make_nosrc 0} +%{!?is_major_ver:%define is_major_ver 0} %define have_fox 0 @@ -1068,9 +1071,17 @@ $MAKECMD -C $TAO_ROOT/utils # install # ================================================================ +# For major releases the package version will be the shortened version +# tuple and the shared-object version needs a placeholder '.0' +%if %is_major_ver +%define ACEVERSO %{ACEVER}.0 +%define TAOVERSO %{TAOVER}.0 +%define CIAOVERSO %{CIAOVER}.0 +%else %define ACEVERSO %{ACEVER} %define TAOVERSO %{TAOVER} %define CIAOVERSO %{CIAOVER} +%endif %install @@ -1286,14 +1297,12 @@ install ${ACE_ROOT}/bin/tao_nslist %{buildroot}%{_bindir}/tao_nslist install -d %{buildroot}%{_sysconfdir} cp -R ${ACE_ROOT}/rpmbuild/logrotate.d %{buildroot}%{_sysconfdir}/logrotate.d -cp -R ${ACE_ROOT}/rpmbuild/tao %{buildroot}%{_sysconfdir}/tao +cp -R ${ACE_ROOT}/tao %{buildroot}%{_sysconfdir}/tao %if %{defined suse_version} -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 +cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse %{buildroot}%{_sysconfdir} %else -cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/rc.d/* %{buildroot}%{_sysconfdir}/rc.d -cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/tao/* %{buildroot}%{_sysconfdir}/tao +cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora %{buildroot}%{_sysconfdir} %endif %if %{defined suse_version} @@ -2655,9 +2664,6 @@ fi # ================================================================ %changelog -* Wed Jun 24 2009 Johnny Willemsen <jwillemsen@remedy.nl> - 5.7.0-0 -- New minor release - * Fri Mar 13 2009 Johnny Willemsen <jwillemsen@remedy.nl> - 5.6.8-2 - Removed specific OS checks |