Update to 3.13

Also changed ACE TAO URL away from one that always is the latest one to
one that points to a fixed patch version.

2 files changed, 33 insertions, 56 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ce3918a54462..74beb35388e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,65 @@
-# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Maintainer: Fred Hornsey <hornseyf@objectcomputing.com>
+# Former Maintainer: Brian Bidulock <bidulock@openss7.org>
 #
 pkgname=opendds
 _pkgname=OpenDDS
-pkgver=3.5.1
-pkgrel=2
+pkgver=3.13
+pkgrel=1
+_oci_ace_tao_patch=15
 pkgdesc="Open source C++ implementation of OMG Data Distribution Service (DDS)"
 arch=('i686' 'x86_64')
 url="http://www.opendds.org/"
 license=('custom')
 depends=('perl' 'bash')
+provides=('ace', 'tao')
 options=('!buildflags')
 install=opendds.install
 source=(
-    "http://download.ociweb.com/TAO-2.2a/ACE+TAO-2.2a_with_latest_patches_NO_makefiles.tar.gz"
-    "http://download.ociweb.com/$_pkgname/$_pkgname-$pkgver.tar.gz"
-    build.patch
-    tao-cosnaming.service
-    )
-md5sums=('ba295977283364c4e03375442d2c1648'
-         'aac9eaf951b9eabdd75c4365946f06d0'
-         'fe01901b585b7d52724847aab9402775'
-         '63fba1c486fb3ed8b216e0b456b50988')
+  "http://download.ociweb.com/TAO-2.2a_patches/ACE+TAO-2.2a_p${_oci_ace_tao_patch}_complete_NO_makefiles.tar.gz"
+  "http://download.ociweb.com/OpenDDS/OpenDDS-$pkgver.tar.gz"
+  build.patch
+  tao-cosnaming.service
+)
+md5sums=(
+  # ACE+TAO-2.2a_pPATCH_complete_NO_makefiles.tar.gz
+  '2ccae8afe84ef9978cb6a1ab21b91402'
+  # OpenDDS-VERSION.tar.gz
+  '0ff8fed7b1590f460ca0d6ae3de219ec'
+  # build.patch
+  'd8dda850a09ba6ba621be2eef7bc9329'
+  # tao-cosnaming.service
+  '63fba1c486fb3ed8b216e0b456b50988'
+)
 
 prepare() {
   cd "$srcdir"
+  mv "OpenDDS-$pkgver" OpenDDS
   patch -Np1 -b -z .orig -i ../build.patch
 }
 
 build() {
-  cd DDS
-  DOC_ROOT="$srcdir/ACE_wrappers" \
-  ACE_ROOT="$DOC_ROOT/ACE" \
-  TAO_ROOT="$DOC_ROOT/ACE/TAO" \
-  CIAO_ROOT="$DOC_ROOT/ACE/CIAO" \
-  DANCE_ROOT="$DOC_ROOT/ACE/DAnCE" \
-  DDS_ROOT="$srcdir/DDS" \
-  MPC_ROOT="$DOC_ROOT/MPC" \
+  cd "$srcdir/OpenDDS"
+  ACE_ROOT="$srcdir/ACE_wrappers" \
+  TAO_ROOT="$ACE_ROOT/TAO" \
+  MPC_ROOT="$ACE_ROOT/MPC" \
   ./configure \
-    --ace="$srcdir/ACE_wrappers" \
-    --tao="$srcdir/ACE_wrappers/TAO"
+    --prefix="/usr" \
+    --no-tests
   make
 }
 
 package() {
-  cd DDS
-  sh ./setenv.sh
+  source "$srcdir/OpenDDS/setenv.sh"
+  cd "$DDS_ROOT"
   make INSTALL_PREFIX="/usr" DESTDIR="$pkgdir" install
   cd "$srcdir"
   install -Dm644 ACE_wrappers/rpmbuild/etc/tao/tao-cosnaming.conf "$pkgdir/etc/tao/tao-cosnaming.conf"
   install -Dm644 ACE_wrappers/rpmbuild/ace-tao-init-fedora/tao/tao-cosnaming.opt "$pkgdir/etc/tao/tao-cosnaming.opt"
-  install -Dm644 tao-cosnaming.service "$pkgdir/etc/systemd/system/tao-cosnaming.service"
+  install -Dm644 tao-cosnaming.service "$pkgdir/usr/lib/systemd/system/tao-cosnaming.service"
   install -dm755 "$pkgdir/usr/lib/tmpfiles.d"
   printf 'd /run/tao 0750 tao tao\n' >"$pkgdir/usr/lib/tmpfiles.d/tao.conf"
-  install -Dm644 DDS/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE.opendds"
-  install -Dm644 ACE_wrappers/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE.docorb"
+  install -Dm644 "$DDS_ROOT/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/opendds_LICENSE"
+  install -Dm644 ACE_wrappers/COPYING "$pkgdir/usr/share/licenses/$pkgname/acetao_LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/build.patch b/build.patch
index 2e0f759630a8..fcf9dfd4fda6 100644
--- a/build.patch
+++ b/build.patch
@@ -99,32 +99,3 @@ diff -up src/ACE_wrappers/TAO/TAO_IDL/tao_idl.mpc.orig src/ACE_wrappers/TAO/TAO_
    }
  
    Source_Files {
-diff -up src/DDS/dds/DdsDcps.mpc.orig src/DDS/dds/DdsDcps.mpc
---- src/DDS/dds/DdsDcps.mpc.orig	2014-09-25 01:33:21.000000000 -0600
-+++ src/DDS/dds/DdsDcps.mpc	2014-09-25 01:34:01.000000000 -0600
-@@ -202,8 +202,8 @@ project(OpenDDS_Dcps): taolib, core, cov
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	echo export DDS_ROOT=$(INSTALL_PREFIX)/share/dds> $(INSTALL_PREFIX)/share/dds/dds-devel.sh"
--"	@$(MKDIR) $(INSTALL_PREFIX)/share/dds/dds"
--"	ln -sf $(INSTALL_PREFIX)/include/dds/Version.h $(INSTALL_PREFIX)/share/dds/dds"
-+"	echo export DDS_ROOT=$(INSTALL_PREFIX)/share/dds> $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds-devel.sh"
-+"	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
-+"	ln -sf $(INSTALL_PREFIX)/include/dds/Version.h $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
-   }
- }
-diff -up src/DDS/dds/idl/opendds_idl.mpc.orig src/DDS/dds/idl/opendds_idl.mpc
---- src/DDS/dds/idl/opendds_idl.mpc.orig	2010-09-03 12:05:53.000000000 -0600
-+++ src/DDS/dds/idl/opendds_idl.mpc	2014-09-24 23:41:09.000000000 -0600
-@@ -30,8 +30,8 @@ project: aceexe, crosscompile, install {
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	@$(MKDIR) $(INSTALL_PREFIX)/share/dds/bin"
--"	ln -sf $(INSTALL_PREFIX)/bin/opendds_idl $(INSTALL_PREFIX)/share/dds/bin"
-+"	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
-+"	ln -sf $(INSTALL_PREFIX)/bin/opendds_idl $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
-   }
- 
- }