[omniORB] omniORB 4.0.2 and omniORBpy 2.2 released
Thomas Lockhart
lockhart at fourpalms.org
Sat Aug 9 09:10:11 BST 2003
> omniORB version 4.0.2 and omniORBpy 2.2 are now available.
I have merged in the earlier RPM spec file changes from Duncan and built
-2 versions of the omniORB RPMs (and reposted -1 versions of omniORBpy).
I've attached patches against the spec files in the release tarballs. At
the moment, I'm using a (slightly modified) bootscript from Sander
(attached also) rather than the script in the tarball, Also, I'm using
the name "omniNames" rather than "omninames" for directories and script
names, which better matches the name of the application but mixes case
in an atypical way.
Duncan, the conventions used in the boot script are a bit different than
that in the tarball version. Perhaps you and Sander (and other
interested parties) could review it and we can converge on a version to
fold back into the tarball?
- Tom
Sander, I see that you've inverted the directory structure for posting
RPMs to put the version number near the top of the tree (probably a good
idea). I'm inclined to switch up my directories to match, but can't copy
your index.html file directly since it has some nice banner stuff. Can I
copy other portions or should we keep it separate?
-------------- next part --------------
*** ../BUILD/omniORB-4.0.2/contrib/RPMs/omniORB.spec 2003-08-06 15:12:22.000000000 -0700
--- omniORB.spec 2003-08-09 07:16:18.000000000 -0700
***************
*** 1,85 ****
- %define version 4.0.2
- %define release 1
- %define name omniORB
- %define lib_major 4
- %define lib_name lib%{name}%{lib_major}
- %define py_ver %(python -c 'import sys;print(sys.version[0:3])')
- %define prefix /usr
-
Summary: Object Request Broker (ORB)
! Name: %{name}
! Version: %{version}
! Release: %{release}
! License: GPL / LGPL
! Group: System/Libraries
! Source0: omniORB-%{version}.tar.gz
# omniORB.cfg is a (possibly modified) version of sample.cfg in the omniORB distro.
! #Source1: omniORB.cfg
! #Patch0: omniORB.patches
! URL: http://omniorb.sourceforge.net/
! #Provides: corba
! BuildRequires: python >= 2.0 glibc-devel openssl
! Buildroot: %{_tmppath}/%{name}-%{version}-root
! #BuildArch: i586
%description
! omniORB is an Object Request Broker (ORB) which implements
specification 2.6 of the Common Object Request Broker Architecture
! (CORBA). This package contains the libraries needed to run programs
dynamically linked with %{name}.
# servers
%package -n %{name}-servers
Summary: Utility programs
! Group: Development/C++
! Requires: %{name} = %{version}-%{release}
! Provides: libomniorb-servers = %{version}-%{release} %{name}-servers = %{version}-%{release}
! #BuildArch: i586
%description -n %{name}-servers
! omniORB CORBA services including a Naming Service.
# utilities
%package -n %{name}-utils
Summary: Utility programs
! Group: Development/C++
! Requires: %{name} = %{version}-%{release}
! Provides: libomniorb-utils = %{version}-%{release} %{name}-utils = %{version}-%{release}
! #BuildArch: i586
%description -n %{name}-utils
! This package includes utility programs which may be useful at runtime.
# devel part of the bundle
%package -n %{name}-devel
Summary: Header files and libraries needed for %{name} development
! Group: Development/C++
! Requires: %{name} = %{version}-%{release}
! Provides: libomniorb-devel = %{version}-%{release} %{name}-devel = %{version}-%{release}
! #BuildArch: i586
%description -n %{name}-devel
! This package includes the header files and libraries needed for
developing programs using %{name}.
# docs and examples are in a separate package
%package -n %{name}-doc
Summary: Documentation and examples for %{name}
! Group: Development/C++
! #Requires: %{name} = %{version}
! #BuildArch: noarch
%description -n %{name}-doc
! This package includes developer documentation including examples.
%prep
! %setup -n omniORB-%{version}
#%patch0 -p1
./configure --prefix=%{prefix} --with-openssl=/usr
--- 1,87 ----
Summary: Object Request Broker (ORB)
! Name: omniORB
! Version: 4.0.2
! Release: 2
! License: GPL / LGPL
! Group: System/Libraries
! Source0: %{name}-%{version}.tar.gz
# omniORB.cfg is a (possibly modified) version of sample.cfg in the omniORB distro.
! #Source1: omniORB.cfg
! Source2: omniNames
! #Patch0: omniORB.patches
! Prefix: /usr
! Prereq: /sbin/chkconfig /sbin/ldconfig
! URL: http://omniorb.sourceforge.net/
! #Provides: corba
! BuildRequires: python >= 2.0 glibc-devel openssl
! Buildroot: %{_tmppath}/%{name}-%{version}-root
! #BuildArch: i586
%description
! %{name} is an Object Request Broker (ORB) which implements
specification 2.6 of the Common Object Request Broker Architecture
! (CORBA). Contains the libraries needed to run programs
dynamically linked with %{name}.
# servers
%package -n %{name}-servers
Summary: Utility programs
! Group: Development/C++
! Requires: %{name} = %{version}-%{release}
! Provides: libomniorb-servers = %{version}-%{release} %{name}-servers = %{version}-%{release}
%description -n %{name}-servers
! %{name} CORBA services including a Naming Service.
!
! %package -n %{name}-bootscripts
! Summary: Utility programs
! Group: Development/C++
! Requires: %{name}-servers = %{version}-%{release}
! Provides: %{name}-bootscripts = %{version}-%{release}
!
! %description -n %{name}-bootscripts
! Automatic starting of the %{name} CORBA Naming Service.
# utilities
%package -n %{name}-utils
Summary: Utility programs
! Group: Development/C++
! Requires: %{name} = %{version}-%{release}
! Provides: libomniorb-utils = %{version}-%{release} %{name}-utils = %{version}-%{release}
%description -n %{name}-utils
! %{name} utility programs which may be useful at runtime.
# devel part of the bundle
%package -n %{name}-devel
Summary: Header files and libraries needed for %{name} development
! Group: Development/C++
! Requires: %{name} = %{version}-%{release}
! Provides: libomniorb-devel = %{version}-%{release} %{name}-devel = %{version}-%{release}
%description -n %{name}-devel
! The header files and libraries needed for
developing programs using %{name}.
# docs and examples are in a separate package
%package -n %{name}-doc
Summary: Documentation and examples for %{name}
! Group: Development/C++
! #Requires: %{name} = %{version}
%description -n %{name}-doc
! Developer's documentation and examples.
!
+ %define py_ver %(python -c 'import sys;print(sys.version[0:3])')
%prep
! %setup -n %{name}-%{version}
#%patch0 -p1
./configure --prefix=%{prefix} --with-openssl=/usr
***************
*** 92,119 ****
%install
make DESTDIR=$RPM_BUILD_ROOT install
! mv $RPM_BUILD_ROOT/%{prefix}/bin/catior $RPM_BUILD_ROOT/%{prefix}/bin/catior.omni
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
- cp etc/init.d/omninames $RPM_BUILD_ROOT/etc/rc.d/init.d/omninames
- chmod +x $RPM_BUILD_ROOT/etc/rc.d/init.d/omninames
#cp %{SOURCE1} $RPM_BUILD_ROOT/etc/
! mkdir -p $RPM_BUILD_ROOT/var/omninames
!
! mkdir -p $RPM_BUILD_ROOT/%{prefix}/man/man1
cp -r man/* $RPM_BUILD_ROOT/%{prefix}/man
! cp sample.cfg $RPM_BUILD_ROOT/etc/omniORB.cfg
%clean
! [ -z $RPM_BUILD_ROOT ] || rm -rf $RPM_BUILD_ROOT
%post -n %{name} -p /sbin/ldconfig
-
%postun -n %{name} -p /sbin/ldconfig
! # main package includes libraries and servers
%files
%defattr (-,root,root)
%doc CREDITS COPYING COPYING.LIB
--- 94,135 ----
%install
make DESTDIR=$RPM_BUILD_ROOT install
! # Remove little daemon script since we use the init script instead
! rm -rf $RPM_BUILD_ROOT/%prefix/bin/omniNames-daemon
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
#cp %{SOURCE1} $RPM_BUILD_ROOT/etc/
+ cp sample.cfg $RPM_BUILD_ROOT/etc/omniORB.cfg
+ cp %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/
! mkdir -p $RPM_BUILD_ROOT/%{prefix}/man/man{1,5}
cp -r man/* $RPM_BUILD_ROOT/%{prefix}/man
! mkdir -p $RPM_BUILD_ROOT/var/log/omniNames
! mkdir -p $RPM_BUILD_ROOT/var/lib/omniMapper
!
! # Rename catior to avoid naming conflict with TAO
! mv $RPM_BUILD_ROOT/%{prefix}/bin/catior $RPM_BUILD_ROOT/%{prefix}/bin/catior.omni
! mv $RPM_BUILD_ROOT/%prefix/man/man1/catior.1 $RPM_BUILD_ROOT/%prefix/man/man1/catior.omni.1
!
%clean
! rm -rf $RPM_BUILD_ROOT
+ %pre
%post -n %{name} -p /sbin/ldconfig
%postun -n %{name} -p /sbin/ldconfig
! %post bootscripts
! /sbin/chkconfig --add omniNames
!
! %preun bootscripts
! /sbin/chkconfig --del omniNames
! rm -rf /var/log/omniNames/*
! rm -rf /var/lib/omniMapper/*
!
!
! # main package includes libraries and copyright info
%files
%defattr (-,root,root)
%doc CREDITS COPYING COPYING.LIB
***************
*** 124,141 ****
%files -n %{name}-servers
%defattr (-,root,root)
- %dir %attr(754,root,root) /var/omninames
- %config(noreplace) %_sysconfdir/rc.d/init.d/*
%attr(644,root,man) %prefix/man/man1/omniNames*
#%attr(644,root,man) %prefix/man/man1/omniMapper*
%prefix/bin/omniMapper
%prefix/bin/omniNames
! %prefix/bin/omniNames-daemon
%files -n %{name}-utils
%defattr (-,root,root)
%attr(644,root,man) %prefix/man/man1/catior*
%attr(644,root,man) %prefix/man/man1/genior*
%attr(644,root,man) %prefix/man/man1/nameclt*
%prefix/bin/catior.omni
--- 140,164 ----
%files -n %{name}-servers
%defattr (-,root,root)
%attr(644,root,man) %prefix/man/man1/omniNames*
#%attr(644,root,man) %prefix/man/man1/omniMapper*
%prefix/bin/omniMapper
%prefix/bin/omniNames
! # Thin substitute for standard Linux init script
! #%prefix/bin/omniNames-daemon
!
!
! %files -n %{name}-bootscripts
! %defattr (-,root,root)
! %config(noreplace) %_sysconfdir/rc.d/init.d/*
! %dir %attr(754,root,root) /var/log/omniNames
! %dir %attr(754,root,root) /var/lib/omniMapper
%files -n %{name}-utils
%defattr (-,root,root)
%attr(644,root,man) %prefix/man/man1/catior*
+ #%attr(644,root,man) %prefix/man/man1/convertior*
%attr(644,root,man) %prefix/man/man1/genior*
%attr(644,root,man) %prefix/man/man1/nameclt*
%prefix/bin/catior.omni
***************
*** 155,163 ****
%prefix/lib/*.a
%prefix/lib/*.so
%prefix/include/*
%prefix/lib/python%{py_ver}/site-packages/omniidl/*
! %prefix/lib/python%{py_ver}/site-packages/omniidl_be/*.py*
! %prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/*.py*
%prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/header/*
%prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/skel/*
%prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/dynskel/*
--- 178,191 ----
%prefix/lib/*.a
%prefix/lib/*.so
%prefix/include/*
+ #%prefix/include/%{name}/*.idl
+ #%prefix/include/%{name}/COS/*.idl
+ #lib/omni/scripts/*
%prefix/lib/python%{py_ver}/site-packages/omniidl/*
! %prefix/lib/python%{py_ver}/site-packages/omniidl_be/*.py
! %prefix/lib/python%{py_ver}/site-packages/omniidl_be/*.pyc
! %prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/*.py
! %prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/*.pyc
%prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/header/*
%prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/skel/*
%prefix/lib/python%{py_ver}/site-packages/omniidl_be/cxx/dynskel/*
***************
*** 168,177 ****
%files -n %{name}-doc
%defattr(-,root,root)
%doc doc/*
- %doc src/examples
%changelog
* Wed Aug 6 2003 Duncan Grisby <dgrisby at apasphere.com> 4.0.2
- Bump version number.
--- 196,208 ----
%files -n %{name}-doc
%defattr(-,root,root)
%doc doc/*
%changelog
+ * Fri Aug 08 2003 Thomas Lockhart <lockhart at fourpalms.org> 4.0.2
+ - Rename catior man page to match catior.omni binary name
+ - Merge in Duncan's changes
+
* Wed Aug 6 2003 Duncan Grisby <dgrisby at apasphere.com> 4.0.2
- Bump version number.
-------------- next part --------------
*** ../BUILD/omniORBpy-2.2/contrib/RPMs/omniORBpy.spec 2003-08-06 15:33:16.000000000 -0700
--- omniORBpy.spec 2003-08-09 07:15:59.000000000 -0700
***************
*** 1,26 ****
- # omniORBpy RPM SPEC file
-
- %define version 2.2
- %define release 1
- %define name omniORBpy
- %define lib_major 2
- %define lib_name lib%{name}%{lib_major}
- %define py_ver %(python -c 'import sys;print(sys.version[0:3])')
- %define prefix /usr
-
Summary: Python Language Mapping for omniORB
! Name: %{name}
! Version: %{version}
! Release: %{release}
! License: GPL / LGPL
! Group: System/Libraries
! Source0: %{name}-%{version}.tar.gz
! #Patch0: omniORBpy.patches
! URL: http://omniorb.sourceforge.net/
! Requires: omniORB = 4.0.2
! Buildroot: %{_tmppath}/%{name}-%{version}-root
! BuildRequires: omniORB-devel
! #BuildArch: i586
%description
omniORBpy is a Python language mapping for the omniORB CORBA
--- 1,19 ----
Summary: Python Language Mapping for omniORB
! Name: omniORBpy
! Version: 2.2
! Release: 2
! License: GPL / LGPL
! Group: System/Libraries
! Source0: %{name}-%{version}.tar.gz
! #Patch0: omniORBpy.patches
! Prefix: /usr
! #Prereq:
! URL: http://omniorb.sourceforge.net/
! Requires: omniORB = 4.0.2
! #Provides: corba
! BuildRequires: omniORB-devel python >= 2.0
! Buildroot: %{_tmppath}/%{name}-%{version}-root
! #BuildArch: i586
%description
omniORBpy is a Python language mapping for the omniORB CORBA
***************
*** 30,54 ****
%package -n %{name}-devel
Summary: Header files and libraries needed for %{name} development
! Group: Development/Python
! Requires: %{name} = %{version}-%{release} omniORB-devel
! Provides: libomniorbpy-devel = %{version}-%{release} %{name}-devel = %{version}-%{release}
! #BuildArch: i586
%description -n %{name}-devel
! This package includes the header files and libraries needed for
! developing programs using %{name}.
# docs and examples are in a separate package
%package -n %{name}-doc
Summary: Documentation needed for %{name} development
! Group: Development/Python
! #Requires: %{name} = %{version}
! #BuildArch: noarch
%description -n %{name}-doc
! This package includes developer documentation including examples.
%prep
--- 23,46 ----
%package -n %{name}-devel
Summary: Header files and libraries needed for %{name} development
! Group: Development/Python
! Requires: %{name} = %{version}-%{release} omniORB-devel
! Provides: libomniorb-devel = %{version}-%{release} %{name}-devel = %{version}-%{release}
%description -n %{name}-devel
! The header files and libraries needed for developing programs using %{name}.
# docs and examples are in a separate package
%package -n %{name}-doc
Summary: Documentation needed for %{name} development
! Group: Development/Python
%description -n %{name}-doc
! Developer's documentation and examples.
!
!
! %define py_ver %(python -c 'import sys;print(sys.version[0:3])')
%prep
***************
*** 59,84 ****
# If necessary, use the configure option --with-omniorb=%{prefix}
./configure --prefix=%{prefix} --with-openssl=/usr
%build
make CCFLAGS+="$RPM_OPT_FLAGS" all
%install
make DESTDIR=$RPM_BUILD_ROOT install
! rm -f $RPM_BUILD_ROOT/lib/python%{py_ver}/site-packages/omniidl_be/__init__.py*
%clean
! [ -z $RPM_BUILD_ROOT ] || rm -rf $RPM_BUILD_ROOT
%post -n %{name} -p /sbin/ldconfig
%postun -n %{name} -p /sbin/ldconfig
# main package includes libraries and servers
%files
%defattr (-,root,root)
%doc COPYING.LIB
%doc bugfixes*
! %prefix/lib/python%{py_ver}/site-packages/_omni*.so*
%prefix/lib/python%{py_ver}/site-packages/*.py*
%prefix/lib/python%{py_ver}/site-packages/CosNaming/*.py*
%prefix/lib/python%{py_ver}/site-packages/CosNaming__POA/*.py*
--- 51,80 ----
# If necessary, use the configure option --with-omniorb=%{prefix}
./configure --prefix=%{prefix} --with-openssl=/usr
+
%build
make CCFLAGS+="$RPM_OPT_FLAGS" all
+
%install
make DESTDIR=$RPM_BUILD_ROOT install
! rm -rf $RPM_BUILD_ROOT%{prefix}/lib/python%{py_ver}/site-packages/omniidl_be/__init__.py*
!
%clean
! rm -rf $RPM_BUILD_ROOT
%post -n %{name} -p /sbin/ldconfig
%postun -n %{name} -p /sbin/ldconfig
+
# main package includes libraries and servers
%files
%defattr (-,root,root)
%doc COPYING.LIB
%doc bugfixes*
! %prefix/lib/python%{py_ver}/site-packages/_omni*.so.*
%prefix/lib/python%{py_ver}/site-packages/*.py*
%prefix/lib/python%{py_ver}/site-packages/CosNaming/*.py*
%prefix/lib/python%{py_ver}/site-packages/CosNaming__POA/*.py*
***************
*** 87,103 ****
%files -n %{name}-devel
%defattr(-,root,root)
! %doc README* ReleaseNotes* update.log
%prefix/include/omniORBpy.h
%prefix/include/omniORB4/pydistdate.hh
%prefix/lib/python%{py_ver}/site-packages/omniidl_be/python.py*
%files -n %{name}-doc
%defattr(-,root,root)
%doc doc/*
- %doc examples
%changelog
* Wed Aug 6 2003 Duncan Grisby <dgrisby at apasphere.com> 4.0.2
- Remove clashing omniidl __init__.py. Bump version number.
--- 83,107 ----
%files -n %{name}-devel
%defattr(-,root,root)
! %doc README* ReleaseNotes_2_2.txt update.log
%prefix/include/omniORBpy.h
%prefix/include/omniORB4/pydistdate.hh
+ #lib/omni/scripts/*
+ %prefix/lib/python%{py_ver}/site-packages/_omni*.so
+ # omit omniidl_be/__init__.py because it is empty and a duplicate
+ # of the file already provided by omniORB.
+ #%prefix/lib/python%{py_ver}/site-packages/omniidl_be/*.py*
%prefix/lib/python%{py_ver}/site-packages/omniidl_be/python.py*
%files -n %{name}-doc
%defattr(-,root,root)
%doc doc/*
%changelog
+ * Fri Aug 08 2003 Thomas Lockhart <lockhart at fourpalms.org>
+ - Drop circular definition of RPM macros
+ - Merge in Duncan's changes
+
* Wed Aug 6 2003 Duncan Grisby <dgrisby at apasphere.com> 4.0.2
- Remove clashing omniidl __init__.py. Bump version number.
-------------- next part --------------
#!/bin/sh
#
# Startup script to start/stop the omniORB services
#
# chkconfig: 345 90 10
# description: CORBA Naming Service from omniORB
# processname: omniNames
# config: /etc/omniORB.cfg
#
# Author: Sander Steffann <sander at steffann.nl>
# Modified: Thomas Lockhart <lockhart at fourpalms.org>
# - Put omniNames log files under /var/log/omniNames
# - Adjust start/stop levels
# Standard functions
. /etc/rc.d/init.d/functions
# Program options
GENIOR=/usr/bin/genior
OMNINAMES=/usr/bin/omniNames
OMNINAMES_DIR=/var/log/omniNames
OMNIMAPPER_DIR=/var/lib/omniMapper
# Registered port number for CORBA naming service is 2809.
# Should be preferred but may conflict with other ORBs running concurrently.
TCPPORT=49000
if [ -f /etc/sysconfig/omniNames ];then
. /etc/sysconfig/omniNames
fi
case "$1" in
start)
# Make sure directories exist
[ -d $OMNINAMES_DIR ] || mkdir -p $OMNINAMES_DIR
[ -d $OMNIMAPPER_DIR ] || mkdir -p $OMNIMAPPER_DIR
if [ -x $OMNINAMES ]; then
echo -n "Starting omniNames"
if [ ! -z "`pidofproc omniNames`" ]; then
echo " impossible: already running (pid `pidofproc omniNames`)"
else
OMNINAMES_OPTIONS="-errlog $OMNINAMES_DIR/error.log -logdir $OMNINAMES_DIR"
if [ ! -f $OMNINAMES_DIR/omninames-*.log ]; then
OMNINAMES_OPTIONS="$OMNINAMES_OPTIONS -start $TCPPORT"
echo -n " for the first time"
fi
# Run it
$OMNINAMES $OMNINAMES_OPTIONS &> /dev/null &
OMNINAMES_PID=$!
# Sleep a while, and then check if omniNames is still running
sleep 2
if [ ! -z "`pidofproc omniNames`" ]; then
success "Starting omniNames"
echo $OMNINAMES_PID > /var/run/omniNames.pid
$GENIOR IDL:omg.org/CosNaming/NamingContextExt:1.0 `hostname` $TCPPORT NameService > $OMNIMAPPER_DIR/NameService
else
failure "Starting omniNames"
rm -f $OMNIMAPPER_DIR/NameService
rm -f /var/run/omniNames.pid
fi
echo
fi
fi
if [ ! -z "`pidofproc omniNames`" ]; then
touch /var/lock/subsys/omniNames
fi
;;
stop)
echo -n "Stopping omniNames"
killproc omniNames
echo
rm -f $OMNIMAPPER_DIR/NameService
while [ -n "`pidofproc omniNames`" ]; do
sleep 1
done
rm -f /var/lock/subsys/omniNames
;;
restart)
$0 stop
$0 start
;;
status)
status omniNames
;;
*)
echo "Usage: $0 {start|stop|restart|status}"
exit 1
esac
exit 0
More information about the omniORB-list
mailing list